[Avida-SVN] r1043 - development/source/tools

avidaedward at myxo.css.msu.edu avidaedward at myxo.css.msu.edu
Thu Oct 12 14:12:08 PDT 2006


Author: avidaedward
Date: 2006-10-12 17:12:08 -0400 (Thu, 12 Oct 2006)
New Revision: 1043

Modified:
   development/source/tools/cDataEntry.cc
   development/source/tools/cDataEntry.h
   development/source/tools/cDataFile.cc
   development/source/tools/cDataFile.h
   development/source/tools/cFile.cc
   development/source/tools/cFile.h
   development/source/tools/cFixedBlock.cc
   development/source/tools/cFixedBlock.h
   development/source/tools/cFixedCoords.cc
   development/source/tools/cFixedCoords.h
   development/source/tools/cInitFile.cc
   development/source/tools/cInitFile.h
   development/source/tools/cRandom.cc
   development/source/tools/cRandom.h
   development/source/tools/cSchedule.cc
   development/source/tools/cSchedule.h
   development/source/tools/cString.cc
   development/source/tools/cString.h
   development/source/tools/cStringList.cc
   development/source/tools/cStringList.h
Log:
Removing dead test code from development.


Modified: development/source/tools/cDataEntry.cc
===================================================================
--- development/source/tools/cDataEntry.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cDataEntry.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -9,92 +9,3 @@
 
 #include "cDataEntry.h"
 
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-namespace nDataEntry {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cDataEntry_Archive", s);
-  }
-
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cDataEntry_Archive", s);
-  }
-
-
-  namespace utDataEntry_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utDataEntry_archiving {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string filename("./cDataEntry_basic_serialization.xml");
-
-      // Open cDataEntry_data.txt for reading.
-      cDataEntry d("name", "desc", "null_value", "html_table_flags");
-      cDataEntry d1("n", "d", "nv", "htf");
-
-      // Sanity checks...
-      TEST(cString("name") == d.GetName());
-      TEST(cString("desc") == d.GetDesc());
-      TEST(cString("null_value") == d.GetNull());
-      TEST(cString("html_table_flags") == d.GetHtmlCellFlags());
-
-      TEST(cString("n") == d1.GetName());
-      TEST(cString("d") == d1.GetDesc());
-      TEST(cString("nv") == d1.GetNull());
-      TEST(cString("htf") == d1.GetHtmlCellFlags());
-
-      // Save cDataEntry state.
-      save_stuff<>(d, filename.c_str());
-      // Reload state into new cDataEntry.
-      restore_stuff<>(d1, filename.c_str());
-
-      // Check reloaded state.
-      TEST(cString("name") == d1.GetName());
-      TEST(cString("desc") == d1.GetDesc());
-      TEST(cString("null_value") == d1.GetNull());
-      TEST(cString("html_table_flags") == d1.GetHtmlCellFlags());
-
-      std::remove(filename.c_str());
-#   endif // ENABLE_SERIALIZATION
-    } 
-  } // utDataEntry_archiving
-
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utDataEntry_hello_world::test();
-    if(full) utDataEntry_archiving::test();
-  }
-} // nDataEntry
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cDataEntry.h
===================================================================
--- development/source/tools/cDataEntry.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cDataEntry.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -64,16 +64,4 @@
   return out;
 }
 
-  
-#ifdef ENABLE_UNIT_TESTS
-namespace nDataEntry {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cDataFile.cc
===================================================================
--- development/source/tools/cDataFile.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cDataFile.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -127,169 +127,3 @@
   }
   else m_fp << endl;
 }
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cFile.h"
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nDataFile {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cDataFile_Archive", s);
-  }
-  
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cDataFile_Archive", s);
-  }
-  
-
-  namespace utDataFile_hello_world {
-    void test(){
-      utDataFile_hello_world::test();
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utDataFile_archiving {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string filename("./cDataFile_basic_serialization.xml");
-      int linecount = 3;
-      std::string data_file_name("./cDataFile_data.txt");
-      cString dfn(data_file_name.c_str());
-
-      /*
-      Create a data file object, write two lines of data, archive the
-      data file object ... 
-      */
-      {
-        cDataFile df(dfn);
-        df.WriteComment("Comment!");
-        df.Write(1, "descr1");
-        df.Write(1.0, "descr2");
-        df.Write("blah", "descr3");
-        df.Endl();
-        df.Write(2, "descr1");
-        df.Write(2.0, "descr2");
-        df.Write("blahblah", "descr3");
-        df.Endl();
-        save_stuff<>(df, filename.c_str());
-      }
-      /*
-      Sanity-check contents of file on disk.
-      */
-      {
-        cFile f(dfn);
-        TEST(f.Good());
-
-        cString l[7];
-        for(int i = 0; i<7; i++){
-          f.ReadLine(l[i]);
-          //std::cout << "\"" << l[i] << "\"" << std::endl;
-        }
-        TEST(cString("# Comment!") == l[0]);
-        TEST(cString("#  1: descr1") == l[1]);
-        TEST(cString("#  2: descr2") == l[2]);
-        TEST(cString("#  3: descr3") == l[3]);
-        TEST(cString("") == l[4]);
-        TEST(cString("1 1.000000 blah ") == l[5]);
-        TEST(cString("2 2 blahblah ") == l[6]);
-      }
-      /*
-      Reload the data file object, write another line of data ...
-      */
-      {
-        cDataFile df;
-        restore_stuff<>(df, filename.c_str());
-        df.Write(3, "descr1");
-        df.Write(3.0, "descr2");
-        df.Write("blahblahblah", "descr3");
-      }
-      /*
-      Verify that a new line was appended to the file on disk.
-      */
-      {
-        cFile f(dfn);
-        TEST(f.Good());
-
-        cString l[8];
-        for(int i = 0; i<8; i++){
-          f.ReadLine(l[i]);
-          //std::cout << "\"" << l[i] << "\"" << std::endl;
-        }
-        TEST(cString("# Comment!") == l[0]);
-        TEST(cString("#  1: descr1") == l[1]);
-        TEST(cString("#  2: descr2") == l[2]);
-        TEST(cString("#  3: descr3") == l[3]);
-        TEST(cString("") == l[4]);
-        TEST(cString("1 1.000000 blah ") == l[5]);
-        TEST(cString("2 2 blahblah ") == l[6]);
-        TEST(cString("3 3 blahblahblah ") == l[7]);
-      }
-
-      /*
-      Create a new data file object with the same name. This should
-      overwrite the original file on disk.
-      */
-      {
-        cDataFile df(dfn);
-        df.WriteComment("This should be a new file.");
-        df.Write(1, "newdescr");
-        df.Endl();
-      }
-      /*
-      Verify that original file on disk has been overwritten.
-      */
-      {
-        cFile f(dfn);
-        TEST(f.Good());
-
-        cString l[4];
-        for(int i = 0; i<4; i++){
-          f.ReadLine(l[i]);
-          //std::cout << "\"" << l[i] << "\"" << std::endl;
-        }
-        TEST(cString("# This should be a new file.") == l[0]);
-        TEST(cString("#  1: newdescr") == l[1]);
-        TEST(cString("") == l[2]);
-        TEST(cString("1 ") == l[3]);
-      }
-
-      std::remove(filename.c_str());
-      std::remove(data_file_name.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utDataFile_archiving
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utDataFile_hello_world::test();
-    if(full) utDataFile_archiving::test();
-  }
-} // nDataFile
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cDataFile.h
===================================================================
--- development/source/tools/cDataFile.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cDataFile.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -212,16 +212,4 @@
 
 };
 
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nDataFile {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cFile.cc
===================================================================
--- development/source/tools/cFile.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cFile.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -76,157 +76,3 @@
   in_string = cur_line;
   return true;
 }
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nFile {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cFile_Archive", s);
-  }
-  
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cFile_Archive", s);
-  }
-  
-
-  namespace utFile_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utFile_archiving {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string filename("./cFile_basic_serialization.xml");
-      int linecount = 3;
-      std::string data_file_name("./cFile_data.txt");
-      {
-        std::ofstream data_file(data_file_name.c_str());
-        for(int i = 0; i < linecount; i++){
-          data_file << 2 * i << std::endl;
-        }
-      }
-      
-      // Open cFile_data.txt for reading.
-      cFile f(data_file_name.c_str());
-      
-      cFile f1, f2, f3;
-      cString s1, s2, s3;
-      cString l1, l2, l3;
-      
-      // Save initial cFile state.
-      save_stuff<>(f, filename.c_str());
-      // Reload initial state into new cFile.
-      restore_stuff<>(f1, filename.c_str());
-  
-      // Save cFile state after reading first line.
-      f.ReadLine(s1);
-      save_stuff<>(f, filename.c_str());
-      // Reload second state into new cFile.
-      restore_stuff<>(f2, filename.c_str());
-    
-      // Save cFile state after reading second line.
-      f.ReadLine(s2);
-      save_stuff<>(f, filename.c_str());
-      // Reload third state into new cFile.
-      restore_stuff<>(f3, filename.c_str());
-  
-      f.ReadLine(s3);
-  
-      // Sanity checks...
-      //TEST(false);
-      TEST(cString("0") == s1);
-      TEST(cString("2") == s2);
-      TEST(cString("4") == s3);
-  
-      // Verify reading expected lines from various reloaded states.
-      f3.ReadLine(l3);
-      f2.ReadLine(l2);
-      f1.ReadLine(l1);
-      TEST(l1 == s1);
-      TEST(l2 == s2);
-      TEST(l3 == s3);
-  
-      std::remove(filename.c_str());
-      std::remove(data_file_name.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utFile_archiving
-
-  namespace utFile_archiving_closed_file {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string data_file_name("./cFile_data.txt");
-      {
-        std::ofstream data_file(data_file_name.c_str());
-        for(int i = 0; i < 3; i++){
-          data_file << 2 * i << std::endl;
-        }
-      }
-
-      std::string filename("./cFile_serialize_closed_file.xml");
-
-      // Open cFile_data.txt for reading.
-      cFile f(data_file_name.c_str());
-      // Close file.
-      f.Close();
-      TEST(!f.IsOpen());
-
-      cFile f1;
-
-      // Save cFile state.
-      save_stuff<>(f, filename.c_str());
-      // Reload state into new cFile.
-      restore_stuff<>(f1, filename.c_str());
-      // Verify new cFile has matching filename.
-      TEST(f.GetFilename() == f1.GetFilename());
-      // Verify new cFile is closed.
-      TEST(!f1.IsOpen());
-
-      std::remove(filename.c_str());
-      std::remove(data_file_name.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utFile_archiving_closed_file
-
-
-
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utFile_hello_world::test();
-    if(full) utFile_archiving::test();
-    if(full) utFile_archiving_closed_file::test();
-  }
-} // nFile
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cFile.h
===================================================================
--- development/source/tools/cFile.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cFile.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -154,15 +154,4 @@
 
 };
 
-#ifdef ENABLE_UNIT_TESTS
-namespace nFile {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cFixedBlock.cc
===================================================================
--- development/source/tools/cFixedBlock.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cFixedBlock.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -9,86 +9,3 @@
 
 #include "cFixedBlock.h"
 
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-namespace nFixedBlock {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cFixedBlock_Archive", s);
-  }
-
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cFixedBlock_Archive", s);
-  }
-
-
-  namespace utFixedBlock_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utFixedBlock_archiving {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string filename("./cFixedBlock_basic_serialization.xml");
-
-      /*
-      Create and archive a cFixedBlock object.
-      */
-      {
-        cFixedBlock fb;
-        TEST(0 == fb.GetStart());
-        fb.SetStart(2);
-        TEST(2 == fb.GetStart());
-        save_stuff<>(fb, filename.c_str());
-      }
-      /*
-      Reload archived cFixedBlock object.
-      */
-      {
-        cFixedBlock fb;
-        TEST(0 == fb.GetStart());
-        restore_stuff<>(fb, filename.c_str());
-        TEST(2 == fb.GetStart());
-      }
-
-      std::remove(filename.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utFixedBlock_archiving
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utFixedBlock_hello_world::test();
-    if(full) utFixedBlock_archiving::test();
-  }
-} // nFixedBlock
-
-#endif // ENABLE_UNIT_TESTS
-

Modified: development/source/tools/cFixedBlock.h
===================================================================
--- development/source/tools/cFixedBlock.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cFixedBlock.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -34,16 +34,4 @@
   }   
 };
 
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nFixedBlock {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cFixedCoords.cc
===================================================================
--- development/source/tools/cFixedCoords.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cFixedCoords.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -8,92 +8,3 @@
  */
 
 #include "cFixedCoords.h"
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <string>
-
-namespace nFixedCoords {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cFixedCoords_Archive", s);
-  }
-
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cFixedCoords_Archive", s);
-  }
-
-
-  namespace utFixedCoords_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utFixedCoords_archiving {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string filename("./cFixedCoords_basic_serialization.xml");
-
-      /*
-      Create and archive a cFixedCoords object.
-      */
-      {
-        cFixedCoords fc;
-        TEST(0 == fc.GetBlockNum());
-        TEST(0 == fc.GetOffset());
-        fc(2,3);
-        TEST(2 == fc.GetBlockNum());
-        TEST(3 == fc.GetOffset());
-        save_stuff<>(fc, filename.c_str());
-      }
-      /*
-      Reload archived cFixedCoords object.
-      */
-      {
-        cFixedCoords fc;
-        TEST(0 == fc.GetBlockNum());
-        TEST(0 == fc.GetOffset());
-        restore_stuff<>(fc, filename.c_str());
-        TEST(2 == fc.GetBlockNum());
-        TEST(3 == fc.GetOffset());
-      }
-
-      std::remove(filename.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utFixedCoords_archiving
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utFixedCoords_hello_world::test();
-    if(full) utFixedCoords_archiving::test();
-  }
-} // nFixedCoords
-
-#endif // ENABLE_UNIT_TESTS
-
-

Modified: development/source/tools/cFixedCoords.h
===================================================================
--- development/source/tools/cFixedCoords.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cFixedCoords.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -103,16 +103,4 @@
   }   
 };
 
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nFixedCoords {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cInitFile.cc
===================================================================
--- development/source/tools/cInitFile.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cInitFile.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -251,198 +251,3 @@
 
   return found;
 }
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nInitFile {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cInitFile_Archive", s);
-  }
-  
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cInitFile_Archive", s);
-  }
-  
-
-  namespace utInitFile_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utInitFile_archiving {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      int linecount = 3;
-      std::string data_file_name("./cInitFile_data.txt");
-      { 
-        std::ofstream data_file(data_file_name.c_str());
-        for(int i = 0; i < linecount; i++){
-          data_file << 2 * i << std::endl;
-        }
-      }
-
-      std::string filename("./cInitFile_basic_serialization.xml");
-
-      // Open cInitFile_data.txt for reading.
-      cInitFile f(data_file_name.c_str());
-
-      cInitFile f1, f2, f3;
-      cString s1, s2, s3;
-      cString l1, l2, l3;
-
-      // Save initial cInitFile state.
-      save_stuff<>(f, filename.c_str());
-      // Reload initial state into new cInitFile.
-      restore_stuff<>(f1, filename.c_str());
-  
-      // Save cInitFile state after reading first line.
-      f.ReadLine(s1);
-      save_stuff<>(f, filename.c_str());
-      // Reload second state into new cInitFile.
-      restore_stuff<>(f2, filename.c_str());
-
-      // Save cInitFile state after reading second line.
-      f.ReadLine(s2);
-      save_stuff<>(f, filename.c_str());
-      // Reload third state into new cInitFile.
-      restore_stuff<>(f3, filename.c_str());
-
-      f.ReadLine(s3);
-
-      // Sanity checks...
-      //TEST(false);
-      TEST(cString("0") == s1);
-      TEST(cString("2") == s2);
-      TEST(cString("4") == s3);
-
-      // Verify reading expected lines from various reloaded states.
-      f3.ReadLine(l3);
-      f2.ReadLine(l2);
-      f1.ReadLine(l1);
-      TEST(l1 == s1);
-      TEST(l2 == s2);
-      TEST(l3 == s3);
-
-      std::remove(filename.c_str());
-      std::remove(data_file_name.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utInitFile_archiving
-
-  namespace utInitFile_archiving_closed_file {
-    void test(){
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string data_file_name("./cInitFile_data.txt");
-      {
-        std::ofstream data_file(data_file_name.c_str());
-        for(int i = 0; i < 3; i++){
-          data_file << 2 * i << std::endl;
-        }
-      }
-
-      std::string filename("./cInitFile_serialize_closed_file.xml");
-
-      // Open cInitFile_data.txt for reading.
-      cInitFile f(data_file_name.c_str());
-      f.Load();
-      f.Compress();
-      f.Close();
-      TEST(!f.IsOpen());
-
-      cInitFile f1;
-
-      // Save cInitFile state.
-      save_stuff<>(f, filename.c_str());
-      // Reload state into new cInitFile.
-      restore_stuff<>(f1, filename.c_str());
-      // Verify new cInitFile has matching filename.
-      TEST(f.GetFilename() == f1.GetFilename());
-      // Verify new cInitFile is closed.
-      TEST(!f1.IsOpen());
-
-      std::remove(filename.c_str());
-      std::remove(data_file_name.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utInitFile_archiving_closed_file
-
-  /*
-  Bugfix: cInitFile was returning default value instead of value read
-  from a closed init file, even though file had been open and read.
-  @kgn
-  */
-  namespace utInitFile_ReadString_after_open_and_close {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string data_file_name("./utInitFile_ReadString_after_open_and_close.cfg");
-      {
-        std::ofstream data_file(data_file_name.c_str());
-        data_file << "TEST_VALUE BLAH" << std::endl;
-        data_file << std::endl;
-      }
-
-      std::string filename("./cInitFile_serialize_closed_file.xml");
-
-      // Open cInitFile_data.txt for reading.
-      cInitFile f(data_file_name.c_str());
-      f.Load();
-      f.Compress();
-      f.Close();
-
-      const cString keyword("TEST_VALUE");
-      const cString default_val("ICK");
-      const cString loaded_val(f.ReadString(keyword, default_val));
-      const cString expected_val("BLAH");
-      TEST(!f.IsOpen());
-      TEST(loaded_val == expected_val);
-      std::cout << "utInitFile_ReadString_after_open_and_close:" << std::endl;
-      std::cout << "  keyword: " << keyword << std::endl;
-      std::cout << "  default_val: " << default_val << std::endl;
-      std::cout << "  loaded_val: " << loaded_val << std::endl;
-      std::cout << "  expected_val: " << expected_val << std::endl;
-
-      std::remove(data_file_name.c_str());
-    }
-  } // utInitFile_ReadString_after_open_and_close
-
-
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utInitFile_hello_world::test();
-    if(full) utInitFile_archiving::test();
-    if(full) utInitFile_archiving_closed_file::test();
-    if(1) utInitFile_ReadString_after_open_and_close::test();
-  }
-} // nInitFile
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cInitFile.h
===================================================================
--- development/source/tools/cInitFile.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cInitFile.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -210,15 +210,4 @@
 
 };
 
-#ifdef ENABLE_UNIT_TESTS
-namespace nInitFile {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cRandom.cc
===================================================================
--- development/source/tools/cRandom.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cRandom.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -253,171 +253,3 @@
 
   return true;
 }
-
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nRandom {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cRandom_Archive", s);
-  }
-  
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cRandom_Archive", s);
-  }
-  
-
-  namespace utRandom_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-  
-  namespace utRandom_archiving {
-    void test() {
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      { 
-        std::string filename("./cRandom_basic_serialization.xml");
-  
-        // Using seed drawn from date and time.
-        // No, using a problematic seed found.
-        cRandom r(13396544);
-  
-        /*
-        Exercise the random number generator a little bit before saving
-        and restoring.
-        */
-        int seed = r.GetSeed();
-        int original_seed = r.GetOriginalSeed();
-        double d = r.GetDouble();
-        double dm = r.GetDouble(1.0);
-        double dr = r.GetDouble(1.0, 2.0);
-        int i = r.GetInt(100);
-        int ir = r.GetInt(100, 200);
-        bool p = r.P(0.5);
-        bool up = r.uP(0.0000005);
-        double rn = r.GetRandNormal();
-        double rnr = r.GetRandNormal(10.0, 2.0);
-        unsigned int rpnp = r.GetRandPoisson(10.0, 0.5);
-        unsigned int rpm = r.GetRandPoisson(0.5);
-        unsigned int frb = r.GetFullRandBinomial(10.0, 3.0);
-        unsigned int rb = r.GetRandBinomial(10.0, 3.0);
-  
-        /* Save random number generator state.  */
-        save_stuff<>(r, filename.c_str());
-  
-        /* Get some random numbers...  */
-        seed = r.GetSeed();
-        original_seed = r.GetOriginalSeed();
-        d = r.GetDouble();
-        dm = r.GetDouble(1.0);
-        dr = r.GetDouble(1.0, 2.0);
-        i = r.GetInt(100);
-        ir = r.GetInt(100, 200);
-        p = r.P(0.5);
-        up = r.uP(0.0000005);
-        tArray<int> choose(10);
-        r.Choose(100, choose);
-        rn = r.GetRandNormal();
-        rnr = r.GetRandNormal(10.0, 2.0);
-        rpnp = r.GetRandPoisson(10.0, 0.5);
-        rpm = r.GetRandPoisson(0.5);
-        frb = r.GetFullRandBinomial(10.0, 3.0);
-        rb = r.GetRandBinomial(10.0, 3.0);
-  
-        /* Reload saved random number generator state.  */
-        cRandom r2(0);
-        restore_stuff<>(r2, filename.c_str());
-  
-        /*
-        Get some random numbers... Should be the same as those read above.
-        */
-        int seed2 = r2.GetSeed();
-        int original_seed2 = r2.GetOriginalSeed();
-        double d2 = r2.GetDouble();
-        double dm2 = r2.GetDouble(1.0);
-        double dr2 = r2.GetDouble(1.0, 2.0);
-        int i2 = r2.GetInt(100);
-        int ir2 = r2.GetInt(100, 200);
-        bool p2 = r2.P(0.5);
-        bool up2 = r2.uP(0.0000005);
-        tArray<int> choose2(10);
-        r2.Choose(100, choose2);
-        double rn2 = r2.GetRandNormal();
-        double rnr2 = r2.GetRandNormal(10.0, 2.0);
-        unsigned int rpnp2 = r2.GetRandPoisson(10.0, 0.5);
-        unsigned int rpm2 = r2.GetRandPoisson(0.5);
-        unsigned int frb2 = r2.GetFullRandBinomial(10.0, 3.0);
-        unsigned int rb2 = r2.GetRandBinomial(10.0, 3.0);
-  
-        /* Compare results.  */
-        TEST(seed2 == seed);
-        TEST(original_seed2 == original_seed);
-        TEST(d2 == d);
-        TEST(dm2 == dm);
-        TEST(dr2 == dr);
-        TEST(i2 == i);
-        TEST(ir2 == ir);
-        TEST(p2 == p);
-        TEST(up2 == up);
-        for(int i = 0; i < choose.GetSize(); i++){
-          TEST(choose2[i] == choose[i]);
-        }
-        TEST(rn2 == rn);
-        TEST(rnr2 == rnr);
-        TEST(rpnp2 == rpnp);
-        TEST(rpm2 == rpm);
-        //std::cout<<"rnr2: "<<rnr2<<", rnr: "<<rnr<<std::endl;
-        //std::cout<<"rpnp2: "<<rpnp2<<", rpnp: "<<rpnp<<std::endl;
-        //std::cout<<"rpm2: "<<rpm2<<", rpm: "<<rpm<<std::endl;
-        TEST(frb2 == frb);
-        TEST(rb2 == rb);
-  
-        /*
-        Print random number seeds to stdout, in case we run across a seed
-        that breaks things in weird ways.
-        */
-        std::cout << "utRandom_archiving info: seed " << seed << ", seed2 " << seed2
-        << ", original_seed " << original_seed << ", original_seed2 "
-        << original_seed2 << std::endl;
-  
-        std::remove(filename.c_str());
-      }
-#   endif // ENABLE_SERIALIZATION
-    }
-  }
-
-  void UnitTests(bool full)
-  {
-    //if(full) utRandom_hello_world::test();
-    if(full) utRandom_archiving::test();
-  }
-} // nRandom
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cRandom.h
===================================================================
--- development/source/tools/cRandom.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cRandom.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -259,19 +259,6 @@
 
 
 
-#ifdef ENABLE_UNIT_TESTS
-namespace nRandomMT {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
-
-
 inline unsigned int cRandom::MutateByte(unsigned int value)
 {
   int byte_pos = 8 * GetUInt(4);

Modified: development/source/tools/cSchedule.cc
===================================================================
--- development/source/tools/cSchedule.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cSchedule.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -31,77 +31,3 @@
   item_count = _item_count;
   if (m_change_list) m_change_list->Resize(_item_count);
 }
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cFile.h"
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>   
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nSchedule {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cSchedule_Archive", s);
-  } 
-
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename); 
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cSchedule_Archive", s);
-  } 
-  class testSchedule : public cSchedule {
-#if USE_tMemTrack
-    tMemTrack<testSchedule> mt;
-#endif
-  public:
-    virtual int GetNextID(){ return 0; }
-  };
-
-  namespace utSchedule_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utSchedule_archiving {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      std::string filename("./cSchedule_basic_serialization.xml");
-      TEST(tMemTrack<cChangeList>::Instances() == 0);
-      {
-      }
-      {
-      }
-
-      std::remove(filename.c_str());
-    }
-  } // utSchedule_archiving
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utSchedule_hello_world::test();
-    if(full) utSchedule_archiving::test();
-  }
-} // nSchedule
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cSchedule.h
===================================================================
--- development/source/tools/cSchedule.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cSchedule.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -55,16 +55,4 @@
   void SetSize(int _item_count);
 };
 
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nSchedule {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif

Modified: development/source/tools/cString.cc
===================================================================
--- development/source/tools/cString.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cString.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -655,247 +655,3 @@
   out << static_cast<const char*>(string);
   return out;
 }
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nString {
-  /*
-  Test-helpers.
-  */
-  class A {
-  public:
-    cString m_s1, m_s2;
-    cString *m_ps1, *m_ps2;
-    static int s_instance_ct;
-  public:
-    A():m_s1("blah."), m_s2(m_s1), m_ps1(new cString("ick.")), m_ps2(m_ps1) { s_instance_ct++; }
-    ~A(){ s_instance_ct--; }
-  public:
-    template<class Archive>
-    void serialize(Archive & a, const unsigned int version){
-      a.ArkvObj("m_s1", m_s1);
-      a.ArkvObj("m_s2", m_s2);
-      a.ArkvObj("m_ps1", m_ps1);
-      a.ArkvObj("m_ps2", m_ps2);
-    }
-  };
-  int A::s_instance_ct(0);
-  
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("s", s);
-  }
-  
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("s", s);
-  }
-
-
-
-
-  namespace utString_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utString_string_manip {
-    void test() {
-      std::cout << CURRENT_FUNCTION << std::endl;
-      cString test_str("string is string 321");
-      TEST(test_str.Replace("ring", "rung", 9) != -1);
-      TEST(test_str[3] == 'i');
-      TEST(test_str[13] == 'u');
-      TEST(test_str.PopWord() == "string");
-      TEST(test_str.Pop('s') == "i");
-      TEST(test_str.LeftJustify() == 1);
-      test_str.Reverse();
-      TEST(test_str == "123 gnurts");
-      TEST(test_str.GetWord(1) == "gnurts");
-      TEST(test_str.GetWordAt(6) == "urts");
-      TEST(test_str.ToUpper() == "123 GNURTS");
-      TEST(test_str.IsWhitespace(2) == false);
-      TEST(test_str.IsWhitespace(3) == true);
-      TEST(test_str.IsWhitespace(4) == false);
-      TEST(test_str.CountNumWords() == 2);
-      TEST(test_str.PopWord().AsInt() == 123);
-      TEST(test_str.Find('T') == 4);
-      TEST((test_str += " 4fun") == "GNURTS 4fun");
-      TEST(test_str.ToLower() == "gnurts 4fun");
-      TEST(test_str.Insert("  should r", 3, 6) == "gnu  should run");
-      TEST(test_str.ClipEnd(3) == "gnu  should ");
-      test_str.CompressWhitespace();
-      TEST(test_str == "gnu should");
-      test_str.RemoveChar('u');
-      TEST(test_str == "gn shold");
-
-      std::cout << "Finished: " << CURRENT_FUNCTION << std::endl;      
-    }
-  }
-  
-  namespace utString_archiving {
-    void test() {
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      { 
-        TEST(true);
-        std::string filename("./cString_basic_serialization.xml");
-  
-        TEST(0 == A::s_instance_ct);
-        A *a(new A);
-        TEST(1 == A::s_instance_ct);
-  
-        /*
-        Both instances of cString should share a single cStringData instance.
-        */
-        TEST(cString("blah.") == a->m_s1);
-        TEST(cString("blah.") == a->m_s2);
-        const char *s1(a->m_s1);
-        const char *s2(a->m_s2);
-        TEST(s1 == s2);
-  
-        /*
-        Both pointers should point to one cString instance.
-        */
-        TEST(cString("ick.") == *a->m_ps1);
-        TEST(cString("ick.") == *a->m_ps2);
-        const char *s3(*a->m_ps1);
-        const char *s4(*a->m_ps2);
-        TEST(s3 == s4);
-  
-        save_stuff<>(a, filename.c_str());
-        delete a;
-        TEST(0 == A::s_instance_ct);
-  
-        restore_stuff<>(a, filename.c_str());
-        TEST(1 == A::s_instance_ct);
-  
-        /*
-        Both instances of cString should share a single cStringData instance.
-        */
-        TEST(cString("blah.") == a->m_s1);
-        TEST(cString("blah.") == a->m_s2);
-        /*
-        We have decided to not track cStringData instance sharing;
-        consequently we now expect that if two strings sharing data are
-        both saved and then reloaded, the reloaded versions no longer
-        share data.
-        This prevents a certain kind of memory leak.
-        @kgn
-        */
-        const char *s5(a->m_s1);
-        const char *s6(a->m_s2);
-        TEST(s5 != s6);
-  
-        /*
-        Both pointers should point to one cString instance.
-        */
-        TEST(cString("ick.") == *a->m_ps1);
-        TEST(cString("ick.") == *a->m_ps2);
-        const char *s7(*a->m_ps1);
-        const char *s8(*a->m_ps2);
-        TEST(s7 == s8);
-  
-        delete a;
-        TEST(0 == A::s_instance_ct);
-  
-        std::remove(filename.c_str());
-      }
-      {
-        TEST(true);
-        std::string filename("./cString_basic_serialization_2.xml");
-  
-        TEST(0 == A::s_instance_ct);
-        A *a(new A);
-        TEST(1 == A::s_instance_ct);
-  
-        /*
-        Both instances of cString were sharing a single cStringData
-        instance, but assigning a new string to the first should create a
-        new, unshared cStringData instance; so now each cString should
-        have its own cStringData.
-        */
-        a->m_s1 = "bleah.";
-        TEST(cString("bleah.") == a->m_s1);
-        TEST(cString("blah.") == a->m_s2);
-        const char *s1(a->m_s1);
-        const char *s2(a->m_s2);
-        TEST(s1 != s2);
-  
-        /*
-        Both pointers should point to one cString instance.
-        */
-        *a->m_ps1 = "ack.";
-        TEST(cString("ack.") == *a->m_ps1);
-        TEST(cString("ack.") == *a->m_ps2);
-        const char *s3(*a->m_ps1);
-        const char *s4(*a->m_ps2);
-        TEST(s3 == s4);
-  
-        save_stuff<>(a, filename.c_str());
-        delete a;
-        TEST(0 == A::s_instance_ct);
-  
-        restore_stuff<>(a, filename.c_str());
-        TEST(1 == A::s_instance_ct);
-  
-        /*
-        Each cString should have its own cStringData.
-        */
-        TEST(cString("bleah.") == a->m_s1);
-        TEST(cString("blah.") == a->m_s2);
-        const char *s5(a->m_s1);
-        const char *s6(a->m_s2);
-        TEST(s5 != s6);
-  
-        /*
-        Both pointers should point to one cString instance.
-        */
-        TEST(cString("ack.") == *a->m_ps1);
-        TEST(cString("ack.") == *a->m_ps2);
-        const char *s7(*a->m_ps1);
-        const char *s8(*a->m_ps2);
-        TEST(s7 == s8);
-  
-  
-        delete a;
-        TEST(0 == A::s_instance_ct);
-  
-        std::remove(filename.c_str());
-      }
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utString_archiving
-
-
-  
-  void UnitTests(bool full)
-  {
-    //if(full) utString_hello_world::test();
-    if(full) utString_string_manip::test();
-    if(full) utString_archiving::test();
-  }
-} // nString
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cString.h
===================================================================
--- development/source/tools/cString.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cString.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -580,18 +580,6 @@
 };
 
 
-#ifdef ENABLE_UNIT_TESTS
-namespace nString {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
-
 // {{{ ** External cString Functions **
 
 // iostream input

Modified: development/source/tools/cStringList.cc
===================================================================
--- development/source/tools/cStringList.cc	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cStringList.cc	2006-10-12 21:12:08 UTC (rev 1043)
@@ -71,122 +71,3 @@
   }
   return "";
 }
-
-
-#ifdef ENABLE_UNIT_TESTS
-
-/*
-Unit tests
-*/
-#include "cXMLArchive.h"
-
-#include "lightweight_test.h"
-
-#include <cstdio>    // for std::remove() to remove temporary files.
-#include <iomanip>
-#include <iostream>
-#include <fstream> 
-#include <string>
-
-namespace nStringList {
-  /*
-  Test-helpers.
-  */
-  template <class T>
-  void save_stuff(const T &s, const char * filename){
-    std::ofstream ofs(filename);
-    cXMLOArchive oa(ofs);
-    oa.ArkvObj("cStringList_Archive", s);
-  }
-  
-  template <class T>
-  void restore_stuff(T &s, const char * filename) {
-    std::ifstream ifs(filename);
-    cXMLIArchive ia(ifs);
-    ia.ArkvObj("cStringList_Archive", s);
-  }
-  
-
-  namespace utStringList_hello_world {
-    void test(){
-      std::cout << CURRENT_FUNCTION << std::endl;
-      TEST(true);
-      TEST(false);
-    }
-  }
-
-  namespace utStringList_archiving {
-    void test() {
-#   ifdef ENABLE_SERIALIZATION
-      std::cout << CURRENT_FUNCTION << std::endl;
-      char numstr[] = "number 0";
-      cString s;
-      cStringList sl;
-      cStringIterator it(sl);
-      std::string filename("./cStringList_basic_serialization.xml");
-      int i, listsize = 10;
-      
-      /*
-      Construct basic list.
-      */
-      TEST(0 == sl.GetSize());
-      for(i=0; i<listsize; i++){
-        numstr[7] = '0' + i; 
-        s = cString(numstr);
-        sl.PushRear(s);
-      }
-      TEST(listsize == sl.GetSize());
-    
-      /*
-      Verify basic list contents.
-      */
-      it.Reset();
-      for(i=0; !it.AtEnd(); i++){
-        s = it.Next();
-        numstr[7] = '0' + i;
-        TEST(cString(numstr) == s);
-      }
-      TEST(i == listsize);
-
-      /*
-      Save basic list.
-      */
-      save_stuff<>(sl, filename.c_str());
-      sl.Clear();
-      TEST(0 == sl.GetSize());
-
-      /*
-      Reload basic list.
-      */
-      restore_stuff<>(sl, filename.c_str());
-      TEST(listsize == sl.GetSize());
-
-      /*
-      Verify contents of reloaded basic list.
-      */
-      it.Reset();
-      for(i=0; !it.AtEnd(); i++){
-        s = it.Next();
-        numstr[7] = '0' + i;
-        TEST(cString(numstr) == s);
-      }
-      TEST(i == listsize);
-
-      sl.Clear();
-      TEST(0 == sl.GetSize());
-
-      std::remove(filename.c_str());
-#   endif // ENABLE_SERIALIZATION
-    }
-  } // utStringList_archiving
-
-
-
-  void UnitTests(bool full)
-  {
-    //if(full) utStringList_hello_world::test();
-    if(full) utStringList_archiving::test();
-  }
-} // nStringList
-
-#endif // ENABLE_UNIT_TESTS

Modified: development/source/tools/cStringList.h
===================================================================
--- development/source/tools/cStringList.h	2006-10-12 20:24:01 UTC (rev 1042)
+++ development/source/tools/cStringList.h	2006-10-12 21:12:08 UTC (rev 1043)
@@ -73,16 +73,4 @@
   } 
 };
 
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nStringList {
-  /**
-   * Run unit tests
-   *
-   * @param full Run full test suite; if false, just the fast tests.
-   **/
-  void UnitTests(bool full = false);
-}
-#endif  
-
 #endif




More information about the Avida-cvs mailing list