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/07/21 09:00:30 UTC
[sling-org-apache-sling-testing-paxexam] 02/02: SLING-8589 Provide
Awaitility 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 e4bb9dcdb04414365ef21da7d10714b0ab5e1286
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Jul 21 10:57:28 2019 +0200
SLING-8589 Provide Awaitility Option
---
.../apache/sling/testing/paxexam/SlingOptions.java | 7 ++++
.../testing/paxexam/SlingVersionResolver.java | 2 +
src/main/resources/templates/SlingOptions.hbs | 7 ++++
.../resources/templates/SlingVersionResolver.hbs | 2 +
.../paxexam/it/tests/SlingOptionsAwaitilityIT.java | 49 ++++++++++++++++++++++
5 files changed, 67 insertions(+)
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 1e59c0a..e850700 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -37,6 +37,13 @@ public class SlingOptions {
public static SlingVersionResolver versionResolver = new SlingVersionResolver();
+ public static ModifiableCompositeOption awaitility() {
+ return composite(
+ mavenBundle().groupId("org.awaitility").artifactId("awaitility").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption backing() {
final int version = SlingVersionResolver.getJavaVersion();
if (version >= 11) {
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 22b55c0..eaeadac 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -38,6 +38,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2", "2.9.0");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.hamcrest", "1.3_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0");
@@ -56,6 +57,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12");
+ versions.put("org.awaitility:awaitility", "3.1.6");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 9599ade..fea1956 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -37,6 +37,13 @@ public class SlingOptions {
public static SlingVersionResolver versionResolver = new SlingVersionResolver();
+ public static ModifiableCompositeOption awaitility() {
+ return composite(
+ mavenBundle().groupId("org.awaitility").artifactId("awaitility").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").version(versionResolver)
+ );
+ }
+
public static ModifiableCompositeOption backing() {
final int version = SlingVersionResolver.getJavaVersion();
if (version >= 11) {
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 528b168..030be6a 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -38,6 +38,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1", "2.9.0");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2", "1.2_1");
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2", "2.9.0");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.hamcrest", "1.3_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl", "2.2.11_1");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0");
@@ -56,6 +57,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12");
+ versions.put("org.awaitility:awaitility", "3.1.6");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-bnd", "1.8.3");
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsAwaitilityIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsAwaitilityIT.java
new file mode 100644
index 0000000..a026788
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsAwaitilityIT.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.awaitility;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingOptionsAwaitilityIT extends SlingOptionsTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return options(
+ baseConfiguration(),
+ awaitility()
+ );
+ }
+
+ @Test
+ public void test() {
+ }
+
+}