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 2020/11/25 08:44:31 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated:
SLING-9934 Fix typo in option spifly
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
The following commit(s) were added to refs/heads/master by this push:
new e24cdc4 SLING-9934 Fix typo in option spifly
e24cdc4 is described below
commit e24cdc47eaeb0970b49927ffa4c1e4314e28b37f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Nov 24 21:05:43 2020 +0100
SLING-9934 Fix typo in option spifly
rename spyfly to spifly
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 2 +-
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 4 ++--
src/main/resources/templates/SlingOptions.hbs | 2 +-
.../apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java | 4 ++--
.../tests/{SlingOptionsSpyflyIT.java => SlingOptionsSpiflyIT.java} | 6 +++---
5 files changed, 9 insertions(+), 9 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 ea82c44..5d842c6 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -133,7 +133,7 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption spyfly() {
+ public static ModifiableCompositeOption spifly() {
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),
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 7ec595a..e2a5144 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -35,7 +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.apache.sling.testing.paxexam.SlingOptions.spifly;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
@@ -82,7 +82,7 @@ public abstract class TestSupport {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject(),
paxTinybundles(),
backing(),
- spyfly()
+ spifly()
);
}
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 0d79265..3e5c9b9 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -133,7 +133,7 @@ public class SlingOptions {
);
}
- public static ModifiableCompositeOption spyfly() {
+ public static ModifiableCompositeOption spifly() {
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),
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 64df997..69725f6 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,7 +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.apache.sling.testing.paxexam.SlingOptions.spifly;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
@@ -49,7 +49,7 @@ public abstract class SlingOptionsTestSupport {
CoreOptions.workingDirectory(workingDirectory()),
testBundle("bundle.filename"),
backing(),
- spyfly()
+ spifly()
);
}
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/SlingOptionsSpiflyIT.java
similarity index 91%
rename from src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpiflyIT.java
index f4aefde..38ccee6 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpyflyIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSpiflyIT.java
@@ -27,13 +27,13 @@ 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.apache.sling.testing.paxexam.SlingOptions.spifly;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
import static org.ops4j.pax.exam.CoreOptions.options;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSpyflyIT extends SlingOptionsTestSupport {
+public class SlingOptionsSpiflyIT extends SlingOptionsTestSupport {
@Configuration
public Option[] configuration() {
@@ -41,7 +41,7 @@ public class SlingOptionsSpyflyIT extends SlingOptionsTestSupport {
failOnUnresolvedBundles(),
keepCaches(),
localMavenRepo(),
- spyfly()
+ spifly()
);
}