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/12/05 19:15:39 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated (fd63317 -> 01fafef)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.
from fd63317 SLING-8769 Remove feature sling-extensions-threaddump
new 6acd0ec SLING-8881 Rename feature composum into composum-nodes
new 01fafef SLING-8882 Factor out Thymeleaf from sling-scripting-thymeleaf into new feature thymeleaf
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{ComposumIT.java => ComposumNodesIT.java} | 4 ++--
.../tests/bootstrap/SlingScriptingThymeleafIT.java | 28 ----------------------
...gScriptingThymeleafIT.java => ThymeleafIT.java} | 11 ++-------
3 files changed, 4 insertions(+), 39 deletions(-)
rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{ComposumIT.java => ComposumNodesIT.java} (96%)
copy src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingScriptingThymeleafIT.java => ThymeleafIT.java} (86%)
[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-8881
Rename feature composum into composum-nodes
Posted by ol...@apache.org.
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-karaf-integration-tests.git
commit 6acd0ec67d99091bb16bf3003d17d7751a4041cf
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 5 18:10:11 2019 +0100
SLING-8881 Rename feature composum into composum-nodes
---
.../karaf/tests/bootstrap/{ComposumIT.java => ComposumNodesIT.java} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
similarity index 96%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
index c6201ab..8789443 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class ComposumIT extends KarafTestSupport {
+public class ComposumNodesIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("composum")
+ addSlingFeatures("composum-nodes")
);
}
[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-8882
Factor out Thymeleaf from sling-scripting-thymeleaf into new feature
thymeleaf
Posted by ol...@apache.org.
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-karaf-integration-tests.git
commit 01fafefd59afc836e3c2d9590a67c02eddde0c82
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 5 18:18:35 2019 +0100
SLING-8882 Factor out Thymeleaf from sling-scripting-thymeleaf into new feature thymeleaf
---
.../tests/bootstrap/SlingScriptingThymeleafIT.java | 28 ----------------------
...gScriptingThymeleafIT.java => ThymeleafIT.java} | 11 ++-------
2 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
index b22aa2e..878cb7e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
@@ -50,32 +50,4 @@ public class SlingScriptingThymeleafIT extends KarafTestSupport {
assertEquals(Bundle.ACTIVE, bundle.getState());
}
- @Test
- public void testOrgAttoparser() {
- final Bundle bundle = findBundle("org.attoparser");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgUnbescape() {
- final Bundle bundle = findBundle("org.unbescape");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheServicemixBundlesOgnl() {
- final Bundle bundle = findBundle("org.apache.servicemix.bundles.ognl");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testJavassist() {
- final Bundle bundle = findBundle("javassist");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ThymeleafIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
copy to src/test/java/org/apache/sling/karaf/tests/bootstrap/ThymeleafIT.java
index b22aa2e..b1e0d0d 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ThymeleafIT.java
@@ -34,23 +34,16 @@ import static org.junit.Assert.assertNotNull;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class SlingScriptingThymeleafIT extends KarafTestSupport {
+public class ThymeleafIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-thymeleaf")
+ addSlingFeatures("thymeleaf")
);
}
@Test
- public void testOrgApacheSlingScriptingThymeleaf() {
- final Bundle bundle = findBundle("org.apache.sling.scripting.thymeleaf");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
public void testOrgAttoparser() {
final Bundle bundle = findBundle("org.attoparser");
assertNotNull(bundle);