Changeset 9223 for code/branches/testing/test

Timestamp:

May 19, 2012, 11:35:32 AM (13 years ago)

Author:

landauf

Message:

renamed setType<T>() to reset<T>()

File:

• code/branches/testing/test/util/MultiTypeTest.cc (modified) (3 diffs)

code/branches/testing/test/util/MultiTypeTest.cc

@@ -18 +18 @@
     // x convert<type>()
     // x reset
+    // x reset<type>()
     // x resetValue
-    // x setType<type>()
 
     // x isType<type>()
@@ -310 +310 @@
     }
 
+    ///////////////////
+    // reset<type>() //
+    ///////////////////
+    TEST(MultiType, SetType)
+    {
+        MultiType mt(10);
+
+        EXPECT_TRUE(mt.isType<int>());
+        EXPECT_FALSE(mt.isType<float>());
+        EXPECT_EQ(10, mt.getInt());
+
+        mt.reset<float>();
+
+        EXPECT_FALSE(mt.isType<int>());
+        EXPECT_TRUE(mt.isType<float>());
+        EXPECT_EQ(0, mt.getInt());
+    }
+
     ////////////////
     // resetValue //
@@ -323 +341 @@
 
         EXPECT_TRUE(mt.isType<int>());
-        EXPECT_EQ(0, mt.getInt());
-    }
-
-    /////////////////////
-    // setType<type>() //
-    /////////////////////
-    TEST(MultiType, SetType)
-    {
-        MultiType mt(10);
-
-        EXPECT_TRUE(mt.isType<int>());
-        EXPECT_FALSE(mt.isType<float>());
-        EXPECT_EQ(10, mt.getInt());
-
-        mt.setType<float>();
-
-        EXPECT_FALSE(mt.isType<int>());
-        EXPECT_TRUE(mt.isType<float>());
         EXPECT_EQ(0, mt.getInt());
     }