[jbosstools-commits] JBoss Tools SVN: r30549 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-04-13 07:56:21 -0400 (Wed, 13 Apr 2011)
New Revision: 30549

Modified:
   workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneOperationsIntegrationTest.java
Log:


Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneOperationsIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneOperationsIntegrationTest.java	2011-04-13 11:51:56 UTC (rev 30548)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/StandaloneOperationsIntegrationTest.java	2011-04-13 11:56:21 UTC (rev 30549)
@@ -36,7 +36,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.jboss.ide.eclipse.as7.deployment.DeployerException;
-import org.jboss.ide.eclipse.as7.deployment.StandaloneOperations;
+import org.jboss.ide.eclipse.as7.deployment.StandaloneTypedOperations;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
@@ -58,12 +58,10 @@
 
 	@Test
 	public void canDeploy() throws Exception {
-		StandaloneOperations deployer = null;
+		StandaloneTypedOperations deployer = null;
 		File warFile = getWarFile("minimalistic.war");
 		try {
-			deployer = new StandaloneOperations(HOST, MGMT_PORT);
-			quietlyUndeploy(warFile, deployer); // make sure doesn't
-															// exist
+			deployer = new StandaloneTypedOperations(HOST, MGMT_PORT);
 			deployer.deploy(warFile).execute();
 
 			String response = getServerResponse(new URL(
@@ -78,10 +76,10 @@
 
 	@Test(expected = DeployerException.class)
 	public void cannotDeployWarTwice() throws Exception {
-		StandaloneOperations deployer = null;
+		StandaloneTypedOperations deployer = null;
 		File warFile = getWarFile("minimalistic.war");
 		try {
-			deployer = new StandaloneOperations(HOST, MGMT_PORT);
+			deployer = new StandaloneTypedOperations(HOST, MGMT_PORT);
 			deployer.deploy(warFile).execute();
 			deployer.deploy(warFile).execute();
 		} finally {
@@ -115,10 +113,10 @@
 		return writer.toString();
 	}
 
-	private void quietlyUndeploy(File file, StandaloneOperations deployer) {
+	private void quietlyUndeploy(File file, StandaloneTypedOperations deployer) {
 		try {
 			if (deployer != null) {
-				deployer.undeploy(file);
+				deployer.undeploy(file).execute();
 				deployer.dispose();
 			}
 		} catch (Exception e) {