Don't test variants of all params.

worldforge · Feb 25, 2012 · 7639956 · 7639956
1 parent 9223ff8
commit 7639956
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/test/ElementExerciser.h b/test/ElementExerciser.h
@@ -22,9 +22,11 @@ class ElementParam
 {
 public:
     Atlas::Message::Element defaultElement;
+    bool testVariants;
 
-    ElementParam(Atlas::Message::Element defaultElement) :
+    ElementParam(Atlas::Message::Element defaultElement, bool testVariants =
-            defaultElement(defaultElement)
+            true) :
+            defaultElement(defaultElement), testVariants(testVariants)
     {
     }
 
@@ -136,14 +138,15 @@ class ElementExerciser
         //throwing an exception or crashing.
         for (std::map<std::string, ElementParam>::const_iterator I =
                 mElementParams.begin(); I != mElementParams.end(); ++I) {
-            for (size_t i = 0; i < (sizeof(types) / sizeof(*types)); ++i) {
+            if (I->second.testVariants) {
-                Atlas::Message::Element::Type type = types[i];
+                for (size_t i = 0; i < (sizeof(types) / sizeof(*types)); ++i) {
-                EntityType entity;
+                    Atlas::Message::Element::Type type = types[i];
-                fillAllCorrectParams(entity);
+                    EntityType entity;
-                fillParam(entity, I->first, type);
+                    fillAllCorrectParams(entity);
-                mExerciseSlot(entity);
+                    fillParam(entity, I->first, type);
+                    mExerciseSlot(entity);
+                }
             }
-
         }
 
     }

diff --git a/test/ServerInfo_unittest.cpp b/test/ServerInfo_unittest.cpp
@@ -59,6 +59,7 @@ int main()
             sigc::mem_fun(info, &Eris::TestServerInfo::injectAtlas));
     ElementExerciser<Atlas::Objects::Entity::RootEntity> exerciser(slot);
     exerciser.addParam("ruleset", ElementParam("mason"));
+    exerciser.addParam("name", ElementParam("a server", false));
     exerciser.addParam("clients", ElementParam(2));
     exerciser.addParam("server", ElementParam("localhost"));
     exerciser.addParam("uptime", ElementParam(1000.0f));