You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/09/06 20:02:31 UTC
svn commit: r1759500 - in /sling/trunk:
bundles/extensions/repoinit/it/src/main/provisioning/
bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/
contrib/extensions/contextaware-config/integration-tests/
contrib/extensions/contex...
Author: sseifert
Date: Tue Sep 6 20:02:31 2016
New Revision: 1759500
URL: http://svn.apache.org/viewvc?rev=1759500&view=rev
Log:
SLING-6031 switch to latest teleporter version not requiring a WaitFor class
This closes #164
Removed:
sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/WaitFor.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/util/WaitFor.java
Modified:
sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt
sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java
Modified: sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/main/provisioning/repoinit.txt Tue Sep 6 20:02:31 2016
@@ -24,7 +24,7 @@
org.apache.sling/org.apache.sling.provisioning.model/1.4.2
[artifacts]
- org.apache.sling/org.apache.sling.junit.core/1.0.14
+ org.apache.sling/org.apache.sling.junit.core/1.0.17-SNAPSHOT
org.apache.sling/org.apache.sling.testing.tools/1.0.10
[settings]
Modified: sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisioningModelIT.java Tue Sep 6 20:02:31 2016
@@ -21,12 +21,10 @@ import static org.junit.Assert.assertTru
import java.util.UUID;
-import javax.jcr.Node;
import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.repoinit.parser.RepoInitParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -46,7 +44,6 @@ public class ProvisioningModelIT {
@Before
public void setup() throws Exception {
- WaitFor.services(teleporter, SlingRepository.class, RepoInitParser.class);
session = teleporter.getService(SlingRepository.class).loginAdministrative(null);
}
Modified: sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java (original)
+++ sling/trunk/bundles/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java Tue Sep 6 20:02:31 2016
@@ -50,7 +50,6 @@ public class RepoInitIT {
@Before
public void setup() throws Exception {
- WaitFor.services(teleporter, SlingRepository.class, RepoInitParser.class);
session = teleporter.getService(SlingRepository.class).loginAdministrative(null);
// Execute some repoinit statements
Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml (original)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml Tue Sep 6 20:02:31 2016
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.core</artifactId>
- <version>1.0.16</version>
+ <version>1.0.17-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java Tue Sep 6 20:02:31 2016
@@ -25,7 +25,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.contextaware.config.ConfigurationBuilder;
import org.apache.sling.contextaware.config.it.example.SimpleConfig;
-import org.apache.sling.contextaware.config.it.util.WaitFor;
import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.resourcebuilder.api.ResourceBuilder;
import org.junit.After;
@@ -44,7 +43,6 @@ public class AdaptToConfigClassIT {
@SuppressWarnings("deprecation")
@Before
public void setUp() throws Exception {
- WaitFor.services(teleporter, ResourceResolverFactory.class, ResourceBuilder.class);
resourceResolver = teleporter.getService(ResourceResolverFactory.class).getAdministrativeResourceResolver(null);
resourceBuilder = teleporter.getService(ResourceBuilder.class).forResolver(resourceResolver);
}
Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java Tue Sep 6 20:02:31 2016
@@ -25,7 +25,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.contextaware.config.ConfigurationResolver;
import org.apache.sling.contextaware.config.it.example.SimpleConfig;
-import org.apache.sling.contextaware.config.it.util.WaitFor;
import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.resourcebuilder.api.ResourceBuilder;
import org.junit.After;
@@ -44,7 +43,6 @@ public class ConfigurationResolverConfig
@SuppressWarnings("deprecation")
@Before
public void setUp() throws Exception {
- WaitFor.services(teleporter, ResourceResolverFactory.class, ResourceBuilder.class);
resourceResolver = teleporter.getService(ResourceResolverFactory.class).getAdministrativeResourceResolver(null);
resourceBuilder = teleporter.getService(ResourceBuilder.class).forResolver(resourceResolver);
}
Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java?rev=1759500&r1=1759499&r2=1759500&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java Tue Sep 6 20:02:31 2016
@@ -25,7 +25,6 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.contextaware.config.ConfigurationResolver;
-import org.apache.sling.contextaware.config.it.util.WaitFor;
import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.resourcebuilder.api.ResourceBuilder;
import org.junit.After;
@@ -44,7 +43,6 @@ public class ConfigurationResolverValueM
@SuppressWarnings("deprecation")
@Before
public void setUp() throws Exception {
- WaitFor.services(teleporter, ResourceResolverFactory.class, ResourceBuilder.class);
resourceResolver = teleporter.getService(ResourceResolverFactory.class).getAdministrativeResourceResolver(null);
resourceBuilder = teleporter.getService(ResourceBuilder.class).forResolver(resourceResolver);
}