summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml4
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml4
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml4
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java15
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml4
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java9
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml4
-rw-r--r--sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java18
-rw-r--r--sca-java-2.x/trunk/samples/store/pom.xml35
-rw-r--r--sca-java-2.x/trunk/samples/store/src/test/java/store/StoreTestCase.java24
11 files changed, 57 insertions, 68 deletions
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
index b03ff03bc7..203cc9efff 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.9</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
index bb16e5a441..9d3261913e 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.9</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
index 7d398366ed..7c2c6536b6 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.9</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
index e7d37fb886..795e709fac 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.9</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 2be60be081..e624cb8411 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -39,12 +40,14 @@ public class HelloworldTestCase {
@Test
public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp");
- Iterator<?> ss = page.getAllHtmlChildElements();
- ss.next();
- ss.next();
- ss.next();
- HtmlParagraph p = (HtmlParagraph)ss.next();
- assertEquals("Hello world", p.asText());
+ Iterator<?> ss = page.getAllHtmlChildElements().iterator();
+ while(ss.hasNext()) {
+ HtmlElement htmlElement = (HtmlElement) ss.next();
+ if( htmlElement instanceof HtmlParagraph) {
+ assertEquals("Hello world", htmlElement.asText());
+ break;
+ }
+ }
}
}
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
index a0b973e426..c410309d2a 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.9</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index bed840b44a..61d722da1f 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
@@ -26,7 +26,6 @@ import java.net.MalformedURLException;
import org.junit.Test;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.UnexpectedPage;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlButton;
import com.gargoylesoftware.htmlunit.html.HtmlForm;
@@ -48,13 +47,9 @@ public class HelloworldTestCase {
HtmlButton button = (HtmlButton) form.getButtonsByName("submit").get(0);
- Object foo = button.click();
+ HtmlPage pageResponse = (HtmlPage) button.click();
- // TODO: something up with getting the response but this works:
- UnexpectedPage p = (UnexpectedPage) foo;
- String s = new String(p.getWebResponse().getResponseBody());
-
- assertTrue(s.endsWith("</strong>Hello petra</body></html>"));
+ assertTrue(pageResponse.getWebResponse().getContentAsString().endsWith("</strong>Hello petra</body></html>"));
}
}
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
index 7531f1b7b6..a9f7762fd7 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.9</version>
+ <version>2.6</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 743ab054c8..53aaa54aaf 100644
--- a/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -39,15 +40,14 @@ public class HelloworldTestCase {
@Test
public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-stripes");
- Iterator<?> ss = page.getAllHtmlChildElements();
- Object o1= ss.next();
- Object o2= ss.next();
- Object o3= ss.next();
- Object o4= ss.next();
- Object o5= ss.next();
- Object o6= ss.next();
- HtmlParagraph p = (HtmlParagraph)ss.next();
- assertEquals("sayHello returns: Hello world", p.asText());
+ Iterator<?> ss = page.getAllHtmlChildElements().iterator();
+ while(ss.hasNext()) {
+ HtmlElement htmlElement = (HtmlElement) ss.next();
+ if( htmlElement instanceof HtmlParagraph) {
+ assertEquals("sayHello returns: Hello world", htmlElement.asText());
+ break;
+ }
+ }
}
}
diff --git a/sca-java-2.x/trunk/samples/store/pom.xml b/sca-java-2.x/trunk/samples/store/pom.xml
index d4b09c3ffb..a6d85eba2b 100644
--- a/sca-java-2.x/trunk/samples/store/pom.xml
+++ b/sca-java-2.x/trunk/samples/store/pom.xml
@@ -104,27 +104,20 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.14</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<finalName>${artifactId}</finalName>
diff --git a/sca-java-2.x/trunk/samples/store/src/test/java/store/StoreTestCase.java b/sca-java-2.x/trunk/samples/store/src/test/java/store/StoreTestCase.java
index 8c66e28427..900bc3f582 100644
--- a/sca-java-2.x/trunk/samples/store/src/test/java/store/StoreTestCase.java
+++ b/sca-java-2.x/trunk/samples/store/src/test/java/store/StoreTestCase.java
@@ -37,6 +37,7 @@ import client.Shopper;
import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
import com.gargoylesoftware.htmlunit.html.HtmlForm;
@@ -90,27 +91,24 @@ public class StoreTestCase {
@Test
@Ignore
public void testStoreWidget() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
- WebClient browser = new WebClient(BrowserVersion.FIREFOX_2);
- browser.setRedirectEnabled(true);
- browser.setThrowExceptionOnScriptError(false);
+ WebClient webClient = new WebClient(BrowserVersion.FIREFOX_3);
+ webClient.setRedirectEnabled(true);
+ webClient.setThrowExceptionOnScriptError(false);
+ webClient.waitForBackgroundJavaScript(50000);
+ webClient.waitForBackgroundJavaScriptStartingBefore(50000);
+ webClient.setAjaxController(new NicelyResynchronizingAjaxController());
- HtmlPage page = (HtmlPage) browser.getPage("http://localhost:8080/store/store.html");
-
- //delay to allow all javascript to be retrieved and loaded
- try {
- Thread.sleep(8000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ HtmlPage page = (HtmlPage) webClient.getPage("http://localhost:8080/store/store.html");
HtmlForm form = (HtmlForm) page.getFormByName("catalogForm");
HtmlCheckBoxInput catalogItems = (HtmlCheckBoxInput) form.getInputByName("items");
- System.out.println(">>>" + catalogItems.getAttributeValue("value"));
- Assert.assertEquals("Apple - $2.99", catalogItems.getAttributeValue("value"));
+ System.out.println(">>>" + catalogItems.getAttribute("value"));
+ Assert.assertEquals("Apple - $2.99", catalogItems.getAttribute("value"));
+ webClient.closeAllWindows();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 22:12:18 +0000