Changeset 9226 for code/branches/testing/test

Timestamp:

May 20, 2012, 12:52:15 AM (13 years ago)

Author:

landauf

Message:

changed hasDefaultValue() to lastConversionSuccessful() (inverted meaning) and fixed two issues with this function

File:

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

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

@@ -29 +29 @@
     // ? getPointer()
 
-    // x hasDefaultValue()
+    // x lastConversionSuccessful()
     // x null()
 
@@ -142 +142 @@
         EXPECT_TRUE(mt.isType<Vector3>());
         EXPECT_EQ(Vector3(1, 2, 3), mt.get<Vector3>());
-        EXPECT_FALSE(mt.hasDefaultValue());
+        EXPECT_TRUE(mt.lastConversionSuccessful());
 
         mt = 77.7f;
@@ -148 +148 @@
         EXPECT_TRUE(mt.isType<Vector3>());
         EXPECT_EQ(Vector3::ZERO, mt.get<Vector3>());
-        EXPECT_TRUE(mt.hasDefaultValue());
+        EXPECT_FALSE(mt.lastConversionSuccessful());
     }
 
@@ -254 +254 @@
         EXPECT_TRUE(mt.isType<int>());
         EXPECT_EQ(0, mt.get<int>());
-
-//        EXPECT_TRUE(mt.hasDefaultValue());
     }
 
@@ -287 +285 @@
         EXPECT_EQ(Vector3::ZERO, mt.get<Vector3>());
 
-//        EXPECT_TRUE(mt.hasDefaultValue());
+        EXPECT_FALSE(mt.lastConversionSuccessful());
     }
 
@@ -648 +646 @@
     }
 
-    ///////////////////////
-    // hasDefaultValue() //
-    ///////////////////////
-    TEST(MultiType, HasDefaultValue)
+    ////////////////////////////////
+    // lastConversionSuccessful() //
+    ////////////////////////////////
+    TEST(MultiType, LastConversionSuccessful)
     {
         MultiType mt;
 
-//        EXPECT_FALSE(mt.hasDefaultValue());
+        EXPECT_TRUE(mt.lastConversionSuccessful());
 
         mt = 5.55;
 
-        EXPECT_FALSE(mt.hasDefaultValue());
+        EXPECT_TRUE(mt.lastConversionSuccessful());
 
         mt.convert<int>();
 
-        EXPECT_FALSE(mt.hasDefaultValue());
-
-        mt.convert<Quaternion>();
-
-//        EXPECT_TRUE(mt.hasDefaultValue());
+        EXPECT_TRUE(mt.lastConversionSuccessful());
+
+        mt.convert<Vector3>();
+
+        EXPECT_FALSE(mt.lastConversionSuccessful());
+
+        mt.convert<std::string>();
+
+        EXPECT_TRUE(mt.lastConversionSuccessful());
     }