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 2022/07/22 13:33:44 UTC
[sling-org-apache-sling-testing-paxexam] 02/02: SLING-11490 Provide JUnit 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 e800aba23a1a03d8e1d1be27af9b71673918c171
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jul 22 15:33:19 2022 +0200
SLING-11490 Provide JUnit Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 11 +++--
.../testing/paxexam/SlingVersionResolver.java | 1 +
src/main/resources/templates/SlingOptions.hbs | 11 +++--
.../resources/templates/SlingVersionResolver.hbs | 1 +
.../paxexam/it/tests/SlingOptionsJunitIT.java | 49 ++++++++++++++++++++++
5 files changed, 67 insertions(+), 6 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 4a5efd2..3c0d780 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -25,7 +25,6 @@ import org.ops4j.pax.exam.util.PathUtils;
import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemPackages;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -91,7 +90,7 @@ public class SlingOptions {
mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").version(versionResolver),
mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").version(versionResolver),
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-2.0.1").version(versionResolver),
- junitBundles(),
+ junit(),
// add GreenMail to boot classpath *also* to allow setting ssl.SocketFactory.provider to GreenMail's DummySSLSocketFactory
bootClasspathLibrary(greenmail).afterFramework(),
bootClasspathLibrary(slf4j_api).afterFramework(), // GreenMail dependency
@@ -128,6 +127,12 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption junit() {
+ return composite(
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.junit").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption management() {
return composite(
mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
@@ -282,7 +287,7 @@ public class SlingOptions {
public static ModifiableCompositeOption testcontainers() {
return composite(
- junitBundles(),
+ junit(),
paxUrlWrap(),
wrappedBundle(mavenBundle().groupId("org.rnorth.duct-tape").artifactId("duct-tape").version(versionResolver)),
wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").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 2dd5b70..d66c4d4 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -66,6 +66,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.groovy:groovy-json", "4.0.3");
versions.put("org.apache.groovy:groovy-xml", "4.0.3");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.13.2_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0");
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index cf46627..f0a00fb 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -25,7 +25,6 @@ import org.ops4j.pax.exam.util.PathUtils;
import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemPackages;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -91,7 +90,7 @@ public class SlingOptions {
mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").version(versionResolver),
mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").version(versionResolver),
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-2.0.1").version(versionResolver),
- junitBundles(),
+ junit(),
// add GreenMail to boot classpath *also* to allow setting ssl.SocketFactory.provider to GreenMail's DummySSLSocketFactory
bootClasspathLibrary(greenmail).afterFramework(),
bootClasspathLibrary(slf4j_api).afterFramework(), // GreenMail dependency
@@ -128,6 +127,12 @@ public class SlingOptions {
);
}
+ public static ModifiableCompositeOption junit() {
+ return composite(
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.junit").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption management() {
return composite(
mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version(versionResolver),
@@ -282,7 +287,7 @@ public class SlingOptions {
public static ModifiableCompositeOption testcontainers() {
return composite(
- junitBundles(),
+ junit(),
paxUrlWrap(),
wrappedBundle(mavenBundle().groupId("org.rnorth.duct-tape").artifactId("duct-tape").version(versionResolver)),
wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").version(versionResolver))
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index ddf93f7..ea76dbc 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -66,6 +66,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.groovy:groovy-json", "4.0.3");
versions.put("org.apache.groovy:groovy-xml", "4.0.3");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", "4.13.2_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup", "1.2.1_1");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.annotation-api-1.3", "1.3_3");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJunitIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJunitIT.java
new file mode 100644
index 0000000..e0ca218
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJunitIT.java
@@ -0,0 +1,49 @@
+/*
+ * 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.junit;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsJunitIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ junit()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}