[embjopr-commits] EMBJOPR SVN: r214 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 1 other directories.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Wed Mar 11 17:38:40 EDT 2009
Author: ozizka at redhat.com
Date: 2009-03-11 17:38:40 -0400 (Wed, 11 Mar 2009)
New Revision: 214
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ApplicationsPageTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ActiveConditionChecker.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
Rewritten EAR test to comply current AS state.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java 2009-03-11 21:12:25 UTC (rev 213)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java 2009-03-11 21:38:40 UTC (rev 214)
@@ -104,11 +104,13 @@
MBeanServer jmxServer = MBeanServerLocator.locateJBoss();
Set mBeans = jmxServer.queryNames(objName, null);
if (mBeans.size() != 1) {
+ log.info(mBeanName+" not found.");
return false;
}
ObjectName deploymentMBean = (ObjectName) mBeans.iterator().next();
// Returns org.jboss.deployers.spi.DeploymentState.
Object state = jmxServer.getAttribute(deploymentMBean, "State");
+ log.info("State is '"+state.toString()+"'.");
return "DEPLOYED".equals(state.toString()) || "3".equals(state.toString());
}
@@ -117,7 +119,8 @@
public boolean isEJBDeployed(String ejbJarName) throws RuntimeException
{
try {
- String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",service=EjbModule";
+ //String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",service=EjbModule";
+ String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",*";
return isMBeanStateDeployedByQuery(mBeanName);
}
catch (Exception e) {
@@ -145,8 +148,11 @@
public boolean isEarDeployed(String earName) throws RuntimeException
{
try {
- String query = "jboss.deployment:id=\"vfszip:" +
- System.getProperty("jsfunit.deploy.dir") + "/" + earName + "\",*";
+ //String query = "jboss.deployment:id=\"vfszip:" +
+ // System.getProperty("jsfunit.deploy.dir") + "/" + earName + "/\",*";
+ String query = String.format("jboss.deployment:id=\"vfszip:%s/%s/\",*",
+ System.getProperty("jsfunit.deploy.dir"), earName );
+
return isMBeanStateDeployedByQuery(query);
}
catch (Exception e) {
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ApplicationsPageTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ApplicationsPageTest.java 2009-03-11 21:12:25 UTC (rev 213)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ApplicationsPageTest.java 2009-03-11 21:38:40 UTC (rev 214)
@@ -28,6 +28,8 @@
import org.jboss.jopr.jsfunit.AppConstants.DeployableTypes;
import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
+import org.jboss.jopr.jsfunit.util.ActiveConditionChecker;
+import org.jboss.jopr.jsfunit.util.DescribedCondition;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.*;
@@ -134,6 +136,7 @@
+
/**
* Tests Applications listing.
* Creates a list of all apps listed,
@@ -186,9 +189,9 @@
}// testNavigationToApplications()
-
+
/**
* Determines the type of the deployable based on the value
* in the Type column in EmbJopr.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-03-11 21:12:25 UTC (rev 213)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-03-11 21:38:40 UTC (rev 214)
@@ -100,6 +100,8 @@
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Use JMX to assert that the EAR components really did deploy successfully.
+ //id="vfszip:/home/brq/ozizka/JoprEmbedded/jboss-as-5.x/build/output/jboss-5.1.0.Beta1/server/default/deploy/eardeployment.ear/",type=Deployment
+ //id="vfszip:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/eardeployment.ear",* not found.
assertTrue("JMX doesn't report EAR as deployed: eardeployment.ear", isEarDeployed(BASIC_EAR));
assertTrue("JMX doesn't report EJB sessiona.jar as deployed.", isEJBDeployed("sessiona.jar"));
assertTrue("JMX doesn't report EJB sessionb.jar as deployed.", isEJBDeployed("sessionb.jar"));
@@ -301,8 +303,8 @@
return null != earRow;
}
}).dumpPageOnTimeout(this).throwOnTimeout().waitWithTimeout(2000, 5);
+
-
ContentTableRow earRow = ejtt.getDefaultContentTable().getFirstRowContainingLink(BASIC_EAR);
// Wait until the Status is "UP".
@@ -396,6 +398,7 @@
* @throws org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException
*
* PASSED.
+ * Now fails, because EAR does not appear.
*/
public void testDeployUnpackedEar() throws IOException, EmbJoprTestException {
@@ -404,9 +407,11 @@
// Deploy the unpacked EAR.
// We have to use hotdeploy - can't upload a directory.
+ log.info("Unzipping ear/"+EAR_UNPACKED_ZIP);
unzipToDeployDir("ear/"+EAR_UNPACKED_ZIP, "");
// Loop, wait for the app to appear.
- waitActivelyForDeployment( DeployableTypes.EAR, EAR_UNPACKED, 5000, 18 );
+ log.info("Waiting for EAR to appear.");
+ waitActivelyForDeployment( DeployableTypes.EAR, EAR_UNPACKED, 5000, 12 );
ejtt.getNavTree().getNodeByLabel(NAV_EAR).click();
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java 2009-03-11 21:12:25 UTC (rev 213)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ServerNodeSummaryTest.java 2009-03-11 21:38:40 UTC (rev 214)
@@ -161,14 +161,6 @@
*/
private String getSummaryValue(String name) throws EmbJoprTestException{
- try {
- DebugUtils.writeFile("Summary.html", client.getPageAsText());
- } catch (FileNotFoundException ex) {
- Logger.getLogger(ServerNodeSummaryTest.class.getName()).log(Level.SEVERE, null, ex);
- } catch (IOException ex) {
- Logger.getLogger(ServerNodeSummaryTest.class.getName()).log(Level.SEVERE, null, ex);
- }
-
HtmlElement box = tabMenu.getTabContentBox().getElement();
String xPath = "//td//strong[contains(string(), '"+name+":')]/ancestor::td[1]";
HtmlElement tableCell = (HtmlElement) box.getFirstByXPath(xPath);
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ActiveConditionChecker.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ActiveConditionChecker.java 2009-03-11 21:12:25 UTC (rev 213)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ActiveConditionChecker.java 2009-03-11 21:38:40 UTC (rev 214)
@@ -43,7 +43,7 @@
if( this.dumpPageOnTimout ){
try {
// Since this is still inner class, we could use 'this'.
- //DebugUtils.writeFile(test.getName() + ".html", test.getClient().getPageAsText());///
+ DebugUtils.writeFile("target/"+test.getName()+".html", test.getClient().getPageAsText());///
} catch (Exception ex) { log.error("Can't dump page.", ex); }
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-03-11 21:12:25 UTC (rev 213)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-03-11 21:38:40 UTC (rev 214)
@@ -236,7 +236,7 @@
public boolean isExpanded() throws EmbJoprTestException
{
HtmlAnchor arrowLink = this.getArrowLink();
- HtmlElement img = (HtmlElement)arrowLink.getFirstByXPath("img[@style='display: none;']");
+ HtmlElement img = (HtmlElement)arrowLink.getFirstByXPath("img[contains(@style,'display: none')]");
if( img.getId().endsWith("expanded") )
return false;
More information about the embjopr-commits
mailing list