From 28430b7c1b48705db8f42bf405ce402fb2b5a5ca Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Wed, 28 May 2008 12:20:54 +0000
Subject: [PATCH] 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              |  6 ++++++
 tests/test-script.c    | 29 ++++++++++++++++++-----------
 tests/test-script.json |  3 +--
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad67206de..9e2f318fc 100644
--- a/ChangeLog
+++ b/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.
diff --git a/tests/test-script.c b/tests/test-script.c
index 4e3ad9452..659d464c0 100644
--- a/tests/test-script.c
+++ b/tests/test-script.c
@@ -9,17 +9,24 @@ static ClutterScript *script = NULL;
 static guint merge_id = 0;
 
 static const gchar *test_unmerge =
-"{"
-"  \"id\" : \"blue-button\","
-"  \"type\" : \"ClutterRectangle\","
-"  \"color\" : \"#0000ffff\","
-"  \"x\" : 350,"
-"  \"y\" : 50,"
-"  \"width\" : 100,"
-"  \"height\" : 100,"
-"  \"visible\" : true,"
-"  \"reactive\" : true"
-"}";
+"["
+"  {"
+"    \"id\" : \"main-stage\","
+"    \"type\" : \"ClutterStage\","
+"    \"children\" : [ \"blue-button\" ]"
+"  },"
+"  {"
+"    \"id\" : \"blue-button\","
+"    \"type\" : \"ClutterRectangle\","
+"    \"color\" : \"#0000ffff\","
+"    \"x\" : 350,"
+"    \"y\" : 50,"
+"    \"width\" : 100,"
+"    \"height\" : 100,"
+"    \"visible\" : true,"
+"    \"reactive\" : true"
+"  }"
+"]";
 
 static const gchar *test_behaviour =
 "["
diff --git a/tests/test-script.json b/tests/test-script.json
index c1057642c..e17185beb 100644
--- a/tests/test-script.json
+++ b/tests/test-script.json
@@ -72,8 +72,7 @@
           { "y-axis" : [ 60.0, [ 275, 100 ] ] },
           { "z-axis" : [ 45.0, [  75,  75 ] ] }
         ]
-      },
-      "blue-button",
+      }
     ]
   }
 }