You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/04/01 13:43:43 UTC
[10/11] git commit: Remove ambiguity method names that cause some
integration tests to fail
Remove ambiguity method names that cause some integration tests to fail
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8a3e43ef
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8a3e43ef
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8a3e43ef
Branch: refs/heads/master
Commit: 8a3e43ef2e890abd118f5bf178f4af097e393b1f
Parents: dfb3198
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Apr 1 12:58:12 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Apr 1 12:58:12 2014 +0200
----------------------------------------------------------------------
.../apache/karaf/itests/KarafTestSupport.java | 2 +-
.../itests/features/EnterpriseFeaturesTest.java | 24 ++++++------
.../itests/features/Spring3FeaturesTest.java | 8 ++--
.../itests/features/StandardFeaturesTest.java | 40 ++++++++++----------
4 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8a3e43ef/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index 9d3b729..ea7ac9c 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -421,7 +421,7 @@ public class KarafTestSupport {
}
}
- protected void installAssertAndUninstallFeature(String... feature) throws Exception {
+ protected void installAssertAndUninstallFeatures(String... feature) throws Exception {
Set<Feature> featuresBefore = new HashSet<Feature>(Arrays.asList(featureService.listInstalledFeatures()));
try {
for (String curFeature : feature) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/8a3e43ef/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
index f304278..5f27fb3 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
@@ -27,64 +27,64 @@ public class EnterpriseFeaturesTest extends KarafTestSupport {
@Test
public void installTransactionFeature() throws Exception {
- installAssertAndUninstallFeature("transaction");
+ installAssertAndUninstallFeatures("transaction");
}
@Test
public void installJpaFeature() throws Exception {
- installAssertAndUninstallFeature("jpa");
+ installAssertAndUninstallFeatures("jpa");
}
@Test
public void installOpenJpaFeature() throws Exception {
- installAssertAndUninstallFeature("openjpa");
+ installAssertAndUninstallFeatures("openjpa");
}
@Test
public void installHibernateFeature() throws Exception {
- installAssertAndUninstallFeature("hibernate");
+ installAssertAndUninstallFeatures("hibernate");
}
@Test
public void installHibernateEnversFeature() throws Exception {
- installAssertAndUninstallFeature("hibernate-envers");
+ installAssertAndUninstallFeatures("hibernate-envers");
}
@Test
public void installHibernateValidatorFeature() throws Exception {
- installAssertAndUninstallFeature("hibernate-validator");
+ installAssertAndUninstallFeatures("hibernate-validator");
}
@Test
public void installJndiFeature() throws Exception {
- installAssertAndUninstallFeature("jndi");
+ installAssertAndUninstallFeatures("jndi");
}
@Test
public void installJdbcFeature() throws Exception {
- installAssertAndUninstallFeature("jdbc");
+ installAssertAndUninstallFeatures("jdbc");
}
@Test
public void installJmsFeature() throws Exception {
- installAssertAndUninstallFeature("jms");
+ installAssertAndUninstallFeatures("jms");
}
@Test
@Ignore("Pax-cdi depends on scr feature [2.3,3.5) so it does not work with 4.0")
public void installOpenWebBeansFeature() throws Exception {
- installAssertAndUninstallFeature("openwebbeans");
+ installAssertAndUninstallFeatures("openwebbeans");
}
@Test
@Ignore("Pax-cdi depends on scr feature [2.3,3.5) so it does not work with 4.0")
public void installWeldFeature() throws Exception {
- installAssertAndUninstallFeature("weld");
+ installAssertAndUninstallFeatures("weld");
}
@Test
public void installApplicationWithoutIsolationFeature() throws Exception {
- installAssertAndUninstallFeature("application-without-isolation");
+ installAssertAndUninstallFeatures("application-without-isolation");
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/8a3e43ef/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
index 57128bd..22e1113 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
@@ -36,12 +36,12 @@ public class Spring3FeaturesTest extends KarafTestSupport {
@Test
public void installSpringDmFeature() throws Exception {
- installAssertAndUninstallFeature("spring-dm");
+ installAssertAndUninstallFeatures("spring-dm");
}
@Test
public void installSpringDmWebFeature() throws Exception {
- installAssertAndUninstallFeature("spring-dm-web");
+ installAssertAndUninstallFeatures("spring-dm-web");
}
@Test
@@ -96,12 +96,12 @@ public class Spring3FeaturesTest extends KarafTestSupport {
@Test
public void installSpringSecurityFeature() throws Exception {
- installAssertAndUninstallFeature("spring-security");
+ installAssertAndUninstallFeatures("spring-security");
}
@Test
public void installGeminiBlueprintFeature() throws Exception {
- installAssertAndUninstallFeature("gemini-blueprint");
+ installAssertAndUninstallFeatures("gemini-blueprint");
}
// TODO add combined/all Spring features installation tests
http://git-wip-us.apache.org/repos/asf/karaf/blob/8a3e43ef/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
index 425be8a..c0e2086 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
@@ -30,98 +30,98 @@ public class StandardFeaturesTest extends KarafTestSupport {
* @throws Exception
*/
public void checkInteractionOfHttpAndAriesAnnotationFeature() throws Exception {
- installAssertAndUninstallFeature("aries-annotation", "pax-http");
- installAssertAndUninstallFeature("pax-http", "aries-annotation");
+ installAssertAndUninstallFeatures("aries-annotation", "pax-http");
+ installAssertAndUninstallFeatures("pax-http", "aries-annotation");
}
@Test
public void installAriesAnnotationFeature() throws Exception {
- installAssertAndUninstallFeature("aries-annotation");
+ installAssertAndUninstallFeatures("aries-annotation");
}
@Test
public void installAriesBlueprintWebFeature() throws Exception {
- installAssertAndUninstallFeature("blueprint-web");
+ installAssertAndUninstallFeatures("blueprint-web");
}
@Test
public void installWrapperFeature() throws Exception {
- installAssertAndUninstallFeature("wrapper");
+ installAssertAndUninstallFeatures("wrapper");
}
@Test
public void installObrFeature() throws Exception {
- installAssertAndUninstallFeature("obr");
+ installAssertAndUninstallFeatures("obr");
}
@Test
public void installConfigFeature() throws Exception {
- installAssertAndUninstallFeature("config");
+ installAssertAndUninstallFeatures("config");
}
@Test
public void installRegionFeature() throws Exception {
- installAssertAndUninstallFeature("region");
+ installAssertAndUninstallFeatures("region");
}
@Test
public void installPackageFeature() throws Exception {
- installAssertAndUninstallFeature("package");
+ installAssertAndUninstallFeatures("package");
}
@Test
public void installHttpFeature() throws Exception {
- installAssertAndUninstallFeature("http");
+ installAssertAndUninstallFeatures("http");
}
@Test
public void installHttpWhiteboardFeature() throws Exception {
- installAssertAndUninstallFeature("http-whiteboard");
+ installAssertAndUninstallFeatures("http-whiteboard");
}
@Test
public void installWarFeature() throws Exception {
- installAssertAndUninstallFeature("war");
+ installAssertAndUninstallFeatures("war");
}
@Test
public void installKarFeature() throws Exception {
- installAssertAndUninstallFeature("kar");
+ installAssertAndUninstallFeatures("kar");
}
@Test
public void installWebConsoleFeature() throws Exception {
- installAssertAndUninstallFeature("webconsole");
+ installAssertAndUninstallFeatures("webconsole");
}
@Test
public void installSSHFeature() throws Exception {
- installAssertAndUninstallFeature("ssh");
+ installAssertAndUninstallFeatures("ssh");
}
@Test
public void installManagementFeature() throws Exception {
- installAssertAndUninstallFeature("management");
+ installAssertAndUninstallFeatures("management");
}
@Test
public void installSchedulerFeature() throws Exception {
- installAssertAndUninstallFeature("scheduler");
+ installAssertAndUninstallFeatures("scheduler");
}
@Test
public void installEventAdminFeature() throws Exception {
- installAssertAndUninstallFeature("eventadmin");
+ installAssertAndUninstallFeatures("eventadmin");
}
@Test
public void installJasyptEncryptionFeature() throws Exception {
- installAssertAndUninstallFeature("jasypt-encryption");
+ installAssertAndUninstallFeatures("jasypt-encryption");
}
@Test
public void installScrFeature() throws Exception {
- installAssertAndUninstallFeature("scr");
+ installAssertAndUninstallFeatures("scr");
}
}