Author: rob.stryker(a)jboss.com Date: 2012-01-06 06:30:36 -0500 (Fri, 06 Jan 2012) New Revision: 37678 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java Log: JBIDE-10598 - removing deprecated as7 management Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2012-01-06 11:10:01 UTC (rev 37677) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2012-01-06 11:30:36 UTC (rev 37678) @@ -5,12 +5,12 @@ Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.jboss.ide.eclipse.as.core;bundle-version="[2.2.0,3.0.0)", - org.jboss.ide.eclipse.as.management.as7;bundle-version="[2.2.0,3.0.0)", org.junit;bundle-version="[4.8.1,5.0.0)", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.jboss.ide.eclipse.as.test, - org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0" + org.jboss.ide.eclipse.as.management.core;bundle-version="1.0.0", + org.jboss.ide.eclipse.as.management.as71;bundle-version="2.3.0" Bundle-ClassPath: ., wars/ Bundle-ActivationPolicy: lazy Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2012-01-06 11:10:01 UTC (rev 37677) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2012-01-06 11:30:36 UTC (rev 37678) @@ -23,8 +23,8 @@ import java.net.UnknownHostException; import java.util.concurrent.ExecutionException; -import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager; import org.jboss.ide.eclipse.as.internal.management.as7.tests.utils.AS7ManagerTestUtils; +import org.jboss.ide.eclipse.as.internal.management.as71.AS71Manager; import org.jboss.ide.eclipse.as.management.core.JBoss7DeploymentState; import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; import org.jboss.ide.eclipse.as.management.core.JBoss7ServerState; @@ -40,15 +40,15 @@ */ public class AS7ManagerIntegrationTest { - private AS7Manager manager; + private AS71Manager manager; @Before public void setUp() throws IOException { assertTrue("There is no server at " + AS7ManagerTestUtils.LOCALHOST + - " that listens on port " + AS7Manager.MGMT_PORT, - AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.LOCALHOST, AS7Manager.MGMT_PORT)); - this.manager = new AS7Manager( new MockAS7ManagementDetails( - AS7ManagerTestUtils.LOCALHOST, AS7Manager.MGMT_PORT)); + " that listens on port " + AS71Manager.MGMT_PORT, + AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.LOCALHOST, AS71Manager.MGMT_PORT)); + this.manager = new AS71Manager( new MockAS7ManagementDetails( + AS7ManagerTestUtils.LOCALHOST, AS71Manager.MGMT_PORT)); } @After @@ -189,7 +189,7 @@ public void canStopServer() throws JBoss7ManangerException, UnknownHostException, IOException { manager.stopServer(); assertFalse( - AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.LOCALHOST, AS7Manager.MGMT_PORT)); + AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.LOCALHOST, AS71Manager.MGMT_PORT)); } private String getRandomDeploymentName() { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2012-01-06 11:10:01 UTC (rev 37677) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/utils/AS7ManagerTestUtils.java 2012-01-06 11:30:36 UTC (rev 37678) @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; -import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager; +import org.jboss.ide.eclipse.as.internal.management.as71.AS71Manager; import org.jboss.ide.eclipse.as.management.core.IJBoss7DeploymentResult; import org.jboss.ide.eclipse.as.management.core.JBoss7ManangerException; import org.osgi.framework.Bundle; @@ -62,11 +62,11 @@ return getResponse(name, host, port); } - public static void quietlyUndeploy(File file, AS7Manager manager) { + public static void quietlyUndeploy(File file, AS71Manager manager) { quietlyUndeploy(file.getName(), manager); } - public static void quietlyUndeploy(String name, AS7Manager manager) { + public static void quietlyUndeploy(String name, AS71Manager manager) { try { // DetypedDeployer.undeploy(name, AS7ManagerTestUtils.LOCALHOST, // AS7ManagerTestUtils.MGMT_PORT); @@ -76,7 +76,7 @@ } } - public static void quietlyRemove(String name, AS7Manager manager) { + public static void quietlyRemove(String name, AS71Manager manager) { try { // DetypedDeployer.remove(name, AS7ManagerTestUtils.LOCALHOST, // AS7ManagerTestUtils.MGMT_PORT);