Author: ozizka(a)redhat.com Date: 2009-06-11 21:03:52 -0400 (Thu, 11 Jun 2009) New Revision: 523 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/scripts/ScriptsTest.java Log: ScriptTest, WarTest updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-06-11 23:26:54 UTC (rev 522) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-06-12 01:03:52 UTC (rev 523) @@ -169,6 +169,11 @@ // Lack of Commons HttpClient documentation. /**/ + /* This works, but HTTP request + GET /test/index.jsp + Host: snert.home.bsd.de + * returns 404. + // Send a raw HTTP request to validate the virtual host functionality. InetAddress ip = ejtt.getEmbJoprIpAddress(); log.info("Sending HTTP request to "+ip.toString()+" at port "+ejtt.getEmbJoprPort()); @@ -191,11 +196,11 @@ String responseText = sb.toString(); log.debug("Vhost test web app response:\n"+responseText); assertTrue( responseText.contains("HELLO WORLD") ); + /**/ - // Check that the virtual hosts are listed in EmbJopr. // Expand the VHosts node and click it. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/scripts/ScriptsTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/scripts/ScriptsTest.java 2009-06-11 23:26:54 UTC (rev 522) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/scripts/ScriptsTest.java 2009-06-12 01:03:52 UTC (rev 523) @@ -139,6 +139,8 @@ public boolean isTrue() throws Exception { ejtt.navTree.getNodeByLabel(NAV_SCRIPTS).click(); return null == ejtt.tabMenu.getTabContentBox().getFirstTable().findFirstRowContainingLink(SCRIPT_FILE_NAME); + // TODO: This will check all pages. + //return null == ejtt.tabMenu.getTabContentBox().findLinkRowInDataTableUsingPagination(SCRIPT_FILE_NAME); } }).throwOnTimeout().dumpPageOnTimeout(this).waitWithTimeout(3000, 20); }