svn commit: r1447751 - in /sling/trunk/launchpad/integration-tests/src/main: java/org/apache/sling/launchpad/local/integrationtest/JcrResourceResolverTest.java resources/scripts/sling-it/resourceresolver-delete.jsp

[cz...@apache.org]

Author: cziegeler
Date: Tue Feb 19 15:06:16 2013
New Revision: 1447751

URL: http://svn.apache.org/r1447751
Log:
SLING-2544 :  Restore tests included in the no longer existing JcrResourceResolverTest 

Added:
    sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp   (with props)
Modified:
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/local/integrationtest/JcrResourceResolverTest.java

Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/local/integrationtest/JcrResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/local/integrationtest/JcrResourceResolverTest.java?rev=1447751&r1=1447750&r2=1447751&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/local/integrationtest/JcrResourceResolverTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/local/integrationtest/JcrResourceResolverTest.java Tue Feb 19 15:06:16 2013
@@ -2178,13 +2178,7 @@ public class JcrResourceResolverTest ext
         assertEquals(child.getPath(), resNode.getPath());
     }
 
-    public void test_delete_resource() throws Exception{
-        resResolver.create(resResolver.getResource("/"), "node", null);
-        assertEquals("/node", resResolver.getResource("/node").getPath());
-        resResolver.delete(resResolver.getResource("/node"));
-        resResolver.commit();
-        assertNull(resResolver.getResource("/node"));
-   }
+
 
     // ---------- internal
 

Added: sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp?rev=1447751&view=auto
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp (added)
+++ sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp Tue Feb 19 15:06:16 2013
@@ -0,0 +1,30 @@
+<%@page session="false" %><%
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+%><%@page import="org.junit.Assert,
+                  org.apache.sling.api.resource.ResourceResolver"%><%
+%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><%
+%><sling:defineObjects/><%
+
+    final ResourceResolver resResolver = slingRequest.getResourceResolver();
+
+    resResolver.create(resResolver.getResource("/"), "node", null);
+    Assert.assertEquals("/node", resResolver.getResource("/node").getPath());
+    resResolver.delete(resResolver.getResource("/node"));
+    resResolver.commit();
+    Assert.assertNull(resResolver.getResource("/node"));
+%>TEST_PASSED
\ No newline at end of file

Propchange: sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: sling/trunk/launchpad/integration-tests/src/main/resources/scripts/sling-it/resourceresolver-delete.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain