EMBJOPR SVN: r374 - trunk/jsfunit.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-04 13:12:38 -0400 (Mon, 04 May 2009)
New Revision: 374
Modified:
trunk/jsfunit/pom.xml
Log:
JSFUnit POM: Cargo timeout increased from 5 to 10 minutes to prevent Hudson startup timeouts.
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-05-04 16:05:47 UTC (rev 373)
+++ trunk/jsfunit/pom.xml 2009-05-04 17:12:38 UTC (rev 374)
@@ -162,7 +162,7 @@
<containerId>jboss42x</containerId>
<home>${JBOSS_HOME}</home>
<log>${basedir}/target/jboss4.2.logs/cargo.log</log>
- <timeout>300000</timeout> <!-- 5 minutes -->
+ <timeout>600000</timeout> <!-- 10 minutes -->
<systemProperties>
<jboss.server.log.threshold>ALL</jboss.server.log.threshold>
<!-- snoops request and response from client side result is in server.log
@@ -314,7 +314,7 @@
<containerId>jboss5x</containerId>
<home>${JBOSS_HOME}</home> <!-- Binaries used by Cargo. -->
<log>${basedir}/target/jboss5.x.logs/cargo.log</log>
- <timeout>300000</timeout> <!-- 5 minutes -->
+ <timeout>600000</timeout> <!-- 10 minutes -->
<systemProperties>
<!-- Used in jboss-log4j.xml. See /testdata/... -->
<jboss.server.log.threshold>ALL</jboss.server.log.threshold>
15 years, 8 months
EMBJOPR SVN: r373 - trunk/jsfunit.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-04 12:05:47 -0400 (Mon, 04 May 2009)
New Revision: 373
Modified:
trunk/jsfunit/pom.xml
Log:
JSFUnit POM:
* Added cargo.plugin.versionproperty
* Cargo Maven plugin version changed from 1.0-SNAPSHOT to 1.0
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-05-04 14:28:44 UTC (rev 372)
+++ trunk/jsfunit/pom.xml 2009-05-04 16:05:47 UTC (rev 373)
@@ -5,6 +5,7 @@
<jopr.version>1.2.0-SNAPSHOT</jopr.version>
<cargo.jboss.configuration>default</cargo.jboss.configuration>
<cargo.jboss.bind.address>localhost</cargo.jboss.bind.address>
+ <cargo.plugin.version>1.0</cargo.plugin.version><!-- Was: 1.0-SNAPSHOT -->
</properties>
<parent>
@@ -154,7 +155,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${cargo.plugin.version}</version>
<configuration>
<wait>false</wait>
<container>
@@ -306,7 +307,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${cargo.plugin.version}</version>
<configuration>
<wait>false</wait>
<container>
15 years, 8 months
EMBJOPR SVN: r372 - trunk/jsfunit.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-04 10:28:44 -0400 (Mon, 04 May 2009)
New Revision: 372
Modified:
trunk/jsfunit/pom.xml
Log:
JSFUnit POM: Added cargo.jboss.bind.address property which defaults to "localhost" to prevent Hudson failures (by setting it to $MYTESTIP_1).
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-05-01 03:16:50 UTC (rev 371)
+++ trunk/jsfunit/pom.xml 2009-05-04 14:28:44 UTC (rev 372)
@@ -4,6 +4,7 @@
<properties>
<jopr.version>1.2.0-SNAPSHOT</jopr.version>
<cargo.jboss.configuration>default</cargo.jboss.configuration>
+ <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address>
</properties>
<parent>
@@ -169,6 +170,7 @@
<jsfunit.tempdir>${basedir}/target/jboss42x/tmp</jsfunit.tempdir>
<jsfunit.deploy.dir>${basedir}/target/jboss42x/deploy</jsfunit.deploy.dir>
<jboss.configuration>${cargo.jboss.configuration}</jboss.configuration>
+ <jboss.bind.address>${cargo.jboss.bind.address}</jboss.bind.address>
<jsfunit.jboss.home.dir>${basedir}/target/jboss42x</jsfunit.jboss.home.dir>
</systemProperties>
</container>
@@ -321,6 +323,7 @@
<jsfunit.tempdir>${basedir}/target/jboss5x/tmp</jsfunit.tempdir>
<jsfunit.deploy.dir>${basedir}/target/jboss5x/deploy</jsfunit.deploy.dir>
<jboss.configuration>${cargo.jboss.configuration}</jboss.configuration>
+ <jboss.bind.address>${cargo.jboss.bind.address}</jboss.bind.address>
<!-- Home dir for Cargo's JBoss instance. -->
<jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir>
</systemProperties>
15 years, 8 months
EMBJOPR SVN: r371 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.
by embjopr-commits@lists.jboss.org
Author: smcgowan(a)redhat.com
Date: 2009-04-30 23:16:50 -0400 (Thu, 30 Apr 2009)
New Revision: 371
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java
Log:
revert addition of <HtmlElement> in front of Page#getHtmlElementById() which was causing build to fail
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-05-01 00:56:53 UTC (rev 370)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-05-01 03:16:50 UTC (rev 371)
@@ -824,7 +824,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- Integer count1 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
+ Integer count1 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
@@ -874,7 +874,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- Integer count2 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
+ Integer count2 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
assertTrue( "Counter is reset upon app restart, thus should be lower after.", count1 > count2 );
@@ -932,7 +932,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- Integer count1 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
+ Integer count1 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
@@ -962,7 +962,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- Integer count2 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
+ Integer count2 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
assertTrue( "Counter is reset upon app restart, thus should be lower after.", count1 > count2 );
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-05-01 00:56:53 UTC (rev 370)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-05-01 03:16:50 UTC (rev 371)
@@ -880,7 +880,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- String count1text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
+ String count1text = page.getBody().getHtmlElementById("count").getTextContent();
Integer count1 = NumberUtils.createInteger( count1text );
@@ -925,7 +925,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- String count2text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
+ String count2text = page.getBody().getHtmlElementById("count").getTextContent();
Integer count2 = NumberUtils.createInteger( count2text );
assertTrue( "Counter is reset upon app restart, thus should be lower after. " +
@@ -980,7 +980,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- String count1text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
+ String count1text = page.getBody().getHtmlElementById("count").getTextContent();
Integer count1 = NumberUtils.createInteger( count1text );
@@ -1008,7 +1008,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- String count2text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
+ String count2text = page.getBody().getHtmlElementById("count").getTextContent();
Integer count2 = NumberUtils.createInteger( count2text );
assertTrue( "Counter is reset upon app restart, thus should be lower after. " +
15 years, 8 months
EMBJOPR SVN: r370 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: util and 1 other directory.
by embjopr-commits@lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-04-30 20:56:53 -0400 (Thu, 30 Apr 2009)
New Revision: 370
Modified:
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/WarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
Added <HtmlElement> in front of Page#getHtmlElementById(), for the case we switched to HTMLUnit 2.4+
EJTT - handled NPE in NavTreeNode#getArrowLink()
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-04-30 18:56:04 UTC (rev 369)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ApplicationsPageTest.java 2009-05-01 00:56:53 UTC (rev 370)
@@ -88,7 +88,8 @@
String fileSrcPath = ejtt.getTestDataDir() +"/ear/"+ BASIC_EAR;
String destDir = ejtt.getTempDir() + "/appPagination";
- if( ! new File(destDir).mkdirs() )
+ new File(destDir).mkdirs();
+ if( ! new File(destDir).isDirectory() )
throw new EmbJoprTestException("Coundn't create directory: "+destDir);
// Deploy the same APP multiple times.
@@ -173,8 +174,9 @@
String fileSrcPath = ejtt.getTestDataDir() +"/ear/"+ BASIC_EAR;
String destDir = ejtt.getTempDir() + "/appPagination";
- if( ! new File(destDir).mkdirs() )
- throw new EmbJoprTestException("Coundn't create directory: "+destDir);
+ new File(destDir).mkdirs();
+ if( ! new File(destDir).isDirectory() )
+ throw new EmbJoprTestException("Couldn't create directory: "+destDir);
// Deploy the same APP multiple times.
for (int i = 0; i < 8; i++) {
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-04-30 18:56:04 UTC (rev 369)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-05-01 00:56:53 UTC (rev 370)
@@ -824,7 +824,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- Integer count1 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
+ Integer count1 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
@@ -874,7 +874,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- Integer count2 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
+ Integer count2 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
assertTrue( "Counter is reset upon app restart, thus should be lower after.", count1 > count2 );
@@ -932,7 +932,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- Integer count1 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
+ Integer count1 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
@@ -962,7 +962,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- Integer count2 = NumberUtils.createInteger(page.getBody().getHtmlElementById("count").getTextContent());
+ Integer count2 = NumberUtils.createInteger(page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent());
assertTrue( "Counter is reset upon app restart, thus should be lower after.", count1 > count2 );
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-04-30 18:56:04 UTC (rev 369)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-05-01 00:56:53 UTC (rev 370)
@@ -880,7 +880,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- String count1text = page.getBody().getHtmlElementById("count").getTextContent();
+ String count1text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
Integer count1 = NumberUtils.createInteger( count1text );
@@ -925,7 +925,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- String count2text = page.getBody().getHtmlElementById("count").getTextContent();
+ String count2text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
Integer count2 = NumberUtils.createInteger( count2text );
assertTrue( "Counter is reset upon app restart, thus should be lower after. " +
@@ -980,7 +980,7 @@
page = (HtmlPage) page.refresh();
// Get the counter number.
- String count1text = page.getBody().getHtmlElementById("count").getTextContent();
+ String count1text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
Integer count1 = NumberUtils.createInteger( count1text );
@@ -1008,7 +1008,7 @@
assertTrue(page.asText().contains("HELLO WORLD"));
// Get the counter number.
- String count2text = page.getBody().getHtmlElementById("count").getTextContent();
+ String count2text = page.getBody().<HtmlElement>getHtmlElementById("count").getTextContent();
Integer count2 = NumberUtils.createInteger( count2text );
assertTrue( "Counter is reset upon app restart, thus should be lower after. " +
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-04-30 18:56:04 UTC (rev 369)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-05-01 00:56:53 UTC (rev 370)
@@ -399,9 +399,12 @@
}
/** Returns the arrow's link. */
- public HtmlAnchor getArrowLink(){
+ public HtmlAnchor getArrowLink() throws HtmlElementNotFoundException{
String xPath = ".//td[contains(@id,':handles')]//a[contains(@id,':handle')]";
- return (HtmlAnchor) this.elem.getFirstByXPath( xPath );
+ HtmlAnchor arrowLink = (HtmlAnchor) this.elem.getFirstByXPath( xPath );
+ if( null == arrowLink )
+ throw new HtmlElementNotFoundException("Arrow link not found using XPath: "+xPath, currentTest);
+ return arrowLink;
}
/** Clicks the link of the this node. */
15 years, 8 months