Changeset 10922

Timestamp:

Dec 6, 2015, 6:06:39 PM (9 years ago)

Author:

landauf

Message:

moved functor-tests to new file

Location:

code/branches/cpp11_v2/test/core

Files:

• CMakeLists.txt (modified) (1 diff)
• command/FunctorPtrTest.cc (modified) (2 diffs)
• command/FunctorTest.cc (added)

code/branches/cpp11_v2/test/core/CMakeLists.txt

@@ -20 +20 @@
     command/CommandTest.cc
     command/FunctorPtrTest.cc
+    command/FunctorTest.cc
     command/ExecutorPtrTest.cc
     object/ClassFactoryTest.cc

code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc

@@ -29 +29 @@
                 }
         };
-
-        void f1(int, double)
-        {
-        }
-
-        void f2(int, double, double)
-        {
-        }
-
-        int f3(int, double, double)
-        {
-            return 0;
-        }
     }
 
@@ -95 +82 @@
         ASSERT_TRUE(static_cast<bool>(ptr2));
     }
-
-    TEST_F(FunctorPtrTest, canCompareHeaderIdentifiers)
-    {
-        FunctorPtr fp1 = createFunctor(&f1);
-        FunctorPtr fp2 = createFunctor(&f2);
-        FunctorPtr fp3 = createFunctor(&f3);
-        ASSERT_TRUE(fp1->getHeaderIdentifier(1) == fp2->getHeaderIdentifier(1));
-        ASSERT_TRUE(fp1->getHeaderIdentifier(2) == fp2->getHeaderIdentifier(2));
-        ASSERT_FALSE(fp1->getHeaderIdentifier(1) == fp2->getHeaderIdentifier(2));
-        ASSERT_FALSE(fp1->getHeaderIdentifier(10) == fp2->getHeaderIdentifier(10));
-        ASSERT_FALSE(fp2->getHeaderIdentifier(2) == fp3->getHeaderIdentifier(2));
-        ASSERT_FALSE(fp1->getHeaderIdentifier() == fp2->getHeaderIdentifier());
-        ASSERT_FALSE(fp2->getHeaderIdentifier() == fp3->getHeaderIdentifier());
-    }
-
-    TEST_F(FunctorPtrTest, canCompareTypenames)
-    {
-        FunctorPtr fp1 = createFunctor(&f1);
-        FunctorPtr fp2 = createFunctor(&f2);
-        FunctorPtr fp3 = createFunctor(&f3);
-        ASSERT_TRUE(fp1->getTypenameReturnvalue() == fp2->getTypenameReturnvalue());
-        ASSERT_TRUE(fp1->getTypenameParam(0) == fp3->getTypenameParam(0));
-        ASSERT_EQ("void", fp1->getTypenameReturnvalue());
-        ASSERT_EQ("int", fp3->getTypenameReturnvalue());
-        ASSERT_EQ("int", fp2->getTypenameParam(0));
-        ASSERT_EQ("double", fp3->getTypenameParam(2));
-        ASSERT_EQ("", fp3->getTypenameParam(6));
-    }
-
-    TEST_F(FunctorPtrTest, testGetParamCountAndHasReturnValue)
-    {
-        FunctorPtr fp1 = createFunctor(&f1);
-        FunctorPtr fp2 = createFunctor(&f2);
-        FunctorPtr fp3 = createFunctor(&f3);
-        ASSERT_EQ(3, fp2->getParamCount());
-        ASSERT_FALSE(fp1->getParamCount() == fp3->getParamCount());
-        ASSERT_FALSE(fp2->hasReturnvalue());
-        ASSERT_TRUE(fp3->hasReturnvalue());
-    }
-
-    TEST_F(FunctorPtrTest, canEvaluateArgument)
-    {
-        FunctorPtr fp1 = createFunctor(&f1);
-        MultiType mttype = "2";
-        fp1->evaluateArgument(0, mttype);
-        ASSERT_TRUE(mttype.isType<int>());
-        ASSERT_EQ(2, mttype.get<int>());
-        fp1->evaluateArgument(1, mttype);
-        ASSERT_TRUE(mttype.isType<double>());
-        ASSERT_EQ(2.0, mttype.get<double>());
-        mttype.reset();
-        fp1->evaluateArgument(5, mttype);
-        ASSERT_TRUE(mttype.null());
-    }
 }