svn commit: r960129 - in /sling/trunk/launchpad/integration-tests/src/main: java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java resources/integration-test/servlets/post/testimport2.json

[ieb]

Author: ieb
Date: Fri Jul  2 22:26:19 2010
New Revision: 960129

URL: http://svn.apache.org/viewvc?rev=960129&view=rev
Log:
SKING-1583 Fixed integration tests to use :name

Modified:
    
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
    
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport2.json

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java?rev=960129&r1=960128&r2=960129&view=diff
==============================================================================
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
 Fri Jul  2 22:26:19 2010
@@ -81,6 +81,9 @@ public class PostServletImportTest exten
        Iterator<String> keys = expectedJson.keys();
        while (keys.hasNext()) {
                String key = keys.next();
+                if ( ":name".equals(key) ) {
+                    continue;
+                }
                
                Object object = expectedJson.get(key);
                Object object2 = actualJson.get(key);
@@ -539,4 +542,4 @@ public class PostServletImportTest exten
                assertExpectedJSON(new JSONObject(jsonContent), jsonObj);
     }
     
-}
\ No newline at end of file
+}

Modified: 
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport2.json
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport2.json?rev=960129&r1=960128&r2=960129&view=diff
==============================================================================
--- 
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport2.json
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/post/testimport2.json
 Fri Jul  2 22:26:19 2010
@@ -1,5 +1,5 @@
 {
-    "name" : "nodeName",
+    ":name" : "nodeName",
        "jcr:primaryType": "nt:unstructured",
        "jcr:mixinTypes": [
                "mix:referenceable"
@@ -9,4 +9,4 @@
        "childOne" : {
                "childPropOne" : true
        }
-}
\ No newline at end of file
+}