Workaround for quarkusio/quarkus/issues/9273

jamesnetherton · May 13, 2020 · 08e65ae · 08e65ae
1 parent d41007e
commit 08e65ae
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 14 deletions.
diff --git a/...n-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java b/...n-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
@@ -22,8 +22,8 @@
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import org.apache.camel.quarkus.component.fhir.FhirFlags;
-import org.apache.camel.quarkus.test.EnabledIf;
 import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
@@ -32,8 +32,10 @@ class FhirClientTest {
     private static final Logger LOG = Logger.getLogger(FhirClientTest.class);
 
     @Test
-    @EnabledIf(FhirFlags.R5Enabled.class)
+    //@EnabledIf(FhirFlags.R5Enabled.class)
     public void fhirClientR5() {
+        Assumptions.assumeTrue(new FhirFlags.R5Enabled().getAsBoolean());
+
         LOG.info("Running R5 Client test");
 
         final org.hl7.fhir.r5.model.Patient patient = getR5Patient();
@@ -45,8 +47,10 @@ public void fhirClientR5() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.R4Enabled.class)
+    //@EnabledIf(FhirFlags.R4Enabled.class)
     public void fhirClientR4() {
+        Assumptions.assumeTrue(new FhirFlags.R4Enabled().getAsBoolean());
+
         LOG.info("Running R4 Client test");
 
         final org.hl7.fhir.r4.model.Patient patient = getR4Patient();
@@ -58,8 +62,10 @@ public void fhirClientR4() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.Dstu3Enabled.class)
+    //@EnabledIf(FhirFlags.Dstu3Enabled.class)
     public void fhirClientDstu3() {
+        Assumptions.assumeTrue(new FhirFlags.Dstu3Enabled().getAsBoolean());
+
         LOG.info("Running DSTU3 Client test");
 
         final org.hl7.fhir.dstu3.model.Patient patient = getDstu3Patient();
@@ -71,8 +77,10 @@ public void fhirClientDstu3() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.Dstu2Enabled.class)
+    // @EnabledIf(FhirFlags.Dstu2Enabled.class)
     public void fhirClientDstu2() {
+        Assumptions.assumeTrue(new FhirFlags.Dstu2Enabled().getAsBoolean());
+
         LOG.info("Running DSTU2 CLIENT test");
 
         final ca.uhn.fhir.model.dstu2.resource.Patient patient = getDstu2Patient();

diff --git a/...sts/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java b/...sts/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
@@ -21,18 +21,20 @@
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import org.apache.camel.quarkus.component.fhir.FhirFlags;
-import org.apache.camel.quarkus.test.EnabledIf;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
 class FhirDataformatTest {
     private static final Logger LOG = Logger.getLogger(FhirDataformatTest.class);
 
     @Test
-    @EnabledIf(FhirFlags.Dstu2Enabled.class)
+    //@EnabledIf(FhirFlags.Dstu2Enabled.class)
     public void jsonDstu2() {
+        Assumptions.assumeTrue(new FhirFlags.Dstu2Enabled().getAsBoolean());
+
         LOG.info("Running DSTU2 JSON test");
 
         final ca.uhn.fhir.model.dstu2.resource.Patient patient = getDstu2Patient();
@@ -44,8 +46,10 @@ public void jsonDstu2() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.Dstu2Enabled.class)
+    //@EnabledIf(FhirFlags.Dstu2Enabled.class)
     public void xmlDstu2() {
+        Assumptions.assumeTrue(new FhirFlags.Dstu2Enabled().getAsBoolean());
+
         LOG.info("Running DSTU2 XML test");
 
         final ca.uhn.fhir.model.dstu2.resource.Patient patient = getDstu2Patient();
@@ -57,8 +61,10 @@ public void xmlDstu2() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.Dstu3Enabled.class)
+    //@EnabledIf(FhirFlags.Dstu3Enabled.class)
     public void jsonDstu3() {
+        Assumptions.assumeTrue(new FhirFlags.Dstu3Enabled().getAsBoolean());
+
         LOG.info("Running DSTU3 JSON test");
 
         final Patient patient = getDstu3Patient();
@@ -70,8 +76,10 @@ public void jsonDstu3() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.Dstu3Enabled.class)
+    //@EnabledIf(FhirFlags.Dstu3Enabled.class)
     public void xmlDstu3() {
+        Assumptions.assumeTrue(new FhirFlags.Dstu3Enabled().getAsBoolean());
+
         LOG.info("Running DSTU3 XML test");
 
         final Patient patient = getDstu3Patient();
@@ -83,8 +91,10 @@ public void xmlDstu3() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.R4Enabled.class)
+    //@EnabledIf(FhirFlags.R4Enabled.class)
     public void jsonR4() {
+        Assumptions.assumeTrue(new FhirFlags.R4Enabled().getAsBoolean());
+
         LOG.info("Running R4 JSON test");
 
         final org.hl7.fhir.r4.model.Patient patient = getR4Patient();
@@ -96,8 +106,10 @@ public void jsonR4() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.R4Enabled.class)
+    //@EnabledIf(FhirFlags.R4Enabled.class)
     public void xmlR4() {
+        Assumptions.assumeTrue(new FhirFlags.R4Enabled().getAsBoolean());
+
         LOG.info("Running R4 XML test");
 
         final org.hl7.fhir.r4.model.Patient patient = getR4Patient();
@@ -109,8 +121,10 @@ public void xmlR4() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.R5Enabled.class)
+    //@EnabledIf(FhirFlags.R5Enabled.class)
     public void jsonR5() {
+        Assumptions.assumeTrue(new FhirFlags.R5Enabled().getAsBoolean());
+
         LOG.info("Running R5 JSON test");
 
         final org.hl7.fhir.r5.model.Patient patient = getR5Patient();
@@ -122,8 +136,10 @@ public void jsonR5() {
     }
 
     @Test
-    @EnabledIf(FhirFlags.R5Enabled.class)
+    //@EnabledIf(FhirFlags.R5Enabled.class)
     public void xmlR5() {
+        Assumptions.assumeTrue(new FhirFlags.R5Enabled().getAsBoolean());
+
         LOG.info("Running R5 XML test");
 
         final org.hl7.fhir.r5.model.Patient patient = getR5Patient();