Revert "[3.0] (Automated Tests) Increase line coverage of Builder"

This reverts commit 3223965240236e6add6e7278faf8f0408c33425a.

Change-Id: If028e7f60052f22f20749c9ef914d3128e1ac3dc

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
index 32946a0..ebfd376 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@ -78,15 +78,12 @@ int UtcDaliBuilderQuitSignal(void)
       "{"
          "\"stage\":"
          "[{"
-           "\"type\": \"Layer\","
+           "\"type\": \"Actor\","
            "\"size\": [100,100,1],"
            "\"parentOrigin\": \"TOP_LEFT\","
            "\"anchorPoint\": \"TOP_LEFT\","
-           "\"maximumSize\": [100,100],"
-           "\"orientation\": [10,10,10,10],"
-           "\"clippingBox\": [10,10,10,10],"
            "\"signals\": [{"
-             "\"name\": \"touch\","
+             "\"name\": \"touched\","
              "\"action\": \"quit\""
            "}]"
          "}]"
@@ -246,7 +243,7 @@ int UtcDaliBuilderAnimationP(void)
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
         "    \"signals\": [{"
-        "      \"name\": \"touch\","
+        "      \"name\": \"touched\","
         "      \"action\": \"play\","
         "      \"animation\": \"animate\""
         "    }]"
@@ -370,7 +367,7 @@ int UtcDaliBuilderAnimationN(void)
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
         "    \"signals\": [{"
-        "      \"name\": \"touch\","
+        "      \"name\": \"touched\","
         "      \"action\": \"play\","
         "      \"animation\": \"animate\""
         "    }]"
@@ -443,7 +440,7 @@ int UtcDaliBuilderConstantsP(void)
       "  \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
       "  \"sizeWidth\": \"{WIDTH}\","
       "  \"signals\": [{"
-      "    \"name\": \"touch\","
+      "    \"name\": \"touched\","
       "    \"action\": \"quit\""
       "  }]"
       "}]"
@@ -496,41 +493,26 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
       "    \"color\": [1,0,0,1],\n"
       "    \"actors\": {\n"
       "      \"childImage\": {\n"
-      "        \"color\": \"34\"\n"
+      "        \"color\": [0,1,0,1]\n"
       "      }\n"
       "    }\n"
       "  }\n"
       "},\n"
       "\"templates\":\n"
       "{\n"
-      "  \"imageViewTemplate\": { \n"
-      "    \"type\": \"ImageView\",\n"
-      "    \"styles\": [\"imageStyle\"]\n"
-      "  },\n"
       "  \"imageTree\": { \n"
       "    \"type\": \"ImageView\",\n"
       "    \"styles\": [\"imageStyle\"],\n"
       "    \"name\": \"image\",\n"
       "    \"size\": \"{SIZE}\",\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageView\",\n"
-      "        \"name\":\"childImage\", \n"
-      "        \"color\": \n"
-      "          {\n"
-      "            \"r\": 10,\n"
-      "            \"g\": 10,\n"
-      "            \"b\": 10,\n"
-      "            \"a\": 100\n"
-      "          }\n"
-      "      },\n"
-      "      {\n"
-      "        \"type\":\"imageViewTemplate\",\n"
-      "        \"name\":\"childImage2\"\n"
+      "        \"name\":\"childImage\" \n"
       "      }\n"
       "    ]\n"
       "  }\n"
@@ -548,7 +530,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     " \"color\": [1,0,0,1],\n"
     " \"actors\": {\n"
     "   \"childImage\": {\n"
-    "     \"color\": \"#344353\"\n"
+    "     \"color\": [0,1,0,1]\n"
     "   }\n"
     " }\n"
     "}\n"
@@ -561,7 +543,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "  \"name\": \"image\",\n"
     "  \"size\": \"{SIZE}\",\n"
     "  \"signals\": [{\n"
-    "    \"name\": \"touch\",\n"
+    "    \"name\": \"touched\",\n"
     "    \"action\": \"quit\"\n"
     "  }],\n"
     "  \"actors\": [\n"
@@ -616,14 +598,14 @@ int UtcDaliBuilderRenderTasksP(void)
       "[\n"
       "  { \n"
       "    \"type\": \"CameraActor\",\n"
-      "    \"name\": \"camera\"\n"
+      "    \"name\": \"image\"\n"
       "  }, \n"
       "  { \n"
       "    \"type\": \"ImageView\",\n"
       "    \"name\": \"image\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
       "    \"actors\": [\n"
@@ -670,7 +652,7 @@ int UtcDaliBuilderChildActionP(void)
       "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\",\n"
       "      \"actor\": \"actor\",\n"
       "      \"childActor\": \"subActor\"\n"
@@ -726,7 +708,7 @@ int UtcDaliBuilderSetPropertyActionP(void)
       "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"set\",\n"
       "      \"actor\": \"subActor\",\n"
       "      \"property\": \"visible\",\n"
@@ -783,7 +765,7 @@ int UtcDaliBuilderGenericActionP(void)
       "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\"\n"
       "    }]\n"
       "  }]\n"
@@ -837,7 +819,7 @@ int UtcDaliBuilderPropertyNotificationP(void)
       "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\"\n"
       "    }],\n"
       "    \"notifications\": [{\n"
@@ -895,7 +877,7 @@ int UtcDaliBuilderCustomPropertyP(void)
       "    \"name\": \"image\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
       "    \"properties\": {\n"
@@ -1028,7 +1010,7 @@ int UtcDaliBuilderLoadFromStringN(void)
            "\"parentOrigin\": \"TOP_LEFT\","
            "\"anchorPoint\": \"TOP_LEFT\","
            "\"signals\": [{"
-             "\"name\": \"touch\","
+             "\"name\": \"touched\","
              "\"action\": \"quit\""
            "}]"
          "}]"
@@ -1075,7 +1057,7 @@ int UtcDaliBuilderAddActorsP(void)
       "      \"visible\": false\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\",\n"
       "      \"actor\": \"actor\",\n"
       "      \"childActor\": \"subActor\"\n"

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
index 258add1..1fafb16 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
@@ -216,13 +216,6 @@ int UtcDaliJsonParserMethod01(void)
   DALI_TEST_CHECK( std::string((*iterObject).first) == std::string("key" ));
   DALI_TEST_CHECK( std::string(((*iterObject).second).GetString()) == std::string("value"));
 
-  ++iter;
-  DALI_TEST_CHECK(!( iter != root->CEnd() ));
-
-  ++iter; // Go past the end
-
-  iter++; // Use the other operator using the post increment operator
-
   tet_result(TET_PASS);
   END_TEST;
 }
@@ -630,7 +623,6 @@ int UtcDaliJsonParserMethod08(void)
   DALI_TEST_CHECK(1  == parser.GetErrorLineNumber());
   DALI_TEST_CHECK(53 == parser.GetErrorPosition());
   DALI_TEST_CHECK(11 == parser.GetErrorColumn());
-  DALI_TEST_CHECK("Missing Value" == parser.GetErrorDescription());
 
   tet_result(TET_PASS);
   END_TEST;
@@ -764,62 +756,3 @@ int UtcDaliJsonParserMerge1(void)
 
   END_TEST;
 }
-
-int UtcDaliJsonParserDownCast(void)
-{
-  BaseHandle handle = JsonParser::New();
-  JsonParser parser = JsonParser::DownCast( handle );
-  DALI_TEST_CHECK( parser );
-  END_TEST;
-}
-
-int UtcDaliJsonParserTreeNodeCount(void)
-{
-  std::string s1( ReplaceQuotes("                                       \
-{                                                                       \
-  'styles':                                                             \
-  {                                                                     \
-    'button':                                                           \
-    {                                                                   \
-      'backgroundColor':[0.8, 0.0, 1.0, 1.0],                           \
-      'foregroundColor':[1, 1, 1, 1]                                    \
-    }                                                                   \
-  }                                                                     \
-}                                                                       \
-"));
-
-  JsonParser parser = JsonParser::New();
-  parser.Parse( s1 );
-
-  const TreeNode* treeNode = parser.GetRoot();
-  DALI_TEST_EQUALS(1, treeNode->Count("styles"), TEST_LOCATION );
-  DALI_TEST_EQUALS(0, treeNode->Count("random"), TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliJsonParserTreeNodeFind(void)
-{
-  std::string s1( ReplaceQuotes("\
-{                                         \
-  'string':'value2',                      \
-  'integer':2,                            \
-  'float':2.3,                            \
-  'boolean':true,                         \
-  'nil':null,                             \
-  'array':[1,2,3],                        \
-  'object':{'key':'value'}                \
-}                                         \
-"));
-
-  JsonParser parser = JsonParser::New();
-  parser.Parse( s1 );
-
-  const TreeNode* treeNode = parser.GetRoot();
-  const TreeNode* childNode = treeNode->Find("string");
-  DALI_TEST_CHECK( childNode );
-  const TreeNode* sameNode = childNode->Find("string");
-  DALI_TEST_EQUALS( sameNode, childNode, TEST_LOCATION );
-
-  END_TEST;
-}

diff --git a/dali-toolkit/devel-api/builder/json-parser.cpp b/dali-toolkit/devel-api/builder/json-parser.cpp
index 6bcb108..5e8c0ae 100644 (file)
--- a/dali-toolkit/devel-api/builder/json-parser.cpp
+++ b/dali-toolkit/devel-api/builder/json-parser.cpp
@@ -54,7 +54,7 @@ JsonParser::~JsonParser()
 {
 }
 
-JsonParser JsonParser::DownCast( BaseHandle handle )
+JsonParser DownCast( BaseHandle handle )
 {
   return JsonParser( dynamic_cast<Internal::JsonParser*>(handle.GetObjectPtr()) );
 }

diff --git a/dali-toolkit/devel-api/builder/tree-node.cpp b/dali-toolkit/devel-api/builder/tree-node.cpp
index 302c7a2..8515280 100644 (file)
--- a/dali-toolkit/devel-api/builder/tree-node.cpp
+++ b/dali-toolkit/devel-api/builder/tree-node.cpp
@@ -182,6 +182,11 @@ TreeNode::KeyNodePair TreeNode::ConstIterator::operator *()
   return KeyNodePair(mNode->mName, *mNode);
 }
 
+TreeNode::KeyNodePair TreeNode::ConstIterator::operator ->()
+{
+  return KeyNodePair(mNode->mName, *mNode);
+}
+
 bool TreeNode::ConstIterator::operator!=( const TreeNode::ConstIterator& rhs ) const
 {
   return mNode != rhs.mNode;

diff --git a/dali-toolkit/devel-api/builder/tree-node.h b/dali-toolkit/devel-api/builder/tree-node.h
index 3e47aea..6da465a 100644 (file)
--- a/dali-toolkit/devel-api/builder/tree-node.h
+++ b/dali-toolkit/devel-api/builder/tree-node.h
@@ -105,6 +105,11 @@ public:
      * pointer semantics
      */
     KeyNodePair operator*();
+
+    /*
+     * pointer semantics
+     */
+    KeyNodePair operator->();
   private:
     TreeNode* mNode;
   };