svn commit: r1764303 - in /sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it: FileRetrievalIT.java ResourceBuilderIT.java TestEnvironment.java

[sseifert]

Author: sseifert
Date: Tue Oct 11 16:58:54 2016
New Revision: 1764303

URL: http://svn.apache.org/viewvc?rev=1764303&view=rev
Log:
SLING-6132 fix integration test setup

Modified:
    
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
    
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
    
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java

Modified: 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java?rev=1764303&r1=1764302&r2=1764303&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
 (original)
+++ 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
 Tue Oct 11 16:58:54 2016
@@ -56,7 +56,7 @@ public class FileRetrievalIT {
     @Before
     public void setup() throws LoginException, PersistenceException {
         E = new TestEnvironment(teleporter);
-        A = new ResourceAssertions(E.testRootPath, E.resolver);
+        A = new ResourceAssertions(E.parent.getPath(), E.resolver);
     }
     
     @After

Modified: 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java?rev=1764303&r1=1764302&r2=1764303&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
 (original)
+++ 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
 Tue Oct 11 16:58:54 2016
@@ -49,7 +49,7 @@ public class ResourceBuilderIT {
     @Before
     public void setup() throws LoginException, PersistenceException {
         E = new TestEnvironment(teleporter);
-        A = new ResourceAssertions(E.testRootPath, E.resolver);
+        A = new ResourceAssertions(E.parent.getPath(), E.resolver);
     }
     
     @After

Modified: 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java?rev=1764303&r1=1764302&r2=1764303&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java
 (original)
+++ 
sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java
 Tue Oct 11 16:58:54 2016
@@ -28,7 +28,6 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.junit.rules.TeleporterRule;
 import org.apache.sling.resourcebuilder.api.ResourceBuilder;
 import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory;
-import org.apache.sling.resourcebuilder.test.ResourceAssertions;
 
 class TestEnvironment {
     
@@ -37,7 +36,6 @@ class TestEnvironment {
     final ResourceResolver resolver;
     final String testRootPath;
     final Resource parent;
-    final ResourceAssertions A;
 
     TestEnvironment(TeleporterRule teleporter) throws LoginException, 
PersistenceException {
         testRootPath = getClass().getSimpleName() + "-" + 
UUID.randomUUID().toString(); 
@@ -46,7 +44,6 @@ class TestEnvironment {
         parent = resolver.create(root, testRootPath, null);
         builderService = teleporter.getService(ResourceBuilderFactory.class); 
         builder = builderService.forParent(parent);
-        A = new ResourceAssertions(testRootPath, resolver);
     }
     
     void cleanup() throws PersistenceException {