From d6480dcf43970d8f459d025bb9bbf4753f614232 Mon Sep 17 00:00:00 2001 From: Paul Tuckey Date: Fri, 9 Jun 2023 21:23:29 +1200 Subject: [PATCH] progress --- .github/workflows/maven.yml | 6 +++--- container-test/example-webapp/pom.xml | 4 ++-- container-test/test-with-testcontainers/pom.xml | 17 ++++++++++++++--- ...eNoneIT.java => WebappDecodeNoneITTest.java} | 2 +- ...eUtf8IT.java => WebappDecodeUtf8ITTest.java} | 2 +- ...{WebappHttpIT.java => WebappHttpITTest.java} | 2 +- ...ttpIT.java => WebappModStyleHttpITTest.java} | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) rename container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/{WebappDecodeNoneIT.java => WebappDecodeNoneITTest.java} (97%) rename container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/{WebappDecodeUtf8IT.java => WebappDecodeUtf8ITTest.java} (96%) rename container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/{WebappHttpIT.java => WebappHttpITTest.java} (99%) rename container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/{WebappModStyleHttpIT.java => WebappModStyleHttpITTest.java} (98%) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e3a47bce..c63697b9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,15 +24,15 @@ jobs: run: mvn --batch-mode --update-snapshots package - name: Locally install filter - run: mvn install + run: mvn install --batch-mode - name: Locally install example working-directory: container-test/example-webapp - run: mvn install + run: mvn install --batch-mode - name: Run container tests working-directory: container-test/test-with-testcontainers - run: mvn test + run: mvn test --batch-mode # - uses: actions/upload-artifact@v3 # with: diff --git a/container-test/example-webapp/pom.xml b/container-test/example-webapp/pom.xml index 2d9fc1e1..24455639 100644 --- a/container-test/example-webapp/pom.xml +++ b/container-test/example-webapp/pom.xml @@ -3,8 +3,8 @@ 4.0.0 org.tuckey example-webapp - war - 5.0.0 + jar + 5.0.0-SNAPSHOT Example Webapp http://www.tuckey.org/urlrewrite/ 2001 diff --git a/container-test/test-with-testcontainers/pom.xml b/container-test/test-with-testcontainers/pom.xml index 0b39ec5b..2303099c 100644 --- a/container-test/test-with-testcontainers/pom.xml +++ b/container-test/test-with-testcontainers/pom.xml @@ -8,7 +8,7 @@ 17 17 - 6.0.0 + 5.0.0-SNAPSHOT UrlRewriteFilter Container Tests http://www.tuckey.org/urlrewrite/ 2001 @@ -31,6 +31,16 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + + @@ -42,7 +52,7 @@ org.tuckey example-webapp - 5.0.0 + 5.0.0-SNAPSHOT test @@ -54,7 +64,7 @@ org.junit.jupiter junit-jupiter - 5.8.1 + 5.8.2 test @@ -88,4 +98,5 @@ + \ No newline at end of file diff --git a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeNoneIT.java b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeNoneITTest.java similarity index 97% rename from container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeNoneIT.java rename to container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeNoneITTest.java index 93555907..496d1e01 100644 --- a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeNoneIT.java +++ b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeNoneITTest.java @@ -17,7 +17,7 @@ /** * */ -public class WebappDecodeNoneIT extends ContainerTestBase { +public class WebappDecodeNoneITTest extends ContainerTestBase { protected String getApp() { return "webapp"; diff --git a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeUtf8IT.java b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeUtf8ITTest.java similarity index 96% rename from container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeUtf8IT.java rename to container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeUtf8ITTest.java index 5ed6e0c9..f720c420 100644 --- a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeUtf8IT.java +++ b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappDecodeUtf8ITTest.java @@ -30,7 +30,7 @@ *

* options: browser (may fail), enc (unlikely fail) */ -public class WebappDecodeUtf8IT extends ContainerTestBase { +public class WebappDecodeUtf8ITTest extends ContainerTestBase { protected String getApp() { return "webapp"; diff --git a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappHttpIT.java b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappHttpITTest.java similarity index 99% rename from container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappHttpIT.java rename to container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappHttpITTest.java index 0de900b0..201c7dd1 100644 --- a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappHttpIT.java +++ b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappHttpITTest.java @@ -56,7 +56,7 @@ * @author Paul Tuckey * @version $Revision: 33 $ $Date: 2006-09-12 16:41:56 +1200 (Tue, 12 Sep 2006) $ */ -public class WebappHttpIT extends ContainerTestBase { +public class WebappHttpITTest extends ContainerTestBase { protected String getApp() { return "webapp"; diff --git a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpIT.java b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpITTest.java similarity index 98% rename from container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpIT.java rename to container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpITTest.java index 03aec2b7..1c44bb29 100644 --- a/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpIT.java +++ b/container-test/test-with-testcontainers/src/test/java/org/tuckey/web/filters/urlrewriteviacontainer/WebappModStyleHttpITTest.java @@ -48,7 +48,7 @@ * @author Paul Tuckey * @version $Revision: 33 $ $Date: 2006-09-12 16:41:56 +1200 (Tue, 12 Sep 2006) $ */ -public class WebappModStyleHttpIT extends ContainerTestBase { +public class WebappModStyleHttpITTest extends ContainerTestBase { protected String getApp() { return "webapp/mod";