Merge pull request #258 from jamezp/issue253-follow-up

[253] Follow up for JUnit 5 migration. Fix one assertion and remove t…

.github/workflows/build.yml

@@ -66,7 +66,7 @@ jobs:
           cache: 'maven'
       - name: Build with Maven Java ${{ matrix.java }}  - ${{ matrix.os }}
         run: |
-          mvn clean install -U -B -fae  -Pci
+          mvn clean install -U -B -fae
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
@@ -105,7 +105,7 @@ jobs:
       # Since we need to pass the test.java.home we need different runs for Linux and Windows
       - name: Test with Java ${{ matrix.java }} - ${{ matrix.profile }}
         run: |
-          mvn clean install -U -B -fae ${{ matrix.profile }} -Pci
+          mvn clean install -U -B -fae ${{ matrix.profile }}
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

.github/workflows/resteasy-build.yml

@@ -63,7 +63,7 @@ jobs:
           cache: 'maven'
       - name: Build and Test RESTEasy MicroProfile Java ${{ matrix.java }} - ${{ matrix.os }}
         run: |
-          mvn clean install -B '-Dversion.org.jboss.resteasy=${{ needs.resteasy-build.outputs.resteasy-version }}' -Pci
+          mvn clean install -B '-Dversion.org.jboss.resteasy=${{ needs.resteasy-build.outputs.resteasy-version }}'
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

testsuite/integration-tests/pom.xml

@@ -238,19 +238,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>ci</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludedGroups>org.jboss.resteasy.microprofile.test.util.IgnoreOnCi</excludedGroups>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>provided.server</id>
             <activation>

testsuite/integration-tests/src/test/java/org/jboss/resteasy/microprofile/test/client/integration/ExceptionMapperReturnsNullTest.java

@@ -72,15 +72,11 @@ public void testNoApplicableExceptionMapper() throws Exception {
 
     @Test
     public void testDefaultExceptionMapper() throws Exception {
-        HealthService healthServiceClient = RestClientBuilder.newBuilder()
+        try (HealthService healthServiceClient = RestClientBuilder.newBuilder()
                 .baseUri(TestEnvironment.generateUri(url, "test-app"))
                 .register(new Ignore404ExceptionMapper())
-                .build(HealthService.class);
-
-        try {
-            healthServiceClient.getHealthData();
-        } catch (WebApplicationException e) {
-            // this is the expected result
+                .build(HealthService.class)) {
+            Assertions.assertThrows(WebApplicationException.class, healthServiceClient::getHealthData);
         }
     }
 }

testsuite/integration-tests/src/test/java/org/jboss/resteasy/microprofile/test/client/integration/RestClientProxyTest.java

@@ -59,7 +59,6 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -69,7 +68,6 @@
 
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("IgnoreOnCi.class")
 public class RestClientProxyTest {
 
     public static final String EMOJIS = "\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00";