Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11EFF10C3F for ; Tue, 1 Apr 2014 11:44:00 +0000 (UTC) Received: (qmail 53757 invoked by uid 500); 1 Apr 2014 11:43:57 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 53554 invoked by uid 500); 1 Apr 2014 11:43:50 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 53309 invoked by uid 99); 1 Apr 2014 11:43:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 11:43:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9FBBF91B8CD; Tue, 1 Apr 2014 11:43:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gnodet@apache.org To: commits@karaf.apache.org Date: Tue, 01 Apr 2014 11:43:43 -0000 Message-Id: <07c788b6a787472a9e757dccce2aff91@git.apache.org> In-Reply-To: <9402365d797e4b5da251b415b3fc6ef3@git.apache.org> References: <9402365d797e4b5da251b415b3fc6ef3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Tue Apr 1 12:58:12 2014 +0200 Committer: Guillaume Nodet 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 featuresBefore = new HashSet(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"); } }