[embjopr-commits] EMBJOPR SVN: r457 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-05-20 15:06:04 -0400 (Wed, 20 May 2009)
New Revision: 457

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
Log:
testEarDeployFineThenRedeployMalformedDescriptor() updated.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java	2009-05-20 16:28:17 UTC (rev 456)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java	2009-05-20 19:06:04 UTC (rev 457)
@@ -244,8 +244,13 @@
 			ejtt.deployment.deployViaEmbJopr(APP_TYPE, tmpFilePath);
 
 			// We should get an error message.
-			checkClientAndServerMessages("Failed to create Resource", "Failed to create Resource", true);
+			checkClientAndServerMessages("Failed to update", "Failed to update", true);
 
+			// The error message should say that the original EAR was rolled back.
+			String rolledBackMsg = "ROLLED BACK TO ORIGINAL APPLICATION FILE.";
+			checkClientAndServerMessages(rolledBackMsg, rolledBackMsg, true);
+
+
 			// The original EAR should remain deployed.
 			if( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME)){
 				ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME);
@@ -254,6 +259,9 @@
 				throw new EmbJoprTestException("The original EAR should remain deployed " +
 								"after unsuccessful deployment of bad version of the same EAR.");
 			}
+
+			// Undeploy the original app.
+			ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME);
 		}
 		finally {