Author: ozizka(a)redhat.com Date: 2009-06-05 14:20:40 -0400 (Fri, 05 Jun 2009) New Revision: 508 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java Log: EJB tests updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-06-05 17:27:04 UTC (rev 507) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-06-05 18:20:40 UTC (rev 508) @@ -222,4 +222,6 @@ public static final String EJB_DEL_MSG_FORMAT = "Successfully deleted %s JAR '%s'."; public static final String DELETE_MSG_FORMAT = "Successfully deleted %s '%s'."; + public static final String MSG_FORMAT_DEPLOY_SUCCESS = "Resource %s created successfully!"; + } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java 2009-06-05 17:27:04 UTC (rev 507) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java 2009-06-05 18:20:40 UTC (rev 508) @@ -181,13 +181,9 @@ FacesMessage successMessage = server.getFacesMessages().next(); assertTrue(FacesMessage.SEVERITY_INFO.equals(successMessage.getSeverity())); assertTrue(successMessage.getDetail().contains("Resource " + REDEPLOY_JAR_NAME + " created successfully!")); - // Use JMX to assert that the EJB components really did deploy successfully. - assertTrue("JMX shouldn't report " + REDEPLOY_JAR_NAME + " as deployed.", isEJBDeployed(REDEPLOY_JAR_NAME)); - - String expectedMessage = String.format( DELETE_MSG_FORMAT, APP_TYPE.getDisplayName(), REDEPLOY_JAR_NAME); - assertTrue("Page doesn't contain success message.", client.getPageAsText().contains(expectedMessage)); - assertFalse("Deployable seems not to be deployed: " + REDEPLOY_JAR_NAME, isEJBDeployed(REDEPLOY_JAR_NAME)); + assertTrue("JMX should report " + REDEPLOY_JAR_NAME + " as deployed.", isEJBDeployed(REDEPLOY_JAR_NAME)); + } finally { // Undeploy the EJB JAR @@ -287,15 +283,17 @@ // Check the values in info table(s) + /* Was removed. // General Properties HtmlTable genpropTable = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("General Properties").getElement(); ContentInfoTable infoTable = ejtt.getContentInfoTable(genpropTable); Properties props = infoTable.getProperties(); + */ // Traits - infoTable = ejtt.getContentInfoTable( + ContentInfoTable infoTable = ejtt.getContentInfoTable( ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("Traits").getElement()); - props = infoTable.getProperties(); + Properties props = infoTable.getProperties(); // Path String path = ejtt.getDeployDir() + "/" + DEPLOYABLE_NAME; @@ -348,7 +346,7 @@ // Deploy the APP. String appfilePath = ejtt.getTestDataDir() + "/"+APP_TYPE.getDataDir()+"/"+DEPLOYABLE_NAME; - ejtt.deployment.deployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME); + ejtt.deployment.deployViaEmbJopr(APP_TYPE, appfilePath); try {