2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>

* tests/test-script.c:
	* tests/test-script.json: Test merging the same actor from two
	different sources.

ChangeLog

@@ -1,3 +1,9 @@
+2008-05-28  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* tests/test-script.c:
+	* tests/test-script.json: Test merging the same actor from two
+	different sources.
+
 2008-05-28  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	Fix merging of objects with the same id.

tests/test-script.c

@@ -9,6 +9,12 @@ static ClutterScript *script = NULL;
 static guint merge_id = 0;
 
 static const gchar *test_unmerge =
+"["
+"  {"
+"    \"id\" : \"main-stage\","
+"    \"type\" : \"ClutterStage\","
+"    \"children\" : [ \"blue-button\" ]"
+"  },"
 "  {"
 "    \"id\" : \"blue-button\","
 "    \"type\" : \"ClutterRectangle\","
@@ -19,7 +25,8 @@ static const gchar *test_unmerge =
 "    \"height\" : 100,"
 "    \"visible\" : true,"
 "    \"reactive\" : true"
-"}";
+"  }"
+"]";
 
 static const gchar *test_behaviour =
 "["

tests/test-script.json

@@ -72,8 +72,7 @@
           { "y-axis" : [ 60.0, [ 275, 100 ] ] },
           { "z-axis" : [ 45.0, [  75,  75 ] ] }
         ]
-      },
-      "blue-button",
+      }
     ]
   }
 }