diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-22 18:54:14 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-22 20:56:39 +0900 |
| commit | 9d294741fd1bb469ed6be4e46af2f6521ce75054 (patch) | |
| tree | 4f0f839678bd5191a9bb941a9240f588da6b9879 /test/FeatureConfigTest.cc | |
| parent | e2340efe2788648a6edc49eaa236e1f62d96a937 (diff) | |
Rewritten FeatureConfig into set of functions
Diffstat (limited to 'test/FeatureConfigTest.cc')
| -rw-r--r-- | test/FeatureConfigTest.cc | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/test/FeatureConfigTest.cc b/test/FeatureConfigTest.cc index 173d5946..4b8361c5 100644 --- a/test/FeatureConfigTest.cc +++ b/test/FeatureConfigTest.cc @@ -14,13 +14,12 @@ class FeatureConfigTest:public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(FeatureConfigTest); CPPUNIT_TEST(testGetDefaultPort); - CPPUNIT_TEST(testIsSupported); + CPPUNIT_TEST(testStrSupportedFeature); CPPUNIT_TEST(testFeatureSummary); CPPUNIT_TEST_SUITE_END(); - public: void testGetDefaultPort(); - void testIsSupported(); + void testStrSupportedFeature(); void testFeatureSummary(); }; @@ -28,26 +27,19 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(FeatureConfigTest); void FeatureConfigTest::testGetDefaultPort() { - CPPUNIT_ASSERT_EQUAL((uint16_t)80, - FeatureConfig::getInstance()->getDefaultPort("http")); - CPPUNIT_ASSERT_EQUAL((uint16_t)443, - FeatureConfig::getInstance()->getDefaultPort("https")); - CPPUNIT_ASSERT_EQUAL((uint16_t)21, - FeatureConfig::getInstance()->getDefaultPort("ftp")); + CPPUNIT_ASSERT_EQUAL((uint16_t)80, getDefaultPort("http")); + CPPUNIT_ASSERT_EQUAL((uint16_t)443, getDefaultPort("https")); + CPPUNIT_ASSERT_EQUAL((uint16_t)21, getDefaultPort("ftp")); } -void FeatureConfigTest::testIsSupported() { +void FeatureConfigTest::testStrSupportedFeature() { + const char* https = strSupportedFeature(FEATURE_HTTPS); #ifdef ENABLE_SSL - CPPUNIT_ASSERT_EQUAL(true, - FeatureConfig::getInstance()->isSupported - (FeatureConfig::FEATURE_HTTPS)); + CPPUNIT_ASSERT(https); #else - CPPUNIT_ASSERT_EQUAL(false, - FeatureConfig::getInstance()->isSupported - (FeatureConfig::FEATURE_HTTPS)); + CPPUNIT_ASSERT(!https); #endif // ENABLE_SSL - CPPUNIT_ASSERT_EQUAL(false, - FeatureConfig::getInstance()->isSupported("FTPS")); + CPPUNIT_ASSERT(!strSupportedFeature(MAX_FEATURE)); } void FeatureConfigTest::testFeatureSummary() { @@ -92,9 +84,8 @@ void FeatureConfigTest::testFeatureSummary() { std::for_each(vbegin(features), vend(features), StringAppend(featuresString, delim)); featuresString = util::strip(featuresString, delim); - - CPPUNIT_ASSERT_EQUAL(featuresString, - FeatureConfig::getInstance()->featureSummary()); + + CPPUNIT_ASSERT_EQUAL(featuresString, featureSummary()); } } // namespace aria2 |