diff --git a/telldus-core/tests/common/StringsTest.cpp b/telldus-core/tests/common/StringsTest.cpp index d1548ab6..c71a0e97 100644 --- a/telldus-core/tests/common/StringsTest.cpp +++ b/telldus-core/tests/common/StringsTest.cpp @@ -1,4 +1,5 @@ #include "StringsTest.h" +#include "Strings.h" CPPUNIT_TEST_SUITE_REGISTRATION (StringsTest); @@ -10,22 +11,9 @@ void StringsTest :: tearDown (void) { } -void StringsTest :: addTest (void) -{ - // check subtraction results - CPPUNIT_ASSERT_EQUAL (1, 1); - CPPUNIT_ASSERT_EQUAL (1, 2); -} - -void StringsTest :: subTest (void) -{ - // check addition results - CPPUNIT_ASSERT_EQUAL (1, 1); -} - - -void StringsTest :: equalTest (void) -{ - // test successful, if true is returned - CPPUNIT_ASSERT (1 == 1); +void StringsTest :: formatfTest (void) { + CPPUNIT_ASSERT_EQUAL(std::string("42"), TelldusCore::formatf("%u", 42)); + CPPUNIT_ASSERT_EQUAL(std::string("0"), TelldusCore::formatf("%u", 42.1)); + CPPUNIT_ASSERT_EQUAL(std::string("2A"), TelldusCore::formatf("%X", 42)); + CPPUNIT_ASSERT_EQUAL(std::string("42"), TelldusCore::formatf("%s", "42")); } diff --git a/telldus-core/tests/common/StringsTest.h b/telldus-core/tests/common/StringsTest.h index b75c1f7a..4c5642c7 100644 --- a/telldus-core/tests/common/StringsTest.h +++ b/telldus-core/tests/common/StringsTest.h @@ -3,24 +3,19 @@ #include #include -#include "Strings.h" class StringsTest : public CPPUNIT_NS :: TestFixture { - CPPUNIT_TEST_SUITE (StringsTest); - CPPUNIT_TEST (addTest); - CPPUNIT_TEST (subTest); - CPPUNIT_TEST (equalTest); - CPPUNIT_TEST_SUITE_END (); + CPPUNIT_TEST_SUITE (StringsTest); + CPPUNIT_TEST (formatfTest); + CPPUNIT_TEST_SUITE_END (); - public: - void setUp (void); - void tearDown (void); +public: + void setUp (void); + void tearDown (void); - protected: - void addTest (void); - void subTest (void); - void equalTest (void); +protected: + void formatfTest(void); }; #endif //STRINGSTEST_H