[Orxonox-commit 4810] r9479 - code/branches/testing/test/util

landauf at orxonox.net landauf at orxonox.net
Fri Nov 30 21:41:10 CET 2012


Author: landauf
Date: 2012-11-30 21:41:09 +0100 (Fri, 30 Nov 2012)
New Revision: 9479

Modified:
   code/branches/testing/test/util/ConvertTest.cc
Log:
consider different float to string conversions

Modified: code/branches/testing/test/util/ConvertTest.cc
===================================================================
--- code/branches/testing/test/util/ConvertTest.cc	2012-11-30 20:08:52 UTC (rev 9478)
+++ code/branches/testing/test/util/ConvertTest.cc	2012-11-30 20:41:09 UTC (rev 9479)
@@ -19,13 +19,21 @@
         EXPECT_EQ("0", multi_cast<std::string>(0.0f));
         EXPECT_EQ("10", multi_cast<std::string>(10.0f));
         EXPECT_EQ("123.456", multi_cast<std::string>(123.456f));
-        EXPECT_EQ("1.234e+012", multi_cast<std::string>(1234000000000.0f));
+        {
+            // expect 1.234e+012 or 1.234e+12
+            std::string value = multi_cast<std::string>(1234000000000.0f);
+            EXPECT_TRUE(value == "1.234e+012" || value == "1.234e+12");
+        }
 
         // double
         EXPECT_EQ("0", multi_cast<std::string>(0.0));
         EXPECT_EQ("10", multi_cast<std::string>(10.0));
         EXPECT_EQ("123.456", multi_cast<std::string>(123.456));
-        EXPECT_EQ("1.234e+012", multi_cast<std::string>(1234000000000.0));
+        {
+            // expect 1.234e+012 or 1.234e+12
+            std::string value = multi_cast<std::string>(1234000000000.0);
+            EXPECT_TRUE(value == "1.234e+012" || value == "1.234e+12");
+        }
 
         // char
         EXPECT_EQ("a", multi_cast<std::string>('a'));




More information about the Orxonox-commit mailing list