Changeset 11097 for code/trunk/test

Timestamp:

Jan 25, 2016, 9:47:54 PM (8 years ago)

Author:

landauf

Message:

fixed build on tardis.

Location:

code/trunk/test/core

Files:

• command/FunctorTest.cc (modified) (3 diffs)
• object/ObjectListTest.cc (modified) (1 diff)
• object/StrongPtrTest.cc (modified) (1 diff)
• object/WeakPtrTest.cc (modified) (1 diff)

code/trunk/test/core/command/FunctorTest.cc

@@ -98 +98 @@
     TEST_F(FunctorTest, ReturnsCorrectParamCount)
     {
-        EXPECT_EQ(0, createFunctor(&DestroyableClass::method0)->getParamCount());
-        EXPECT_EQ(1, createFunctor(&DestroyableClass::method1)->getParamCount());
-        EXPECT_EQ(2, createFunctor(&DestroyableClass::method2)->getParamCount());
-        EXPECT_EQ(3, createFunctor(&DestroyableClass::method3)->getParamCount());
-        EXPECT_EQ(4, createFunctor(&DestroyableClass::method4)->getParamCount());
-        EXPECT_EQ(5, createFunctor(&DestroyableClass::method5)->getParamCount());
+        EXPECT_EQ(0u, createFunctor(&DestroyableClass::method0)->getParamCount());
+        EXPECT_EQ(1u, createFunctor(&DestroyableClass::method1)->getParamCount());
+        EXPECT_EQ(2u, createFunctor(&DestroyableClass::method2)->getParamCount());
+        EXPECT_EQ(3u, createFunctor(&DestroyableClass::method3)->getParamCount());
+        EXPECT_EQ(4u, createFunctor(&DestroyableClass::method4)->getParamCount());
+        EXPECT_EQ(5u, createFunctor(&DestroyableClass::method5)->getParamCount());
     }
 
@@ -663 +663 @@
         EXPECT_EQ(8,  (*c8)(4).get<int>());
 
-        EXPECT_EQ(1, c1->getParamCount());
-        EXPECT_EQ(1, c2->getParamCount());
-        EXPECT_EQ(1, c3->getParamCount());
-        EXPECT_EQ(2, c4->getParamCount());
-        EXPECT_EQ(0, c5->getParamCount());
-        EXPECT_EQ(1, c6->getParamCount());
-        EXPECT_EQ(2, c7->getParamCount());
-        EXPECT_EQ(1, c8->getParamCount());
+        EXPECT_EQ(1u, c1->getParamCount());
+        EXPECT_EQ(1u, c2->getParamCount());
+        EXPECT_EQ(1u, c3->getParamCount());
+        EXPECT_EQ(2u, c4->getParamCount());
+        EXPECT_EQ(0u, c5->getParamCount());
+        EXPECT_EQ(1u, c6->getParamCount());
+        EXPECT_EQ(2u, c7->getParamCount());
+        EXPECT_EQ(1u, c8->getParamCount());
 
         EXPECT_EQ(typeid(int(*)(int)), c1->getFullIdentifier());
@@ -768 +768 @@
         FunctorPtr fp2 = createFunctor(&f2);
         FunctorPtr fp3 = createFunctor(&f3);
-        ASSERT_EQ(3, fp2->getParamCount());
+        ASSERT_EQ(3u, fp2->getParamCount());
         ASSERT_NE(fp1->getParamCount(), fp3->getParamCount());
         ASSERT_FALSE(fp2->hasReturnvalue());

code/trunk/test/core/object/ObjectListTest.cc

@@ -114 +114 @@
         ListableTest test3(&context2);
 
-        EXPECT_EQ(3, ObjectList<ListableTest>().size());
-        EXPECT_EQ(2, ObjectList<ListableTest>(&context1).size());
-        EXPECT_EQ(1, ObjectList<ListableTest>(&context2).size());
+        EXPECT_EQ(3u, ObjectList<ListableTest>().size());
+        EXPECT_EQ(2u, ObjectList<ListableTest>(&context1).size());
+        EXPECT_EQ(1u, ObjectList<ListableTest>(&context2).size());
     }
 

code/trunk/test/core/object/StrongPtrTest.cc

@@ -257 +257 @@
         vector.push_back(test);
 
-        ASSERT_EQ(3, vector.size());
+        ASSERT_EQ(3u, vector.size());
         EXPECT_EQ(test, vector[0].get());
         EXPECT_EQ(test, vector[1].get());

code/trunk/test/core/object/WeakPtrTest.cc

@@ -184 +184 @@
         vector.push_back(test);
 
-        ASSERT_EQ(3, vector.size());
+        ASSERT_EQ(3u, vector.size());
         EXPECT_EQ(test, vector[0].get());
         EXPECT_EQ(test, vector[1].get());