You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2019/05/28 21:00:16 UTC
[sling-org-apache-sling-testing-paxexam] 03/04: SLING-8445 Provide
SPI Fly Option
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit e8dd5a2e6591b07facddd7e42d7c10aa343ea2dd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 28 22:58:05 2019 +0200
SLING-8445 Provide SPI Fly Option
Use in TestSupport and SlingOptionsTestSupport (required by upcoming bundle updates)
---
.../apache/sling/testing/paxexam/SlingOptions.java | 8 ++++
.../testing/paxexam/SlingVersionResolver.java | 2 +
.../apache/sling/testing/paxexam/TestSupport.java | 4 +-
src/main/resources/templates/SlingOptions.hbs | 8 ++++
.../resources/templates/SlingVersionResolver.hbs | 2 +
.../paxexam/it/SlingOptionsTestSupport.java | 4 +-
.../paxexam/it/tests/SlingOptionsSpyflyIT.java | 51 ++++++++++++++++++++++
7 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index bcb0bf3..d452275 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -101,6 +101,14 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption spyfly() {
+ return composite(
+ mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
+ mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").version(versionResolver),
+ mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption webconsole() {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver),
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index fcc0d24..5b95b75 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -51,6 +51,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.8");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
+ versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.2.1");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
@@ -61,6 +62,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
+ versions.put("org.ow2.asm:asm", "7.1");
versions.put("org.slf4j:slf4j-api", "1.7.26");
versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
versions.put("ch.qos.logback:logback-core", "1.2.3");
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index c51a760..d848939 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -35,6 +35,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
import static org.apache.sling.testing.paxexam.SlingOptions.backing;
import static org.apache.sling.testing.paxexam.SlingOptions.paxTinybundles;
+import static org.apache.sling.testing.paxexam.SlingOptions.spyfly;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
@@ -81,7 +82,8 @@ public abstract class TestSupport {
CoreOptions.workingDirectory(workingDirectory()),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject(),
paxTinybundles(),
- backing()
+ backing(),
+ spyfly()
);
}
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index f56eb7a..d60534c 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -101,6 +101,14 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption spyfly() {
+ return composite(
+ mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
+ mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").version(versionResolver),
+ mavenBundle().groupId("org.ow2.asm").artifactId("asm").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption webconsole() {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole").version(versionResolver),
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index e61cb43..d830dc8 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -51,6 +51,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.8");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
+ versions.put("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle", "1.2.1");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
@@ -61,6 +62,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.ops4j.pax.url:pax-url-classpath", "2.6.1");
versions.put("org.ops4j.pax.url:pax-url-commons", "2.6.1");
versions.put("org.ops4j.pax.tinybundles:tinybundles", "3.0.0");
+ versions.put("org.ow2.asm:asm", "7.1");
versions.put("org.slf4j:slf4j-api", "1.7.26");
versions.put("org.slf4j:jcl-over-slf4j", "1.7.26");
versions.put("ch.qos.logback:logback-core", "1.2.3");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
index 87c1ef5..64df997 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
@@ -26,6 +26,7 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.util.PathUtils;
import static org.apache.sling.testing.paxexam.SlingOptions.backing;
+import static org.apache.sling.testing.paxexam.SlingOptions.spyfly;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
@@ -47,7 +48,8 @@ public abstract class SlingOptionsTestSupport {
localMavenRepo(),
CoreOptions.workingDirectory(workingDirectory()),
testBundle("bundle.filename"),
- backing()
+ backing(),
+ spyfly()
);
}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java
new file mode 100644
index 0000000..0827835
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java
@@ -0,0 +1,51 @@
+/*
+ * 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.testing.paxexam.it.tests;
+
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
+import static org.apache.sling.testing.paxexam.SlingOptions.spyfly;
+import static org.ops4j.pax.exam.CoreOptions.keepCaches;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsSpyflyIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return new Option[]{
+ failOnUnresolvedBundles(),
+ keepCaches(),
+ localMavenRepo(),
+ spyfly()
+ };
+ }
+
+ @Test
+ public void test() {
+ }
+
+}