[Avida-SVN] r1225 - in extras: . source/testsuites source/tools
avidaedward at myxo.css.msu.edu
avidaedward at myxo.css.msu.edu
Sat Jan 27 22:17:02 PST 2007
Author: avidaedward
Date: 2007-01-28 01:17:02 -0500 (Sun, 28 Jan 2007)
New Revision: 1225
Modified:
extras/
extras/source/testsuites/nAnalyze.cpp
extras/source/testsuites/nAnalyzeGenotype.cpp
extras/source/testsuites/nChangeList.cpp
extras/source/testsuites/nConsoleCatcher.cpp
extras/source/testsuites/nDataEntry.cpp
extras/source/testsuites/nDataFile.cpp
extras/source/testsuites/nFile.cpp
extras/source/testsuites/nFixedCoords.cpp
extras/source/testsuites/nInitFile.cpp
extras/source/testsuites/nRandom.cpp
extras/source/testsuites/nString.cpp
extras/source/testsuites/nStringList.cpp
extras/source/testsuites/nTemplate.cpp
extras/source/testsuites/nTestDriver.cpp
extras/source/testsuites/nTestLib.cpp
extras/source/testsuites/nTestSettings.cpp
extras/source/tools/cTestLib.cpp
extras/source/tools/cTestLib.h
Log:
r1242 at clearly: kaben | 2007-01-21 19:36:18 -0500
Converted tests using "attributes" into tests using "settings".
Property changes on: extras
___________________________________________________________________
Name: svk:merge
- 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1241
+ 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1242
Modified: extras/source/testsuites/nAnalyze.cpp
===================================================================
--- extras/source/testsuites/nAnalyze.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nAnalyze.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -64,8 +64,8 @@
/* Brainstorms. {{{1 */
/* cAnalyze_Brainstorm_HelloWorld {{{2 */
namespace Brainstorm_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -864,8 +864,8 @@
/* Unit tests. {{{1 */
/* cAnalyze_UnitTest_HelloWorld {{{2 */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -879,7 +879,7 @@
/* cAnalyze_UnitTest_cAvidaConfigDestruction {{{2 */
namespace UnitTest_cAvidaConfigDestruction {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
cout << "XXX This is a test stub. It needs filling-in. @kgn" << endl;
/* Make sure testing is working with successes and failures. @kgn */
@@ -931,8 +931,8 @@
/* cAnalyze_UnitTest_Archiving {{{2 */
namespace UnitTest_Archiving {
- void test(const cStringList &attrs){
- if(!attrs.HasString("Template")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("Template")){
cout << "XXX Skipping Template test." << endl;
return;
}
Modified: extras/source/testsuites/nAnalyzeGenotype.cpp
===================================================================
--- extras/source/testsuites/nAnalyzeGenotype.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nAnalyzeGenotype.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -16,8 +16,8 @@
/* Brainstorms. {{{1 */
/* cAnalyzeGenotype_Brainstorm_HelloWorld {{{2 */
namespace Brainstorm_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -992,8 +992,8 @@
/* Unit tests. {{{1 */
/* cAnalyzeGenotype_UnitTest_HelloWorld {{{2 */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nChangeList.cpp
===================================================================
--- extras/source/testsuites/nChangeList.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nChangeList.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -27,8 +27,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nConsoleCatcher.cpp
===================================================================
--- extras/source/testsuites/nConsoleCatcher.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nConsoleCatcher.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -8,8 +8,8 @@
/* Brainstorms. {{{1 */
/* cConsoleCatcher_Brainstorm_HelloWorld {{{2 */
namespace Brainstorm_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -159,8 +159,8 @@
/* Unit Tests. {{{1 */
/* cConsoleCatcher_UnitTest_HelloWorld {{{2 */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nDataEntry.cpp
===================================================================
--- extras/source/testsuites/nDataEntry.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nDataEntry.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -27,8 +27,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nDataFile.cpp
===================================================================
--- extras/source/testsuites/nDataFile.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nDataFile.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -28,8 +28,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nFile.cpp
===================================================================
--- extras/source/testsuites/nFile.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nFile.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -28,8 +28,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nFixedCoords.cpp
===================================================================
--- extras/source/testsuites/nFixedCoords.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nFixedCoords.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -25,8 +25,8 @@
/* Unit tests. */
namespace nUnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nInitFile.cpp
===================================================================
--- extras/source/testsuites/nInitFile.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nInitFile.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -28,8 +28,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -42,7 +42,7 @@
}
namespace UnitTest_Archiving {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
@@ -52,7 +52,7 @@
}
namespace UnitTest_ArchivingClosedFile {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
@@ -62,7 +62,7 @@
}
namespace UnitTest_ReadStringAfterOpenAndClose {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
Modified: extras/source/testsuites/nRandom.cpp
===================================================================
--- extras/source/testsuites/nRandom.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nRandom.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -27,8 +27,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -41,7 +41,7 @@
}
namespace UnitTest_Archiving {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
Modified: extras/source/testsuites/nString.cpp
===================================================================
--- extras/source/testsuites/nString.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nString.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -46,8 +46,8 @@
/* Unit tests. */
namespace nUnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -60,7 +60,7 @@
}
namespace FunctionalTest_StringManip {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
cString test_str("string is string 321");
TEST(test_str.Replace("ring", "rung", 9) != -1);
TEST(test_str[3] == 'i');
@@ -92,7 +92,7 @@
}
namespace UnitTest_Archiving {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
Modified: extras/source/testsuites/nStringList.cpp
===================================================================
--- extras/source/testsuites/nStringList.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nStringList.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -28,8 +28,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/testsuites/nTemplate.cpp
===================================================================
--- extras/source/testsuites/nTemplate.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nTemplate.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -59,8 +59,8 @@
/* Unit tests. */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -73,8 +73,8 @@
}
namespace UnitTest_tMemTrack {
- void test(const cStringList &attrs){
- if(!attrs.HasString("tMemTrack")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -96,11 +96,11 @@
}
namespace UnitTest_tListBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -176,11 +176,11 @@
}
namespace UnitTest_tListArchiveStructure {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -289,11 +289,11 @@
}
namespace UnitTest_tArraysOfPointers {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -314,11 +314,11 @@
}
namespace UnitTest_tArrayBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -373,11 +373,11 @@
}
namespace UnitTest_tHashTableBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -456,11 +456,11 @@
}
namespace UnitTest_tDictionaryBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -540,7 +540,7 @@
}
namespace UnitTest_tBufferBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
@@ -613,11 +613,11 @@
}
namespace UnitTest_tManagedPointerArrayBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -672,11 +672,11 @@
}
namespace UnitTest_tSmartArrayBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
@@ -731,11 +731,11 @@
}
namespace UnitTest_tMatrixBasicSerialization {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
# if !ENABLE_SERIALIZATION
cout << "XXX : Test skipped because serialization is disabled." << endl;
# else // ENABLE_SERIALIZATION
- if(!attrs.HasString("tMemTrack")){
+ if(!settings.HasSetting("tMemTrack")){
cout << "FIXME Skipping test requiring tMemTrack." << endl;
return;
}
Modified: extras/source/testsuites/nTestDriver.cpp
===================================================================
--- extras/source/testsuites/nTestDriver.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nTestDriver.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -30,38 +30,6 @@
}
/* Functional Tests. {{{1 */
- /* cTestDriver_FunctionalTest_Attributes {{{2 */
- namespace FunctionalTest_Attributes {
- bool test_attribute_enabled;
- void testrunner(const cStringList &attrs){
- test_attribute_enabled = attrs.HasString("TestAttribute");
- }
- void test(const cStringList &attrs){
- cStringList args;
- cTestDriver td;
-
- cTestLib::getLib().reg(
- "cTestDriver_FunctionalTest_Attributes_subtest",
- testrunner
- );
-
- args.Clear();
- args.PushRear("Enable_TestAttribute");
- args.PushRear("cTestDriver_FunctionalTest_Attributes_subtest");
- td.Tests(args);
- TEST(test_attribute_enabled);
-
- args.Clear();
- args.PushRear("Disable_TestAttribute");
- args.PushRear("cTestDriver_FunctionalTest_Attributes_subtest");
- td.Tests(args);
- TEST(!test_attribute_enabled);
-
- cTestLib::getLib().unreg("cTestDriver_FunctionalTest_Attributes_subtest");
- }
- cAddTestSuite t("cTestDriver_FunctionalTest_Attributes", test);
- }
-
/* cTestDriver_FunctionalTest_Settings {{{2 */
namespace FunctionalTest_Settings {
bool has_setting;
@@ -100,7 +68,7 @@
/* cTestDriver_FunctionalTest_AlteringErrorCount {{{2 */
namespace FunctionalTest_AlteringErrorCount {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
int original_error_count, new_error_count;
original_error_count = test_errors();
@@ -133,12 +101,12 @@
bool t1_called, t2_called, t3_called, t4_called;
- void t1WithAttrs(const cStringList &attrs){ t1_called = true; }
- void t2WithAttrs(const cStringList &attrs){ t2_called = true; }
+ void t1WithAttrs(cTestSettings &settings){ t1_called = true; }
+ void t2WithAttrs(cTestSettings &settings){ t2_called = true; }
void t3WithoutAttrs(){ t3_called = true; }
void t4WithoutAttrs(){ t4_called = true; }
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
cStringList args;
cTestDriver td;
@@ -240,8 +208,8 @@
/* Unit Tests. {{{1 */
/* cTestDriver_UnitTest_HelloWorld {{{2 */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -255,11 +223,11 @@
/* cTestDriver_RegisterAndUnregisterAndSupports {{{2 */
namespace UnitTest_RegisterAndUnregisterAndSupports {
- void t1WithAttrs(const cStringList &attrs){ }
+ void t1WithAttrs(cTestSettings &settings){ }
void t3WithoutAttrs(){ }
void testSettings(cTestSettings &settings){}
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
ERROR("kgn at FIXME : redundancy with cTestLib_UnitTest_SupportsAndRegAndUnreg");
TEST(!cTestLib::getLib().supports(
@@ -309,7 +277,7 @@
/* cTestDriver_UnitTest_TestErrors {{{2 */
namespace UnitTest_TestErrors {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
int original_error_count, new_error_count;
cTestDriver td;
@@ -333,7 +301,7 @@
/* cTestDriver_UnitTest_ResetTestErrors {{{2 */
namespace UnitTest_ResetTestErrors {
- void test(const cStringList &attrs){
+ void test(cTestSettings &settings){
int original_error_count, new_error_count;
cTestDriver td;
Modified: extras/source/testsuites/nTestLib.cpp
===================================================================
--- extras/source/testsuites/nTestLib.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nTestLib.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -12,8 +12,8 @@
/* Brainstorms. {{{1 */
/* cTestLib_Brainstorm_HelloWorld {{{2 */
namespace Brainstorm_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -30,8 +30,8 @@
/* Unit Tests. {{{1 */
/* cTestLib_UnitTest_HelloWorld {{{2 */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -46,7 +46,7 @@
/* cTestLib_UnitTest_SupportsAndRegAndUnreg {{{2 */
namespace UnitTest_SupportsAndRegAndUnreg {
void testVoid(){}
- void testAttr(const cStringList &attrs){}
+ void testAttr(cTestSettings &settings){}
void testSettings(cTestSettings &settings){}
void test(){
Modified: extras/source/testsuites/nTestSettings.cpp
===================================================================
--- extras/source/testsuites/nTestSettings.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/testsuites/nTestSettings.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -13,8 +13,8 @@
/* Brainstorms. {{{1 */
/* cTestSettings_Brainstorm_HelloWorld {{{2 */
namespace Brainstorm_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
@@ -205,8 +205,8 @@
/* Unit Tests. {{{1 */
/* cTestSettings_UnitTest_HelloWorld {{{2 */
namespace UnitTest_HelloWorld {
- void test(const cStringList &attrs){
- if(!attrs.HasString("HelloWorld")){
+ void test(cTestSettings &settings){
+ if(!settings.HasSetting("HelloWorld")){
cout << "XXX Skipping HelloWorld test." << endl;
return;
}
Modified: extras/source/tools/cTestLib.cpp
===================================================================
--- extras/source/tools/cTestLib.cpp 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/tools/cTestLib.cpp 2007-01-28 06:17:02 UTC (rev 1225)
@@ -189,11 +189,11 @@
ERROR(cString("error adding test runner by '") + key + "'");
}
}
-void addTestSuite(const cString &key, TestrunnerWithAttrs test_runner){
- if(!cTestLib::getLib().reg(key, test_runner)){
- ERROR(cString("error adding test runner by '") + key + "'");
- }
-}
+//void addTestSuite(const cString &key, TestrunnerWithAttrs test_runner){
+// if(!cTestLib::getLib().reg(key, test_runner)){
+// ERROR(cString("error adding test runner by '") + key + "'");
+// }
+//}
void addTestSuite(const cString &key, TestrunnerWithSettings test_runner){
if(!cTestLib::getLib().reg(key, test_runner)){
ERROR(cString("error adding test runner by '") + key + "'");
@@ -203,9 +203,9 @@
cAddTestSuite::cAddTestSuite(const cString &key, Testrunner test_runner){
addTestSuite(key, test_runner);
}
-cAddTestSuite::cAddTestSuite(const cString &key, TestrunnerWithAttrs test_runner){
- addTestSuite(key, test_runner);
-}
+//cAddTestSuite::cAddTestSuite(const cString &key, TestrunnerWithAttrs test_runner){
+// addTestSuite(key, test_runner);
+//}
cAddTestSuite::cAddTestSuite(const cString &key, TestrunnerWithSettings test_runner){
addTestSuite(key, test_runner);
}
Modified: extras/source/tools/cTestLib.h
===================================================================
--- extras/source/tools/cTestLib.h 2007-01-28 06:16:57 UTC (rev 1224)
+++ extras/source/tools/cTestLib.h 2007-01-28 06:17:02 UTC (rev 1225)
@@ -49,11 +49,11 @@
cAddTestSuite& operator=(const cAddTestSuite&); // @not_implemented
public:
cAddTestSuite(const cString &key, Testrunner test_runner);
- cAddTestSuite(const cString &key, TestrunnerWithAttrs test_runner);
+ //cAddTestSuite(const cString &key, TestrunnerWithAttrs test_runner);
cAddTestSuite(const cString &key, TestrunnerWithSettings test_runner);
};
void addTestSuite(const cString &key, Testrunner test_runner);
-void addTestSuite(const cString &key, TestrunnerWithAttrs test_runner);
+//void addTestSuite(const cString &key, TestrunnerWithAttrs test_runner);
void addTestSuite(const cString &key, TestrunnerWithSettings test_runner);
#endif
More information about the Avida-cvs
mailing list