diff --git a/.github/workflows/daily.yaml b/.github/workflows/daily.yaml index abe6dc8b..48d4e228 100644 --- a/.github/workflows/daily.yaml +++ b/.github/workflows/daily.yaml @@ -29,7 +29,7 @@ jobs: java-version: ${{ matrix.java }} - name: Build Quarkus main run: | - git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations + git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations -Dno-test-modules - name: Tar Maven Repo shell: bash run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 976d7675..2a255982 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -27,7 +27,7 @@ jobs: java-version: ${{ matrix.java }} - name: Build Quarkus main run: | - git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations + git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations -Dno-test-modules - name: Tar Maven Repo shell: bash run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository diff --git a/603-spring-web-smallrye-openapi/src/test/java/org/acme/spring/web/OpenApiTest.java b/603-spring-web-smallrye-openapi/src/test/java/org/acme/spring/web/OpenApiTest.java index 9d050bb0..00debc10 100644 --- a/603-spring-web-smallrye-openapi/src/test/java/org/acme/spring/web/OpenApiTest.java +++ b/603-spring-web-smallrye-openapi/src/test/java/org/acme/spring/web/OpenApiTest.java @@ -54,7 +54,7 @@ private void checkType(Stream jsonPathStream, String type) { .collect(Collectors.joining(".")); final Map objectMap = response.jsonPath().getMap(jsonPath); Assertions.assertNotNull(objectMap); - Assertions.assertEquals(1, objectMap.keySet().size()); - Assertions.assertEquals(type, objectMap.keySet().iterator().next()); + Assertions.assertEquals(1, objectMap.keySet().size(), "Fails on " + jsonPath); + Assertions.assertEquals(type, objectMap.keySet().iterator().next(), "Fails on " + jsonPath); } } diff --git a/603-spring-web-smallrye-openapi/src/test/resources/request-types.csv b/603-spring-web-smallrye-openapi/src/test/resources/request-types.csv index f1171ec3..0cf3843b 100644 --- a/603-spring-web-smallrye-openapi/src/test/resources/request-types.csv +++ b/603-spring-web-smallrye-openapi/src/test/resources/request-types.csv @@ -1,20 +1,20 @@ /delete-text-plain,delete,text/plain -/delete/no-type,delete,application/json +/delete/no-type,delete,text/plain /delete/text-plain,delete,text/plain /delete/json,delete,application/json /delete/octet-stream,delete,application/octet-stream /patch-text-plain,patch,text/plain -/patch/no-type,patch,application/json +/patch/no-type,patch,text/plain /patch/text-plain,patch,text/plain /patch/json,patch,application/json /patch/octet-stream,patch,application/octet-stream /post-text-plain,post,text/plain -/post/no-type,post,application/json +/post/no-type,post,text/plain /post/text-plain,post,text/plain /post/json,post,application/json /post/octet-stream,post,application/octet-stream /put-text-plain,put,text/plain -/put/no-type,put,application/json +/put/no-type,put,text/plain /put/text-plain,put,text/plain /put/json,put,application/json /put/octet-stream,put,application/octet-stream \ No newline at end of file diff --git a/603-spring-web-smallrye-openapi/src/test/resources/response-types.csv b/603-spring-web-smallrye-openapi/src/test/resources/response-types.csv index 41ecd61f..54085669 100644 --- a/603-spring-web-smallrye-openapi/src/test/resources/response-types.csv +++ b/603-spring-web-smallrye-openapi/src/test/resources/response-types.csv @@ -1,25 +1,25 @@ /delete-text-plain,delete,text/plain -/delete/no-type,delete,application/json +/delete/no-type,delete,text/plain /delete/text-plain,delete,text/plain /delete/json,delete,application/json /delete/octet-stream,delete,application/octet-stream /get-text-plain,get,text/plain -/get/no-type,get,application/json +/get/no-type,get,text/plain /get/text-plain,get,text/plain /get/json,get,application/json /get/octet-stream,get,application/octet-stream /patch-text-plain,patch,text/plain -/patch/no-type,patch,application/json +/patch/no-type,patch,text/plain /patch/text-plain,patch,text/plain /patch/json,patch,application/json /patch/octet-stream,patch,application/octet-stream /post-text-plain,post,text/plain -/post/no-type,post,application/json +/post/no-type,post,text/plain /post/text-plain,post,text/plain /post/json,post,application/json /post/octet-stream,post,application/octet-stream /put-text-plain,put,text/plain -/put/no-type,put,application/json +/put/no-type,put,text/plain /put/text-plain,put,text/plain /put/json,put,application/json /put/octet-stream,put,application/octet-stream \ No newline at end of file