[Avida-cvs] [avida-svn] r663 - in development/source: actions analyze

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-05-08 19:53:50 -0400 (Mon, 08 May 2006)
New Revision: 663

Modified:
   development/source/actions/cAction.h
   development/source/actions/cActionLibrary.h
   development/source/analyze/cAnalyzeCommand.h
   development/source/analyze/cAnalyzeCommandAction.h
   development/source/analyze/cAnalyzeCommandDef.h
   development/source/analyze/cAnalyzeCommandDefBase.h
   development/source/analyze/cAnalyzeFlowCommand.h
   development/source/analyze/cAnalyzeFlowCommandDef.h
   development/source/analyze/cAnalyzeFunction.h
Log:

Moving class' UnitTests functions to corresponding namespaces.



Modified: development/source/actions/cAction.h
===================================================================
--- development/source/actions/cAction.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/actions/cAction.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -36,16 +36,17 @@
   
   virtual const cString GetDescription() = 0;
   virtual void Process(cAvidaContext& ctx) = 0;
+};
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAction {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/actions/cActionLibrary.h
===================================================================
--- development/source/actions/cActionLibrary.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/actions/cActionLibrary.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -24,16 +24,17 @@
 {
 public:
   cActionLibrary() { ; }
+};
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nActionLibrary {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeCommand.h
===================================================================
--- development/source/analyze/cAnalyzeCommand.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeCommand.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -41,17 +41,17 @@
   equality of two references means that they refer to the same object.
   */
   bool operator==(const cAnalyzeCommand &in) const { return &in == this; }
+};
 
-
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeCommand {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeCommandAction.h
===================================================================
--- development/source/analyze/cAnalyzeCommandAction.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeCommandAction.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -42,17 +42,18 @@
     cAvidaContext& ctx = m_world->GetDefaultContext();
     action->Process(ctx);
   }
+};
 
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeCommandAction {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeCommandDef.h
===================================================================
--- development/source/analyze/cAnalyzeCommandDef.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeCommandDef.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -34,17 +34,18 @@
     (void) command; // used in other types of command defininitions.
     (analyze->*CommandFunction)(args);
   }
+};
 
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeCommandDef {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeCommandDefBase.h
===================================================================
--- development/source/analyze/cAnalyzeCommandDefBase.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeCommandDefBase.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -29,17 +29,18 @@
   virtual bool IsFlowCommand() { return false; }
 
   const cString& GetName() const { return name; }
+};
 
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeCommandDefBase {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeFlowCommand.h
===================================================================
--- development/source/analyze/cAnalyzeFlowCommand.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeFlowCommand.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -33,16 +33,18 @@
   }
 
   tList<cAnalyzeCommand> * GetCommandList() { return &command_list; }
+};
 
+
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeFlowCommand {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeFlowCommandDef.h
===================================================================
--- development/source/analyze/cAnalyzeFlowCommandDef.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeFlowCommandDef.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -41,17 +41,18 @@
   }
 
   virtual bool IsFlowCommand() { return true; }
+};
 
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeFlowCommandDef {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif

Modified: development/source/analyze/cAnalyzeFunction.h
===================================================================
--- development/source/analyze/cAnalyzeFunction.h	2006-05-08 21:19:31 UTC (rev 662)
+++ development/source/analyze/cAnalyzeFunction.h	2006-05-08 23:53:50 UTC (rev 663)
@@ -38,17 +38,18 @@
 
   const cString & GetName() { return name; }
   tList<cAnalyzeCommand> * GetCommandList() { return &command_list; }
+};
 
 
 #ifdef ENABLE_UNIT_TESTS
-public:
+namespace nAnalyzeFunction {
   /**
    * Run unit tests
    *
    * @param full Run full test suite; if false, just the fast tests.
    **/
-  static void UnitTests(bool full = false);
+  void UnitTests(bool full = false);
+}
 #endif  
-};
 
 #endif