Fix Helidon matrix parameter test, bump test dependencies

Author: rbygrave

pom.xml

@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
   </parent>
 
   <scm>
@@ -22,7 +22,14 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.6.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
 

tests/test-client/pom.xml

@@ -46,32 +46,27 @@
     </dependency>
 
 
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.6.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>io.helidon.webclient</groupId>-->
-<!--      <artifactId>helidon-webclient</artifactId>-->
-<!--      <version>${helidon-version}</version>-->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
+
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <version>3.16.1</version>
       <scope>test</scope>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>io.rest-assured</groupId>-->
-<!--      <artifactId>rest-assured</artifactId>-->
-<!--      <version>4.3.1</version>-->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-<!--    -->
+
   </dependencies>
 
 </project>

tests/test-helidon/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>2.1.2</version>
+    <version>2.2</version>
   </parent>
 
   <properties>
@@ -86,9 +86,17 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.6.2</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.helidon.webclient</groupId>
       <artifactId>helidon-webclient</artifactId>

tests/test-helidon/src/main/java/org/example/FooController.java

@@ -91,7 +91,7 @@ public void form2Test(ServerRequest req, ServerResponse res) {
   }
 
   @Produces("text/plain")
-  @Get("/withMatrix/:year;author;country/:other")
+  @Get("/withMatrix/{year;author;country}/{other}")
   String getWithMatrixParam(int year, String author, String country, String other, String extra) {
     return "yr:" + year + " au:" + author + " co:" + country + " other:" + other + " extra:" + extra;
   }

tests/test-helidon/src/test/java/org/example/FooControllerTest.java

@@ -1,9 +1,13 @@
 package org.example;
 
+import io.avaje.http.client.HttpClientContext;
+import io.dinject.controller.Get;
 import io.restassured.response.Response;
 import org.example.api.FooBody;
 import org.junit.jupiter.api.Test;
 
+import java.net.http.HttpResponse;
+
 import static io.restassured.RestAssured.get;
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -12,6 +16,8 @@
 
 class FooControllerTest extends BaseWebTest {
 
+  private final HttpClientContext client = client();
+
   @Test
   void hello() {
     final Response response = get(baseUrl + "/foo/hello");
@@ -42,8 +48,22 @@ void postIt() {
   }
 
 
+  @Get("/withMatrix/:year;author;country/:other")
   @Test
   void getWithMatrixParam() {
+
+    final HttpResponse<String> res = client.request()
+      .path("foo")
+      .path("withMatrix")
+      .path("2011").matrixParam("author", "rob").matrixParam("country", "nz")
+      .path("foo")
+      .param("extra", "banana")
+      .get()
+      .asString();
+
+    assertThat(res.statusCode()).isEqualTo(200);
+    assertThat(res.body()).isEqualTo("yr:2011 au:rob co:nz other:foo extra:banana");
+
     given()
       .get(baseUrl + "/foo/withMatrix/2011;author=rob;country=nz/foo?extra=banana")
       .then()

tests/test-helidon/src/test/resources/logback-test.xml

@@ -10,5 +10,6 @@
   </root>
 
   <logger name="org.example" level="DEBUG"/>
+  <logger name="io.avaje" level="TRACE"/>
 
 </configuration>

tests/test-javalin/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>2.1.2</version>
+    <version>2.2</version>
   </parent>
 
   <properties>
@@ -87,7 +87,14 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.6.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.6.2</version>
       <scope>test</scope>
     </dependency>