Author: adietish Date: 2011-09-12 10:17:02 -0400 (Mon, 12 Sep 2011) New Revision: 34637 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/JsonSanitizer.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java Log: [JBIDE-9510] implemented list cartridges in openshift service. Created integration test Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/JsonSanitizer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/JsonSanitizer.java 2011-09-12 14:06:22 UTC (rev 34636) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/response/JsonSanitizer.java 2011-09-12 14:17:02 UTC (rev 34637) @@ -3,6 +3,20 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +/** + * @author André Dietisheim + */ public class JsonSanitizer { private static final Pattern QUOTED_JSON_OBJECT_PATTERN = Pattern.compile("\"\\{(.+)\\}\""); Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java 2011-09-12 14:17:02 UTC (rev 34637) @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.fail; + +import java.text.MessageFormat; +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; + +public class CartridgeAsserts { + + public static void assertThatContainsCartridge(String cartridgeName, List<Cartridge> cartridges) { + boolean found = false; + for (Cartridge cartridge : cartridges) { + if (cartridgeName.equals(cartridge.getName())) { + found = true; + break; + } + } + if (!found) { + fail(MessageFormat.format("Could not find cartridge with name \"{0}\"", cartridgeName)); + } + } + + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java 2011-09-12 14:17:02 UTC (rev 34637) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.jboss.ide.eclipse.as.openshift.internal.test.core.CartridgeAsserts.assertThatContainsCartridge; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.internal.core.OpenshiftService; +import org.junit.Before; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class ListCartridgesIntegrationTest { + + private OpenshiftService openshiftService; + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Before + public void setUp() { + this.openshiftService = new OpenshiftService(USERNAME, PASSWORD); + } + + @Test + public void canListCartridges() throws Exception { + List<Cartridge> cartridges = openshiftService.getCartridges(); + assertNotNull(cartridges); + assertTrue(cartridges.size() > 0); + assertThatContainsCartridge("jbossas-7.0", cartridges); + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java 2011-09-12 14:06:22 UTC (rev 34636) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java 2011-09-12 14:17:02 UTC (rev 34637) @@ -10,11 +10,10 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.internal.test.core; +import static org.jboss.ide.eclipse.as.openshift.internal.test.core.CartridgeAsserts.assertThatContainsCartridge; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import java.net.URLEncoder; -import java.text.MessageFormat; import java.util.List; import org.jboss.ide.eclipse.as.openshift.core.Cartridge; @@ -92,16 +91,4 @@ assertEquals(0, response.getExitCode()); } - private void assertThatContainsCartridge(String cartridgeName, List<Cartridge> cartridges) { - boolean found = false; - for (Cartridge cartridge : cartridges) { - if (cartridgeName.equals(cartridge.getName())) { - found = true; - break; - } - } - if (!found) { - fail(MessageFormat.format("Could not find cartridge with name \"{0}\"", cartridgeName)); - } - } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java 2011-09-12 14:06:22 UTC (rev 34636) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java 2011-09-12 14:17:02 UTC (rev 34637) @@ -18,7 +18,8 @@ @Suite.SuiteClasses({ ApplicationIntegrationTest.class, CartridgesIntegrationTest.class, - DomainIntegrationTest.class + DomainIntegrationTest.class, + ListCartridgesIntegrationTest.class }) /** * @author André Dietisheim