X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Builder.cpp;h=ca325225e07613b4bb380ed31ff63263d1113f25;hp=52f6f98357594bf606a4b52dc463b9056484f264;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=6d4347e7eff8ab62127a60984af2f1cdf156716c

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
index 52f6f98..ca32522 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@ -128,7 +128,7 @@ int UtcDaliBuilderQuitSignal(void)
            "\"orientation\": [10,10,10,10],"
            "\"clippingBox\": [10,10,10,10],"
            "\"signals\": [{"
-             "\"name\": \"touch\","
+             "\"name\": \"touched\","
              "\"action\": \"quit\""
            "}]"
          "}]"
@@ -277,6 +277,21 @@ int UtcDaliBuilderAnimationP(void)
         "          \"duration\": 3"
         "        }"
         "      }]"
+        "    },"
+        "    \"pathAnimation2\": {"
+        "      \"duration\": 3.0,"
+        "      \"endAction\": \"BAKE_FINAL\","
+        "      \"disconnectAction\": \"DISCARD\","
+        "      \"properties\": [{"
+        "        \"actor\": \"greeting\","
+        "        \"path\":\"path0\","
+        "        \"forward\":[1,0,0],"
+        "        \"alphaFunction\": \"EASE_IN_OUT\","
+        "        \"timePeriod\": {"
+        "          \"delay\": 0,"
+        "          \"duration\": 3"
+        "        }"
+        "      }]"
         "    }"
         "  },"
         "  \"stage\": [{"
@@ -288,7 +303,7 @@ int UtcDaliBuilderAnimationP(void)
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
         "    \"signals\": [{"
-        "      \"name\": \"touch\","
+        "      \"name\": \"touched\","
         "      \"action\": \"play\","
         "      \"animation\": \"animate\""
         "    }]"
@@ -313,6 +328,10 @@ int UtcDaliBuilderAnimationP(void)
 
   DALI_TEST_CHECK( anim );
 
+  anim = builder.CreateAnimation("pathAnimation2");
+
+  DALI_TEST_CHECK( anim );
+
   // trigger play
   // Emit touch event and check that our quit method is called
   Integration::TouchEvent touchEvent;
@@ -412,7 +431,7 @@ int UtcDaliBuilderAnimationN(void)
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
         "    \"signals\": [{"
-        "      \"name\": \"touch\","
+        "      \"name\": \"touched\","
         "      \"action\": \"play\","
         "      \"animation\": \"animate\""
         "    }]"
@@ -485,7 +504,7 @@ int UtcDaliBuilderConstantsP(void)
       "  \"image\": { \"url\": \"dir/{IMAGE_PATH}\" },"
       "  \"sizeWidth\": \"{WIDTH}\","
       "  \"signals\": [{"
-      "    \"name\": \"touch\","
+      "    \"name\": \"touched\","
       "    \"action\": \"quit\""
       "  }]"
       "}]"
@@ -555,7 +574,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
       "    \"name\": \"image\",\n"
       "    \"size\": \"{SIZE}\",\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
       "    \"actors\": [\n"
@@ -603,7 +622,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "  \"name\": \"image\",\n"
     "  \"size\": \"{SIZE}\",\n"
     "  \"signals\": [{\n"
-    "    \"name\": \"touch\",\n"
+    "    \"name\": \"touched\",\n"
     "    \"action\": \"quit\"\n"
     "  }],\n"
     "  \"actors\": [\n"
@@ -665,7 +684,7 @@ int UtcDaliBuilderRenderTasksP(void)
       "    \"name\": \"image\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
       "    \"actors\": [\n"
@@ -712,7 +731,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"
@@ -768,7 +787,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"
@@ -825,7 +844,7 @@ int UtcDaliBuilderGenericActionP(void)
       "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\"\n"
       "    }]\n"
       "  }]\n"
@@ -879,7 +898,7 @@ int UtcDaliBuilderPropertyNotificationP(void)
       "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\"\n"
       "    }],\n"
       "    \"notifications\": [{\n"
@@ -999,7 +1018,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"
@@ -1072,7 +1091,7 @@ int UtcDaliBuilderCustomShaderP(void)
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"Animation_1\"\n"
     "        }\n"
@@ -1132,7 +1151,7 @@ int UtcDaliBuilderLoadFromStringN(void)
            "\"parentOrigin\": \"TOP_LEFT\","
            "\"anchorPoint\": \"TOP_LEFT\","
            "\"signals\": [{"
-             "\"name\": \"touch\","
+             "\"name\": \"touched\","
              "\"action\": \"quit\""
            "}]"
          "}]"
@@ -1179,7 +1198,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"
@@ -1230,12 +1249,12 @@ int UtcDaliBuilderPathConstraintsP(void)
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"pathAnimation\"\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer0\",\n"
     "          \"properties\":\n"
@@ -1250,7 +1269,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer1\",\n"
     "          \"properties\":\n"
@@ -1265,7 +1284,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"offStage\",\n"
+    "          \"name\": \"offScene\",\n"
     "          \"action\": \"removeConstraints\",\n"
     "          \"constrainer\": \"constrainer0\",\n"
     "          \"properties\":\n"
@@ -1280,7 +1299,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"offStage\",\n"
+    "          \"name\": \"offScene\",\n"
     "          \"action\": \"removeConstraints\",\n"
     "          \"constrainer\": \"constrainer1\",\n"
     "          \"properties\":\n"
@@ -1723,7 +1742,7 @@ int UtcDaliBuilderActionsWithParams(void)
       "    \"name\": \"image\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"signals\": [{\n"
-      "      \"name\": \"touch\",\n"
+      "      \"name\": \"touched\",\n"
       "      \"action\": \"show\",\n"
       "      \"parameters\": {\n"
       "        \"property1\" : 10,\n"