From: Adeel Kazmi Date: Thu, 7 Jul 2016 18:42:47 +0000 (+0100) Subject: (Automated Tests) Increase line coverage of Builder X-Git-Tag: dali_1.1.43~20^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=181e7013001eabaea30eda4f56fed71ef7e8a8c8;hp=-c (Automated Tests) Increase line coverage of Builder Change-Id: Ia768c77c81fb948e162255371c386b1266eb8d4a --- 181e7013001eabaea30eda4f56fed71ef7e8a8c8 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index ebfd376..32946a0 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp @@ -78,12 +78,15 @@ int UtcDaliBuilderQuitSignal(void) "{" "\"stage\":" "[{" - "\"type\": \"Actor\"," + "\"type\": \"Layer\"," "\"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\": \"touched\"," + "\"name\": \"touch\"," "\"action\": \"quit\"" "}]" "}]" @@ -243,7 +246,7 @@ int UtcDaliBuilderAnimationP(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touched\"," + " \"name\": \"touch\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -367,7 +370,7 @@ int UtcDaliBuilderAnimationN(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touched\"," + " \"name\": \"touch\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -440,7 +443,7 @@ int UtcDaliBuilderConstantsP(void) " \"image\": { \"url\": \"dir/{IMAGE_PATH}\" }," " \"sizeWidth\": \"{WIDTH}\"," " \"signals\": [{" - " \"name\": \"touched\"," + " \"name\": \"touch\"," " \"action\": \"quit\"" " }]" "}]" @@ -493,26 +496,41 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"color\": [1,0,0,1],\n" " \"actors\": {\n" " \"childImage\": {\n" - " \"color\": [0,1,0,1]\n" + " \"color\": \"34\"\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\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" " {\n" " \"type\":\"ImageView\",\n" - " \"name\":\"childImage\" \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" " }\n" " ]\n" " }\n" @@ -530,7 +548,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"color\": [1,0,0,1],\n" " \"actors\": {\n" " \"childImage\": {\n" - " \"color\": [0,1,0,1]\n" + " \"color\": \"#344353\"\n" " }\n" " }\n" "}\n" @@ -543,7 +561,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -598,14 +616,14 @@ int UtcDaliBuilderRenderTasksP(void) "[\n" " { \n" " \"type\": \"CameraActor\",\n" - " \"name\": \"image\"\n" + " \"name\": \"camera\"\n" " }, \n" " { \n" " \"type\": \"ImageView\",\n" " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -652,7 +670,7 @@ int UtcDaliBuilderChildActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" " \"childActor\": \"subActor\"\n" @@ -708,7 +726,7 @@ int UtcDaliBuilderSetPropertyActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"set\",\n" " \"actor\": \"subActor\",\n" " \"property\": \"visible\",\n" @@ -765,7 +783,7 @@ int UtcDaliBuilderGenericActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\"\n" " }]\n" " }]\n" @@ -819,7 +837,7 @@ int UtcDaliBuilderPropertyNotificationP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\"\n" " }],\n" " \"notifications\": [{\n" @@ -877,7 +895,7 @@ int UtcDaliBuilderCustomPropertyP(void) " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"properties\": {\n" @@ -1010,7 +1028,7 @@ int UtcDaliBuilderLoadFromStringN(void) "\"parentOrigin\": \"TOP_LEFT\"," "\"anchorPoint\": \"TOP_LEFT\"," "\"signals\": [{" - "\"name\": \"touched\"," + "\"name\": \"touch\"," "\"action\": \"quit\"" "}]" "}]" @@ -1057,7 +1075,7 @@ int UtcDaliBuilderAddActorsP(void) " \"visible\": false\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\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 1fafb16..258add1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp @@ -216,6 +216,13 @@ 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; } @@ -623,6 +630,7 @@ 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; @@ -756,3 +764,62 @@ 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 5e8c0ae..6bcb108 100644 --- 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 DownCast( BaseHandle handle ) +JsonParser JsonParser::DownCast( BaseHandle handle ) { return JsonParser( dynamic_cast(handle.GetObjectPtr()) ); } diff --git a/dali-toolkit/devel-api/builder/tree-node.cpp b/dali-toolkit/devel-api/builder/tree-node.cpp index 8515280..302c7a2 100644 --- a/dali-toolkit/devel-api/builder/tree-node.cpp +++ b/dali-toolkit/devel-api/builder/tree-node.cpp @@ -182,11 +182,6 @@ 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 6da465a..3e47aea 100644 --- a/dali-toolkit/devel-api/builder/tree-node.h +++ b/dali-toolkit/devel-api/builder/tree-node.h @@ -105,11 +105,6 @@ public: * pointer semantics */ KeyNodePair operator*(); - - /* - * pointer semantics - */ - KeyNodePair operator->(); private: TreeNode* mNode; };