Commit afcf9e24 authored by edrezen's avatar edrezen
Browse files

Double registration of suites => one in unamed registery, one in named

registery
parent 4ad7fee6
......@@ -59,6 +59,10 @@
#define CPPUNIT_TEST_SUITE_GATB_END CPPUNIT_TEST_SUITE_END
#define CPPUNIT_TEST_SUITE_REGISTRATION_GATB(suite) \
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION (suite,#suite)
using namespace CppUnit;
/********************************************************************************/
......
......@@ -699,7 +699,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestBank);
CPPUNIT_TEST_SUITE_REGISTRATION (TestBank);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestBank);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -207,7 +207,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestDebruijn);
CPPUNIT_TEST_SUITE_REGISTRATION (TestDebruijn);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestDebruijn);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -218,7 +218,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestDSK);
CPPUNIT_TEST_SUITE_REGISTRATION (TestDSK);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestDSK);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -212,7 +212,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestKmer);
CPPUNIT_TEST_SUITE_REGISTRATION (TestKmer);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestKmer);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -134,7 +134,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestKmerBank);
CPPUNIT_TEST_SUITE_REGISTRATION (TestKmerBank);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestKmerBank);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -37,11 +37,14 @@ std::string DBPATH (const string& a)
/********************************************************************************/
int main (int argc, char **argv)
{
/** We may launch only one test. */
string testname = (argc >=2 ? argv[1] : "All Tests");
/** We set the directory where the db are. */
dbprefix = (argc >=2 ? argv[1] : "../test/db");
dbprefix = (argc >=3 ? argv[2] : "../test/db");
/** We may have an ouput xml file. */
char* xmloutput = (argc >=3 ? argv[2] : 0);
char* xmloutput = (argc >=4 ? argv[3] : 0);
// informs test-listener about testresults
TestResult testresult;
......@@ -56,7 +59,7 @@ int main (int argc, char **argv)
#endif
TextTestRunner runner;
runner.addTest ( TestFactoryRegistry::getRegistry().makeTest ());
runner.addTest ( TestFactoryRegistry::getRegistry(testname).makeTest ());
runner.run (testresult);
// output results in compiler-format
......
......@@ -866,7 +866,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestSystem);
CPPUNIT_TEST_SUITE_REGISTRATION (TestSystem);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestSystem);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -198,7 +198,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestBag);
CPPUNIT_TEST_SUITE_REGISTRATION (TestBag);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestBag);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -129,7 +129,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestContainer);
CPPUNIT_TEST_SUITE_REGISTRATION (TestContainer);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestContainer);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -47,7 +47,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestIterable);
CPPUNIT_TEST_SUITE_REGISTRATION (TestIterable);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestIterable);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -113,7 +113,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestMap);
CPPUNIT_TEST_SUITE_REGISTRATION (TestMap);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestMap);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -264,7 +264,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestIterators);
CPPUNIT_TEST_SUITE_REGISTRATION (TestIterators);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestIterators);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -125,7 +125,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestMath);
CPPUNIT_TEST_SUITE_REGISTRATION (TestMath);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestMath);
/********************************************************************************/
} } /* end of namespaces. */
......
......@@ -223,7 +223,8 @@ public:
/********************************************************************************/
CPPUNIT_TEST_SUITE_REGISTRATION (TestMisc);
CPPUNIT_TEST_SUITE_REGISTRATION (TestMisc);
CPPUNIT_TEST_SUITE_REGISTRATION_GATB (TestMisc);
/********************************************************************************/
} } /* end of namespaces. */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment