[jbosstools-commits] JBoss Tools SVN: r30568 - 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-14 08:03:41 -0400 (Thu, 14 Apr 2011)
New Revision: 30568

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


Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java	2011-04-14 12:03:30 UTC (rev 30567)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/MinimalisticDeployerIntegrationTest.java	2011-04-14 12:03:41 UTC (rev 30568)
@@ -36,7 +36,6 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.jboss.ide.eclipse.as7.deployment.detyped.MinimalisticStandaloneDeployer;
-import org.jboss.ide.eclipse.as7.deployment.internal.DeployerException;
 import org.jboss.ide.eclipse.as7.deployment.internal.StandaloneTypedOperations;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -72,8 +71,19 @@
 		}
 	}
 
-	@Test(expected = DeployerException.class)
+	@Test(expected = Exception.class)
 	public void cannotDeployWarTwice() throws Exception {
+		File warFile = getWarFile("minimalistic.war");
+		try {
+			MinimalisticStandaloneDeployer.deploy(warFile, HOST, MGMT_PORT);
+			MinimalisticStandaloneDeployer.deploy(warFile, HOST, MGMT_PORT);
+		} finally {
+			quietlyUndeploy(warFile);
+		}
+	}
+
+	@Test
+	public void canQueryDeploymentdeployedState() throws Exception {
 		StandaloneTypedOperations deployer = null;
 		File warFile = getWarFile("minimalistic.war");
 		try {
@@ -113,7 +123,7 @@
 
 	private void quietlyUndeploy(File file) {
 		try {
-			MinimalisticStandaloneDeployer.undeploy(file, HOST, MGMT_PORT);
+			MinimalisticStandaloneDeployer.undeploy(file.getName(), HOST, MGMT_PORT);
 		} catch (Exception e) {
 			e.printStackTrace();
 			// ignore