Author: justin
Date: Tue Jul 11 19:23:26 2017
New Revision: 1801648
URL: http://svn.apache.org/viewvc?rev=1801648&view=rev
Log:
switch Sling Models ITs to use TeleporterRule
Added:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ImplementsExtendsTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ModelFactorySimpleTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/SimpleIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/SimpleTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ViaIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateRequestTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateResourceTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/exporter/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/FakeRequest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtboundpicker/
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
- copied, changed from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerTest.java
Removed:
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ImplementsExtendsTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/InjectorSpecificAnnotationTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ModelFactorySimpleTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/SimpleTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateRequestTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateResourceTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeResponse.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/FakeRequest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerTest.java
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/it/RemoteIT.java
Modified:
sling/trunk/bundles/extensions/models/integration-tests/pom.xml
Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1801648&r1=1801647&r2=1801648&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Tue Jul 11
19:23:26 2017
@@ -131,7 +131,17 @@
org.apache.sling.models.it.exporter.DoubledSecondComponent
</Sling-Model-Classes>
<Sling-Test-Regexp>.*Test</Sling-Test-Regexp>
-
<Export-Package>org.apache.sling.models.it</Export-Package>
+ <Export-Package>
+ org.apache.sling.models.it.delegate.request,
+ org.apache.sling.models.it.delegate.resource,
+ org.apache.sling.models.it.exporter,
+ org.apache.sling.models.it.implpicker,
+ org.apache.sling.models.it.models,
+ org.apache.sling.models.it.models.implextend,
+ org.apache.sling.models.it.rtbound,
+ org.apache.sling.models.it.rtboundpicker,
+ org.apache.sling.models.it.services
+ </Export-Package>
<Import-Package>
org.apache.commons.beanutils;resolution:=optional,
*
@@ -183,7 +193,7 @@
</goals>
<phase>process-resources</phase>
<configuration>
-
<outputDirectory>${project.build.directory}/sling/additional-bundles</outputDirectory>
+
<outputDirectory>${project.build.directory}</outputDirectory>
<excludeTransitive>true</excludeTransitive>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
@@ -256,7 +266,6 @@
All bundles must be listed as dependencies in this
pom, or they won't be installed.
-->
<sling.additional.bundle.1>org.apache.sling.junit.core</sling.additional.bundle.1>
-
<sling.additional.bundle.2>geronimo-atinject_1.0_spec</sling.additional.bundle.2>
<sling.additional.bundle.3>org.apache.sling.commons.johnzon</sling.additional.bundle.3>
<sling.additional.bundle.10>org.apache.sling.models.api</sling.additional.bundle.10>
<sling.additional.bundle.11>org.apache.sling.models.impl</sling.additional.bundle.11>
@@ -291,9 +300,15 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.junit.remote</artifactId>
+ <artifactId>org.apache.sling.testing.rules</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.junit.teleporter</artifactId>
<version>1.0.12</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -303,12 +318,6 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.tools</artifactId>
- <version>1.0.16</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.engine</artifactId>
<version>2.2.0</version>
<scope>provided</scope>
@@ -355,20 +364,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>1.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- sling testing tools bundles requires httpclient -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.1.2</version>
<scope>provided</scope>
</dependency>
@@ -397,27 +392,24 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
- <classifier>standalone</classifier>
- <version>7</version>
+ <version>8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
+ <version>4.12</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<profiles>
Added:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java?rev=1801648&view=auto
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
(added)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
Tue Jul 11 19:23:26 2017
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.sling.junit.teleporter.customizers;
+
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.testing.clients.util.TimeoutsProvider;
+import org.apache.sling.testing.serversetup.instance.SlingTestBase;
+import org.apache.sling.testing.teleporter.client.ClientSideTeleporter;
+
+import java.io.File;
+
+/** This is required by the TeleporterRule, to setup the client-side
+ * teleporter with (at least) the test server URL.
+ */
+public class SM_TeleporterCustomizer implements TeleporterRule.Customizer {
+
+ private final static SlingTestBase S = new SlingTestBase();
+
+ @Override
+ public void customize(TeleporterRule t, String options) {
+ final ClientSideTeleporter cst = (ClientSideTeleporter)t;
+ cst.setBaseUrl(S.getServerBaseUrl());
+ cst.setServerCredentials(S.getServerUsername(), S.getServerPassword());
+
cst.setTestReadyTimeoutSeconds(TimeoutsProvider.getInstance().getTimeout(5));
+ cst.includeDependencyPrefix("org.apache.sling.models.testing");
+ }
+}
\ No newline at end of file
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/DecoratedIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/DecoratedIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
Tue Jul 11 19:23:26 2017
@@ -14,34 +14,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceWrapper;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.factory.ModelFactory;
import org.apache.sling.models.it.models.SelfModel;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
import javax.jcr.Node;
import javax.jcr.Session;
import static org.junit.Assert.*;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class DecoratedTest {
+public class DecoratedIT {
- @TestReference
- private ResourceResolverFactory rrFactory;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
private ModelFactory modelFactory;
private ResourceResolver resolver;
@@ -50,7 +47,8 @@ public class DecoratedTest {
@Before
public void setUp() throws Exception {
-
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
+ modelFactory = teleporter.getService(ModelFactory.class);
resolver = rrFactory.getAdministrativeResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ImplementsExtendsTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ImplementsExtendsTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ImplementsExtendsTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -29,25 +29,23 @@ import org.apache.sling.api.adapter.Adap
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.it.implpicker.CustomLastImplementationPicker;
import
org.apache.sling.models.it.models.implextend.ImplementsInterfacePropertyModel;
import
org.apache.sling.models.it.models.implextend.ImplementsInterfacePropertyModel2;
import
org.apache.sling.models.it.models.implextend.InvalidSampleServiceInterface;
import org.apache.sling.models.it.models.implextend.SampleServiceInterface;
import org.apache.sling.models.it.models.implextend.SimplePropertyModel;
+import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ImplementsExtendsTest {
+public class ImplementsExtendsIT {
- @TestReference
- private ResourceResolverFactory rrFactory;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
private AdapterManager adapterManager;
private String firstValue;
@@ -59,6 +57,8 @@ public class ImplementsExtendsTest {
@Before
public void setUp() throws Exception {
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
+ adapterManager = teleporter.getService(AdapterManager.class);
firstValue = RandomStringUtils.randomAlphanumeric(10);
thirdValue = RandomStringUtils.randomAlphanumeric(10);
@@ -72,6 +72,14 @@ public class ImplementsExtendsTest {
resource = resolver.getResource(createdNode.getPath());
}
+
+ @After
+ public void after() throws Exception {
+
+ if (resolver != null) {
+ resolver.close();
+ }
+ }
/**
* Try to adapt to interface, with an different implementation class that
has the @Model annotation
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
Tue Jul 11 19:23:26 2017
@@ -14,36 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import javax.jcr.Node;
import javax.jcr.Session;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.sling.api.adapter.AdapterManager;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
-import org.apache.sling.models.it.models.SourceObject;
-import org.apache.sling.models.it.models.ViaModel;
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.models.it.models.SlingPropertyAnnotationTestModel;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ViaTest {
+public class InjectorSpecificAnnotationIT {
- @TestReference
- private ResourceResolverFactory rrFactory;
-
- @TestReference
- private AdapterManager adapterManager;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
@Test
public void test() throws Exception {
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
String value = RandomStringUtils.randomAlphanumeric(10);
ResourceResolver resolver = null;
@@ -57,9 +53,8 @@ public class ViaTest {
session.save();
Resource resource = resolver.getResource(createdNode.getPath());
- SourceObject obj = new SourceObject(resource);
- ViaModel model = adapterManager.getAdapter(obj, ViaModel.class);
+ SlingPropertyAnnotationTestModel model =
resource.adaptTo(SlingPropertyAnnotationTestModel.class);
assertNotNull("Model is null", model);
assertEquals("Test Property is not set correctly", value,
model.getTestProperty());
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ModelFactorySimpleTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ModelFactorySimpleTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ModelFactorySimpleTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -29,8 +29,7 @@ import org.apache.commons.lang.RandomStr
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.factory.ModelFactory;
import org.apache.sling.models.it.models.ConstructorInjectionTestModel;
import org.apache.sling.models.it.models.FieldInjectionTestModel;
@@ -38,16 +37,14 @@ import org.apache.sling.models.it.models
import org.apache.sling.models.it.models.implextend.SampleServiceInterface;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ModelFactorySimpleTest {
+public class ModelFactorySimpleIT {
+
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
- private ResourceResolverFactory rrFactory;
-
- @TestReference
private ModelFactory modelFactory;
private String value;
@@ -57,6 +54,8 @@ public class ModelFactorySimpleTest {
@Before
public void setUp() throws Exception {
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
+ modelFactory = teleporter.getService(ModelFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
resolver = rrFactory.getAdministrativeResourceResolver(null);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -34,35 +34,24 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.junit.Activator;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.factory.ModelFactory;
import org.apache.sling.models.it.models.ServiceInjectionTestModel;
import org.apache.sling.models.it.services.SimpleService;
import org.apache.sling.models.it.services.SimpleServiceWithCustomRanking;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.util.tracker.ServiceTracker;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ServiceInjectionWithDifferentRankingTest {
+public class ServiceInjectionWithDifferentRankingIT {
- @TestReference
- ConfigurationAdmin configAdmin;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
- private ResourceResolverFactory rrFactory;
-
- @TestReference
- private ServiceTracker serviceTracker;
-
- @TestReference
private ModelFactory modelFactory;
private String value;
@@ -74,6 +63,8 @@ public class ServiceInjectionWithDiffere
@Before
public void setUp() throws Exception {
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
+ modelFactory = teleporter.getService(ModelFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
resolver = rrFactory.getAdministrativeResourceResolver(null);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/SimpleIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/SimpleTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/SimpleIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/SimpleIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/SimpleTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/SimpleTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/SimpleIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
import static org.junit.Assert.*;
@@ -25,21 +25,19 @@ import org.apache.commons.lang.RandomStr
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.it.models.ConstructorInjectionTestModel;
import org.apache.sling.models.it.models.InterfaceInjectionTestModel;
import org.apache.sling.models.it.models.FieldInjectionTestModel;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class SimpleTest {
+public class SimpleIT {
- @TestReference
- private ResourceResolverFactory rrFactory;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
private String value;
private String childValue;
@@ -49,6 +47,7 @@ public class SimpleTest {
@Before
public void setUp() throws Exception {
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
childValue = RandomStringUtils.randomAlphanumeric(10);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ViaIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ViaIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ViaIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ViaTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/ViaIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it;
+package org.apache.sling.models.testing;
import static org.junit.Assert.*;
@@ -26,24 +26,22 @@ import org.apache.sling.api.adapter.Adap
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.it.models.SourceObject;
import org.apache.sling.models.it.models.ViaModel;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ViaTest {
+public class ViaIT {
- @TestReference
- private ResourceResolverFactory rrFactory;
-
- @TestReference
- private AdapterManager adapterManager;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
@Test
public void test() throws Exception {
+ ResourceResolverFactory rrFactory =
teleporter.getService(ResourceResolverFactory.class);
+ AdapterManager adapterManager =
teleporter.getService(AdapterManager.class);
+
String value = RandomStringUtils.randomAlphanumeric(10);
ResourceResolver resolver = null;
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateRequestTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateRequestTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateRequestTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it.delegate;
+package org.apache.sling.models.testing.delegate;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
@@ -23,29 +23,28 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.factory.ModelFactory;
import org.apache.sling.models.it.delegate.request.DelegateBaseModel;
import org.apache.sling.models.it.delegate.request.DelegateExtendedModel;
import org.apache.sling.models.it.delegate.request.DelegateInterface;
-import org.apache.sling.models.it.rtbound.FakeRequest;
+import org.apache.sling.models.testing.rtbound.FakeRequest;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.*;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class DelegateRequestTest {
+public class DelegateRequestIT {
+
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
private ResourceResolverFactory rrFactory;
- @TestReference
private ModelFactory modelFactory;
private final String baseComponentPath = "/content/delegate/baseComponent";
@@ -53,6 +52,8 @@ public class DelegateRequestTest {
@Before
public void setup() throws LoginException, PersistenceException {
+ rrFactory = teleporter.getService(ResourceResolverFactory.class);
+ modelFactory = teleporter.getService(ModelFactory.class);
ResourceResolver adminResolver = null;
try {
adminResolver = rrFactory.getAdministrativeResourceResolver(null);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateResourceTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateResourceTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/delegate/DelegateResourceTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it.delegate;
+package org.apache.sling.models.testing.delegate;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
@@ -23,24 +23,24 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.it.delegate.resource.DelegateBaseModel;
import org.apache.sling.models.it.delegate.resource.DelegateExtendedModel;
import org.apache.sling.models.it.delegate.resource.DelegateInterface;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.*;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class DelegateResourceTest {
+public class DelegateResourceIT {
+
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
private ResourceResolverFactory rrFactory;
private final String baseComponentPath = "/content/delegate/baseComponent";
@@ -48,6 +48,7 @@ public class DelegateResourceTest {
@Before
public void setup() throws LoginException, PersistenceException {
+ rrFactory = teleporter.getService(ResourceResolverFactory.class);
ResourceResolver adminResolver = null;
try {
adminResolver = rrFactory.getAdministrativeResourceResolver(null);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/ExporterTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it.exporter;
+package org.apache.sling.models.testing.exporter;
import java.io.InputStream;
import java.io.StringReader;
@@ -37,25 +37,23 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.engine.SlingRequestProcessor;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.factory.MissingExporterException;
import org.apache.sling.models.factory.ModelFactory;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ExporterTest {
+public class ExporterIT {
+
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
private ResourceResolverFactory rrFactory;
- @TestReference
private ModelFactory modelFactory;
- @TestReference
private SlingRequestProcessor slingRequestProcessor;
private final String baseComponentPath = "/content/exp/baseComponent";
@@ -72,6 +70,10 @@ public class ExporterTest {
@Before
public void setup() throws Exception {
+ rrFactory = teleporter.getService(ResourceResolverFactory.class);
+ modelFactory = teleporter.getService(ModelFactory.class);
+ slingRequestProcessor =
teleporter.getService(SlingRequestProcessor.class);
+
ResourceResolver adminResolver = null;
try {
adminResolver = rrFactory.getAdministrativeResourceResolver(null);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/FakeRequest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/FakeRequest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/FakeRequest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it.rtbound;
+package org.apache.sling.models.testing.rtbound;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it.rtbound;
+package org.apache.sling.models.testing.rtbound;
import java.util.HashMap;
import java.util.Map;
@@ -26,21 +26,23 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
+import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.factory.ModelFactory;
+import org.apache.sling.models.it.rtbound.BaseComponent;
+import org.apache.sling.models.it.rtbound.ExtendedComponent;
+import org.apache.sling.models.it.rtbound.FromRequestComponent;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ResourceTypeBindingTest {
+public class ResourceTypeBindingIT {
+
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
private ResourceResolverFactory rrFactory;
- @TestReference
private ModelFactory modelFactory;
private final String baseComponentPath = "/content/rt/baseComponent";
@@ -51,6 +53,9 @@ public class ResourceTypeBindingTest {
@Before
public void setup() throws LoginException, PersistenceException {
+ rrFactory = teleporter.getService(ResourceResolverFactory.class);
+ modelFactory = teleporter.getService(ModelFactory.class);
+
ResourceResolver adminResolver = null;
try {
adminResolver = rrFactory.getAdministrativeResourceResolver(null);
Copied:
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
(from r1801589,
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java?p2=sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java&p1=sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerTest.java&r1=1801589&r2=1801648&rev=1801648&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerTest.java
(original)
+++
sling/trunk/bundles/extensions/models/integration-tests/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
Tue Jul 11 19:23:26 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.models.it.rtboundpicker;
+package org.apache.sling.models.testing.rtboundpicker;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
@@ -23,31 +23,31 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner;
-import org.apache.sling.junit.annotations.TestReference;
-import org.apache.sling.models.factory.ModelFactory;
+import org.apache.sling.junit.rules.TeleporterRule;
+import org.apache.sling.models.it.rtboundpicker.BaseComponent;
+import org.apache.sling.models.it.rtboundpicker.SubRTComponent;
+import org.apache.sling.models.it.rtboundpicker.TestComponent;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
import java.util.HashMap;
import java.util.Map;
-@RunWith(SlingAnnotationsTestRunner.class)
-public class ResourceTypePickerTest {
+public class ResourceTypePickerIT {
- @TestReference
- private ResourceResolverFactory rrFactory;
+ @Rule
+ public final TeleporterRule teleporter =
TeleporterRule.forClass(getClass(), "SM_Teleporter");
- @TestReference
- private ModelFactory modelFactory;
+ private ResourceResolverFactory rrFactory;
private final String baseComponentPath = "/content/rtpicker/baseComponent";
private final String childComponentPath =
"/content/rtpicker/childComponent";
@Before
public void setup() throws LoginException, PersistenceException {
+ rrFactory = teleporter.getService(ResourceResolverFactory.class);
ResourceResolver adminResolver = null;
try {
adminResolver = rrFactory.getAdministrativeResourceResolver(null);
