diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 7d95c5109..9a950949c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -76,7 +76,7 @@ - net.sourceforge.htmlunit + org.htmlunit htmlunit test diff --git a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java index b44d3d9c2..0fe39da4a 100644 --- a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java +++ b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/GetOrdersTest.java @@ -18,31 +18,41 @@ */ package it.org.apache.struts2.rest.example; -import net.sourceforge.jwebunit.junit.WebTestCase; +import org.junit.Before; +import org.junit.Test; -public class GetOrdersTest extends WebTestCase { +import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextNotPresent; +import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent; +import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt; +import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext; +public class GetOrdersTest { + + @Before public void setUp() throws Exception { getTestContext().setBaseUrl(ParameterUtils.getBaseUrl()); } - + @Test public void testGetOrders() { beginAt("/orders/3"); assertTextPresent("Bob"); assertTextNotPresent("Sarah"); } + @Test public void testGetOrdersInHtml() { beginAt("/orders/3.xhtml"); assertTextPresent("Bob"); } + @Test public void testGetOrdersInXml() { beginAt("/orders/3.xml"); assertTextPresent("Bob"); } + @Test public void testGetOrdersInJson() { beginAt("/orders/3.json"); assertTextPresent("\"clientName\":\"Bob\""); diff --git a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/ListOrdersTest.java b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/ListOrdersTest.java index 5fc76a5df..5fc565171 100644 --- a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/ListOrdersTest.java +++ b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/ListOrdersTest.java @@ -18,15 +18,21 @@ */ package it.org.apache.struts2.rest.example; -import net.sourceforge.jwebunit.junit.WebTestCase; +import org.junit.Before; +import org.junit.Test; -public class ListOrdersTest extends WebTestCase { +import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent; +import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt; +import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext; +public class ListOrdersTest { + + @Before public void setUp() throws Exception { getTestContext().setBaseUrl(ParameterUtils.getBaseUrl()); } - + @Test public void testListOrders() { beginAt("/orders"); assertTextPresent("Bob"); @@ -34,6 +40,7 @@ public class ListOrdersTest extends WebTestCase { assertTextPresent("Jim"); } + @Test public void testListOrdersInHtml() { beginAt("/orders.xhtml"); assertTextPresent("Bob"); @@ -41,6 +48,7 @@ public class ListOrdersTest extends WebTestCase { assertTextPresent("Jim"); } + @Test public void testListOrdersInXml() { beginAt("/orders.xml"); assertTextPresent("Bob"); @@ -48,6 +56,7 @@ public class ListOrdersTest extends WebTestCase { assertTextPresent("Jim"); } + @Test public void testListOrdersInJson() { beginAt("/orders.json"); assertTextPresent("\"clientName\":\"Bob\""); diff --git a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java index 333aa28e9..fa7fd97f1 100644 --- a/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java +++ b/apps/rest-showcase/src/test/java/it/org/apache/struts2/rest/example/PostOrderTest.java @@ -18,23 +18,37 @@ */ package it.org.apache.struts2.rest.example; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import net.sourceforge.jwebunit.junit.WebTestCase; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.htmlunit.FailingHttpStatusCodeException; +import org.junit.Before; +import org.junit.Test; import java.io.IOException; -public class PostOrderTest extends WebTestCase { +import static net.sourceforge.jwebunit.junit.JWebUnit.assertLinkNotPresentWithText; +import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextFieldEquals; +import static net.sourceforge.jwebunit.junit.JWebUnit.assertTextPresent; +import static net.sourceforge.jwebunit.junit.JWebUnit.beginAt; +import static net.sourceforge.jwebunit.junit.JWebUnit.getTestContext; +import static net.sourceforge.jwebunit.junit.JWebUnit.setTextField; +import static net.sourceforge.jwebunit.junit.JWebUnit.setWorkingForm; +import static net.sourceforge.jwebunit.junit.JWebUnit.submit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +public class PostOrderTest { + + @Before public void setUp() throws Exception { getTestContext().setBaseUrl(ParameterUtils.getBaseUrl()); } - + @Test public void testPostOrder() { beginAt("/orders/new"); setWorkingForm(0); @@ -45,6 +59,7 @@ public class PostOrderTest extends WebTestCase { assertLinkNotPresentWithText("Back to Orders"); } + @Test public void testPostOrderWithErrors() { beginAt("/orders/new"); setWorkingForm(0); @@ -58,6 +73,7 @@ public class PostOrderTest extends WebTestCase { assertTextFieldEquals("amount", "321"); } + @Test public void testPostOrderInHtml() { beginAt("/orders/new.xhtml"); setWorkingForm(0); @@ -72,6 +88,7 @@ public class PostOrderTest extends WebTestCase { assertLinkNotPresentWithText("Back to Orders"); } + @Test public void testPostOrderInXml() throws IOException { CloseableHttpClient client = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml"); @@ -85,6 +102,7 @@ public class PostOrderTest extends WebTestCase { client.close(); } + @Test public void testPostOrderInXmlWithBadData() throws IOException { CloseableHttpClient client = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.xml"); @@ -98,6 +116,7 @@ public class PostOrderTest extends WebTestCase { client.close(); } + @Test public void testPostOrderInJson() throws IOException { CloseableHttpClient client = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json"); @@ -108,6 +127,7 @@ public class PostOrderTest extends WebTestCase { client.close(); } + @Test public void testPostOrderInJsonWithBadData() throws IOException { CloseableHttpClient client = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(ParameterUtils.getBaseUrl() + "/orders.json"); diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 79b93ad28..2745be15e 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -130,10 +130,10 @@ - net.sourceforge.htmlunit - htmlunit - test - + org.htmlunit + htmlunit + test + diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java index dd519c53d..ca8f283ad 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java @@ -20,12 +20,11 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - public class ActionChainingTest { @Test public void test() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java index 1229e7ed4..668553dbd 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java @@ -20,12 +20,11 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - public class ActionTagExampleTest { @Test public void test() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java index 4da639a71..8a4edd37c 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/AsyncTest.java @@ -18,16 +18,15 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.DomElement; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSubmitInput; +import org.htmlunit.html.HtmlTextInput; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; -import com.gargoylesoftware.htmlunit.html.HtmlTextInput; - public class AsyncTest { @Test public void testChatRoom() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java index 72a7a5e2c..576e76554 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java @@ -20,15 +20,14 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSubmitInput; +import org.htmlunit.html.HtmlTextInput; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; -import com.gargoylesoftware.htmlunit.html.HtmlTextInput; - public class CRUDTest { @Test public void testCreate() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java index 4519ac6ac..50977e059 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java @@ -20,12 +20,11 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - public class ComponentTagExampleTest { @Test public void test() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java index b7805048e..3690be43d 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java @@ -20,14 +20,13 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSubmitInput; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; - public class ConversionTest { @Test public void testList() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java index 5907efdb4..04fd47d35 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java @@ -18,9 +18,9 @@ */ package it.org.apache.struts2.showcase; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.WebClient; +import org.htmlunit.html.DomElement; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Test; diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java index 16628a9df..ab5314cbe 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java @@ -20,15 +20,14 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSubmitInput; +import org.htmlunit.html.HtmlTextInput; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; -import com.gargoylesoftware.htmlunit.html.HtmlTextInput; - public class ExecAndWaitTest { @Test public void testNodelay() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java index b4956e35d..7bf488403 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java @@ -24,12 +24,11 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import org.htmlunit.Page; +import org.htmlunit.WebClient; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.WebClient; - public class FileDownloadTest { @Test public void testImage() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileUploadTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileUploadTest.java index f5098d90a..b5246ae2d 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileUploadTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileUploadTest.java @@ -20,19 +20,16 @@ package it.org.apache.struts2.showcase; import java.io.File; +import org.htmlunit.WebClient; +import org.htmlunit.html.DomElement; +import org.htmlunit.html.HtmlFileInput; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlInput; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSubmitInput; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlFileInput; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlInput; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; - -@Ignore public class FileUploadTest { @Test @@ -45,7 +42,7 @@ public class FileUploadTest { captionInput.type("some caption"); File tempFile = File.createTempFile("testEmptyFile", ".tmp"); tempFile.deleteOnExit(); - uploadInput.setValueAttribute(tempFile.getAbsolutePath()); + uploadInput.setValue(tempFile.getAbsolutePath()); final HtmlSubmitInput button = form.getInputByValue("Submit"); final HtmlPage resultPage = button.click(); DomElement errorMessage = resultPage.getFirstByXPath("//span[@class='errorMessage']"); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ForwardTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ForwardTest.java index b466010fd..5eeb2b536 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ForwardTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ForwardTest.java @@ -20,9 +20,9 @@ */ package it.org.apache.struts2.showcase; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.WebClient; +import org.htmlunit.html.DomElement; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Test; diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java index fb2a23a0e..b6478ef06 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java @@ -20,13 +20,12 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.DomElement; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - public class FreeMarkerManagerTest { @Test public void testCustomManager() throws Exception { @@ -36,11 +35,11 @@ public class FreeMarkerManagerTest { final DomElement date = page.getElementById("todaysDate"); Assert.assertNotNull(date); - Assert.assertTrue(date.asNormalizedText().length() > 0); + Assert.assertFalse(date.asNormalizedText().isEmpty()); final DomElement time = page.getElementById("timeNow"); Assert.assertNotNull(time); - Assert.assertTrue(time.asNormalizedText().length() > 0); + Assert.assertFalse(time.asNormalizedText().isEmpty()); } } diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java index db87bf7b0..f329e78f3 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StaticContentTest.java @@ -18,16 +18,15 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.FailingHttpStatusCodeException; +import org.htmlunit.WebClient; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.WebClient; - public class StaticContentTest { @Test - public void testInvalidRersources1() throws Exception { + public void testInvalidResources1() throws Exception { try (final WebClient webClient = new WebClient()) { try { webClient.getPage(ParameterUtils.getBaseUrl() + "/struts.."); @@ -40,7 +39,7 @@ public class StaticContentTest { } @Test - public void testInvalidRersources2() throws Exception { + public void testInvalidResources2() throws Exception { try (final WebClient webClient = new WebClient()) { try { webClient.getPage(ParameterUtils.getBaseUrl() + "/static/..%252f"); diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java index 9468f85e5..bd822839f 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java @@ -20,18 +20,17 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlCheckBoxInput; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSelect; +import org.htmlunit.html.HtmlSubmitInput; +import org.htmlunit.html.HtmlTextArea; +import org.htmlunit.html.HtmlTextInput; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSelect; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; -import com.gargoylesoftware.htmlunit.html.HtmlTextArea; -import com.gargoylesoftware.htmlunit.html.HtmlTextInput; - public class UITagExampleTest { @Test public void testInputForm() throws Exception { diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java index 0bc83837a..223256e42 100644 --- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java +++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java @@ -20,14 +20,13 @@ */ package it.org.apache.struts2.showcase; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlSubmitInput; import org.junit.Assert; import org.junit.Test; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; - public class ValidationTest { @Test public void testFieldValidators() throws Exception { diff --git a/pom.xml b/pom.xml index 949a4b8fc..c281e2840 100644 --- a/pom.xml +++ b/pom.xml @@ -900,9 +900,9 @@ test - net.sourceforge.htmlunit + org.htmlunit htmlunit - 2.70.0 + 3.6.0 test