Author: smcgowan(a)redhat.com Date: 2009-05-06 00:30:57 -0400 (Wed, 06 May 2009) New Revision: 383 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java Log: minor edits to EjbTest Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-05-06 01:41:01 UTC (rev 382) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-05-06 04:30:57 UTC (rev 383) @@ -179,4 +179,8 @@ "sqlexception-service.xml", "transaction-service.xml", "uuid-key-generator.sar" }; + // Status Messages + public static final String EJB2_DEL_MSG = "Successfully deleted EJB 2.x Application (EJB JAR)"; + public static final String EJB3_DEL_MSG = "Successfully deleted EJB 3.x Application (EJB JAR)"; + } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java 2009-05-06 01:41:01 UTC (rev 382) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java 2009-05-06 04:30:57 UTC (rev 383) @@ -109,7 +109,6 @@ assertTrue(successMessage.getDetail().contains("Resource " + BASIC_JAR + " created successfully!")); - // TODO: Check if listed. See EMBJOPR-74. assertFalse("Page contains 'Total: 0', EJBs probably not listed.", client.getPageAsText().contains("Total: 0")); @@ -120,9 +119,9 @@ HtmlButtonInput deleteButton = getAppDeleteButton(BASIC_JAR); deleteButton.click(); - assertTrue(client.getPageAsText().contains("Successfully deleted " + NAV_EJB2 + " '" + BASIC_JAR +"'.")); + assertTrue(client.getPageAsText().contains(EJB2_DEL_MSG + " '" + BASIC_JAR +"'.")); - //assertFalse(isEJBDeployed(BASIC_JAR); + assertFalse(isEJBDeployed(BASIC_JAR)); } }