[Orxonox-commit 6327] r10984 - code/branches/cpp11_v2/test/core/command

[landauf at orxonox.net]

Author: landauf
Date: 2015-12-27 23:40:47 +0100 (Sun, 27 Dec 2015)
New Revision: 10984

Modified:
   code/branches/cpp11_v2/test/core/command/FunctorTest.cc
Log:
fixed warnings in test (msvc)

Modified: code/branches/cpp11_v2/test/core/command/FunctorTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/command/FunctorTest.cc	2015-12-27 22:17:12 UTC (rev 10983)
+++ code/branches/cpp11_v2/test/core/command/FunctorTest.cc	2015-12-27 22:40:47 UTC (rev 10984)
@@ -315,8 +315,8 @@
         }
         {
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method2);
-            float result = (*functor)(&object, 0, 111.11);
-            EXPECT_FLOAT_EQ(111.11, result);
+            float result = (*functor)(&object, 0, 111.11f);
+            EXPECT_FLOAT_EQ(111.11f, result);
         }
         {
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method3);
@@ -485,24 +485,24 @@
             (*functor)(&mock, 13);
         }
         {
-            EXPECT_CALL(mock, method2(13, 111.11)).WillOnce(::testing::Return(0.0));
+            EXPECT_CALL(mock, method2(13, 111.11f)).WillOnce(::testing::Return(0.0f));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method2);
-            (*functor)(&mock, 13, 111.11);
+            (*functor)(&mock, 13, 111.11f);
         }
         {
-            EXPECT_CALL(mock, method3(13, 111.11, true)).WillOnce(::testing::Return(false));
+            EXPECT_CALL(mock, method3(13, 111.11f, true)).WillOnce(::testing::Return(false));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method3);
-            (*functor)(&mock, 13, 111.11, true);
+            (*functor)(&mock, 13, 111.11f, true);
         }
         {
-            EXPECT_CALL(mock, method4(13, 111.11, true, "test")).WillOnce(::testing::Return(""));
+            EXPECT_CALL(mock, method4(13, 111.11f, true, "test")).WillOnce(::testing::Return(""));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method4);
-            (*functor)(&mock, 13, 111.11, true, "test");
+            (*functor)(&mock, 13, 111.11f, true, "test");
         }
         {
-            EXPECT_CALL(mock, method5(13, 111.11, true, "test", Vector3(3, 2, 1))).WillOnce(::testing::Return(Vector3()));
+            EXPECT_CALL(mock, method5(13, 111.11f, true, "test", Vector3(3, 2, 1))).WillOnce(::testing::Return(Vector3()));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method5);
-            (*functor)(&mock, 13, 111.11, true, "test", Vector3(3, 2, 1));
+            (*functor)(&mock, 13, 111.11f, true, "test", Vector3(3, 2, 1));
         }
     }
 
@@ -520,24 +520,24 @@
             (*functor)(13);
         }
         {
-            EXPECT_CALL(mock, method2(13, 111.11)).WillOnce(::testing::Return(0.0));
+            EXPECT_CALL(mock, method2(13, 111.11f)).WillOnce(::testing::Return(0.0f));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method2, &mock);
-            (*functor)(13, 111.11);
+            (*functor)(13, 111.11f);
         }
         {
-            EXPECT_CALL(mock, method3(13, 111.11, true)).WillOnce(::testing::Return(false));
+            EXPECT_CALL(mock, method3(13, 111.11f, true)).WillOnce(::testing::Return(false));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method3, &mock);
-            (*functor)(13, 111.11, true);
+            (*functor)(13, 111.11f, true);
         }
         {
-            EXPECT_CALL(mock, method4(13, 111.11, true, "test")).WillOnce(::testing::Return(""));
+            EXPECT_CALL(mock, method4(13, 111.11f, true, "test")).WillOnce(::testing::Return(""));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method4, &mock);
-            (*functor)(13, 111.11, true, "test");
+            (*functor)(13, 111.11f, true, "test");
         }
         {
-            EXPECT_CALL(mock, method5(13, 111.11, true, "test", Vector3(3, 2, 1))).WillOnce(::testing::Return(Vector3()));
+            EXPECT_CALL(mock, method5(13, 111.11f, true, "test", Vector3(3, 2, 1))).WillOnce(::testing::Return(Vector3()));
             FunctorMemberPtr<DestroyableClass> functor = createFunctor(&DestroyableClass::method5, &mock);
-            (*functor)(13, 111.11, true, "test", Vector3(3, 2, 1));
+            (*functor)(13, 111.11f, true, "test", Vector3(3, 2, 1));
         }
     }
 
@@ -574,24 +574,24 @@
             (*functor)(13);
         }
         {
-            EXPECT_CALL(mock, method2(13, 111.11)).WillOnce(::testing::Return(0.0));
+            EXPECT_CALL(mock, method2(13, 111.11f)).WillOnce(::testing::Return(0.0f));
             FunctorStaticPtr functor = createFunctor(&DestroyableClass::staticmethod2);
-            (*functor)(13, 111.11);
+            (*functor)(13, 111.11f);
         }
         {
-            EXPECT_CALL(mock, method3(13, 111.11, true)).WillOnce(::testing::Return(false));
+            EXPECT_CALL(mock, method3(13, 111.11f, true)).WillOnce(::testing::Return(false));
             FunctorStaticPtr functor = createFunctor(&DestroyableClass::staticmethod3);
-            (*functor)(13, 111.11, true);
+            (*functor)(13, 111.11f, true);
         }
         {
-            EXPECT_CALL(mock, method4(13, 111.11, true, "test")).WillOnce(::testing::Return(""));
+            EXPECT_CALL(mock, method4(13, 111.11f, true, "test")).WillOnce(::testing::Return(""));
             FunctorStaticPtr functor = createFunctor(&DestroyableClass::staticmethod4);
-            (*functor)(13, 111.11, true, "test");
+            (*functor)(13, 111.11f, true, "test");
         }
         {
-            EXPECT_CALL(mock, method5(13, 111.11, true, "test", Vector3(3, 2, 1))).WillOnce(::testing::Return(Vector3()));
+            EXPECT_CALL(mock, method5(13, 111.11f, true, "test", Vector3(3, 2, 1))).WillOnce(::testing::Return(Vector3()));
             FunctorStaticPtr functor = createFunctor(&DestroyableClass::staticmethod5);
-            (*functor)(13, 111.11, true, "test", Vector3(3, 2, 1));
+            (*functor)(13, 111.11f, true, "test", Vector3(3, 2, 1));
         }
     }