Modified the AbstractMetaFunction class to have a separated flag to

indicate that it was added by the user or not, instead of using the
AbstractMetaFunction::UserAddedFunction enum value. The old way
prevented the function to be an UserAddedFunction and a
ConstructorFunction at the same time, since this information was
stored as an enum of the AbstractMetaFunction::FunctionType type.
A test case was also added.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>

1 files changed, 26 insertions, 3 deletions

diff --git a/tests/testaddfunction.cpp b/tests/testaddfunction.cpp
index 456b9888c..113fbf47c 100644
--- a/tests/testaddfunction.cpp
+++ b/tests/testaddfunction.cpp
@@ -85,7 +85,8 @@ void TestAddFunction::testAddFunction()
 
     AbstractMetaFunction* addedFunc = classA->functions().last();
     QCOMPARE(addedFunc->visibility(), uint(AbstractMetaFunction::Protected));
-    QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::UserAddedFunction);
+    QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::NormalFunction);
+    QVERIFY(addedFunc->isUserAdded());
     QCOMPARE(addedFunc->ownerClass(), classA);
     QCOMPARE(addedFunc->implementingClass(), classA);
     QCOMPARE(addedFunc->declaringClass(), classA);
@@ -103,6 +104,28 @@ void TestAddFunction::testAddFunction()
     QCOMPARE(args[2]->type()->typeEntry(), typeDb->findType("B"));
 }
 
+void TestAddFunction::testAddFunctionConstructor()
+{
+    const char cppCode[] = "struct A { A() {} };";
+    const char xmlCode[] = "\
+    <typesystem package=\"Foo\">\
+        <value-type name='A'>\
+            <add-function signature='A(int)' />\
+        </value-type>\
+    </typesystem>";
+    TestUtil t(cppCode, xmlCode);
+    AbstractMetaClassList classes = t.builder()->classes();
+    AbstractMetaClass* classA = classes.findClass("A");
+    QVERIFY(classA);
+    QCOMPARE(classA->functions().count(), 2); // default and added ctors
+    AbstractMetaFunction* addedFunc = classA->functions().last();
+    QCOMPARE(addedFunc->visibility(), uint(AbstractMetaFunction::Public));
+    QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::ConstructorFunction);
+    QCOMPARE(addedFunc->arguments().size(), 1);
+    QVERIFY(addedFunc->isUserAdded());
+    QVERIFY(!addedFunc->type());
+}
+
 void TestAddFunction::testAddFunctionTagDefaultValues()
 {
     const char cppCode[] = "struct A {};";
@@ -119,11 +142,11 @@ void TestAddFunction::testAddFunctionTagDefaultValues()
     QCOMPARE(classA->functions().count(), 2); // default ctor and the added function
     AbstractMetaFunction* addedFunc = classA->functions().last();
     QCOMPARE(addedFunc->visibility(), uint(AbstractMetaFunction::Public));
-    QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::UserAddedFunction);
+    QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::NormalFunction);
+    QVERIFY(addedFunc->isUserAdded());
     QVERIFY(!addedFunc->type());
 }
 
-
 void TestAddFunction::testAddFunctionCodeSnippets()
 {
     const char cppCode[] = "struct A {};";