You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:58:52 UTC

[sling-org-apache-sling-resourcebuilder] 06/08: SLING-6132 fix integration test setup

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcebuilder-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcebuilder.git

commit 09d29ea5054104b9fad30728d4f254a94b52a06d
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Oct 11 16:58:54 2016 +0000

    SLING-6132 fix integration test setup
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder@1764303 13f79535-47bb-0310-9956-ffa450edef68
---
 src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java | 2 +-
 .../java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java    | 2 +-
 src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java b/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
index 1991c27..76630a8 100644
--- a/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
+++ b/src/test/java/org/apache/sling/resourcebuilder/it/FileRetrievalIT.java
@@ -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
diff --git a/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java b/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
index 9c16b12..3ec402c 100644
--- a/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
+++ b/src/test/java/org/apache/sling/resourcebuilder/it/ResourceBuilderIT.java
@@ -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
diff --git a/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java b/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java
index f5625e9..0678392 100644
--- a/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java
+++ b/src/test/java/org/apache/sling/resourcebuilder/it/TestEnvironment.java
@@ -28,7 +28,6 @@ import org.apache.sling.api.resource.ResourceResolverFactory;
 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 {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.