This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a39a453 [CAMEL-17725] Use singleton FHIR server when running IT test,
migrate to failsafe plugin (#478)
a39a453 is described below
commit a39a453ad22f665016833adb9d8076f840e80a1b
Author: John Poth <[email protected]>
AuthorDate: Wed Mar 23 06:22:30 2022 +0100
[CAMEL-17725] Use singleton FHIR server when running IT test, migrate to
failsafe plugin (#478)
---
components-starter/camel-fhir-starter/pom.xml | 70 ++++++++++++++++++++++
.../component/fhir/AbstractFhirTestSupport.java | 2 +-
...pabilitiesTest.java => FhirCapabilitiesIT.java} | 8 +--
...igurationTest.java => FhirConfigurationIT.java} | 6 +-
.../{FhirCreateTest.java => FhirCreateIT.java} | 8 +--
...t.java => FhirCustomClientConfigurationIT.java} | 7 +--
.../{FhirDeleteTest.java => FhirDeleteIT.java} | 8 +--
...ametersTest.java => FhirExtraParametersIT.java} | 8 +--
.../{FhirHistoryTest.java => FhirHistoryIT.java} | 8 +--
.../{FhirLoadPageTest.java => FhirLoadPageIT.java} | 8 +--
.../fhir/{FhirMetaTest.java => FhirMetaIT.java} | 8 +--
...FhirOperationTest.java => FhirOperationIT.java} | 8 +--
.../fhir/{FhirPatchTest.java => FhirPatchIT.java} | 8 +--
.../fhir/{FhirReadTest.java => FhirReadIT.java} | 8 +--
.../{FhirSearchTest.java => FhirSearchIT.java} | 8 +--
.../{FhirSimpleTest.java => FhirSimpleIT.java} | 6 +-
...TransactionTest.java => FhirTransactionIT.java} | 8 +--
.../{FhirUpdateTest.java => FhirUpdateIT.java} | 8 +--
.../{FhirValidateTest.java => FhirValidateIT.java} | 8 +--
...tTest.java => Hl7v2PatientToFhirPatientIT.java} | 6 +-
20 files changed, 139 insertions(+), 70 deletions(-)
diff --git a/components-starter/camel-fhir-starter/pom.xml
b/components-starter/camel-fhir-starter/pom.xml
index 2c65099..db8cfe3 100644
--- a/components-starter/camel-fhir-starter/pom.xml
+++ b/components-starter/camel-fhir-starter/pom.xml
@@ -89,4 +89,74 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <reuseForks>true</reuseForks>
+
<forkedProcessTimeoutInSeconds>${camel.failsafe.forkTimeout}</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <!-- activate integration test if the docker socket file is accessible -->
+ <profile>
+ <id>fhir-integration-tests-docker-file</id>
+ <activation>
+ <file>
+ <exists>/var/run/docker.sock</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- activate integration test if the DOCKER_HOST env var is set -->
+ <profile>
+ <id>fhir-integration-tests-docker-env</id>
+ <activation>
+ <property>
+ <name>env.DOCKER_HOST</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
index 6bba262..efec4ae 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public abstract class AbstractFhirTestSupport {
@RegisterExtension
- public static FhirService service = FhirServiceFactory.createService();
+ public static FhirService service =
FhirServiceFactory.createSingletonService();
protected Patient patient;
@Autowired
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
similarity index 94%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
index 5183c9a..0a3bbce 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
@@ -46,15 +46,15 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirCapabilitiesTest.class,
- FhirCapabilitiesTest.TestConfiguration.class,
+ FhirCapabilitiesIT.class,
+ FhirCapabilitiesIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirCapabilitiesTest extends AbstractFhirTestSupport {
+public class FhirCapabilitiesIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirCapabilitiesTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirCapabilitiesIT.class);
private static final String PATH_PREFIX
=
FhirApiCollection.getCollection().getApiName(FhirCapabilitiesApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
similarity index 96%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index 06f3ae2..07fa948 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -48,13 +48,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirConfigurationTest.class,
- FhirConfigurationTest.TestConfiguration.class,
+ FhirConfigurationIT.class,
+ FhirConfigurationIT.TestConfiguration.class,
CustomFhirConfiguration.class,
FhirServer.class
}
)
-public class FhirConfigurationTest extends AbstractFhirTestSupport {
+public class FhirConfigurationIT extends AbstractFhirTestSupport {
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
similarity index 96%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
index 0352272..aba81bd 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
@@ -47,15 +47,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirCreateTest.class,
- FhirCreateTest.TestConfiguration.class,
+ FhirCreateIT.class,
+ FhirCreateIT.TestConfiguration.class,
CustomNoFhirServerUrlCamelContext.class,
FhirServer.class,
}
)
-public class FhirCreateTest extends AbstractFhirTestSupport {
+public class FhirCreateIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirCreateTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirCreateIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
index ac57732..a9fab88 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
@@ -28,7 +28,6 @@ import ca.uhn.fhir.rest.api.RequestFormatParamStyleEnum;
import ca.uhn.fhir.rest.api.RequestTypeEnum;
import ca.uhn.fhir.rest.api.SummaryEnum;
import ca.uhn.fhir.rest.client.api.Header;
-import ca.uhn.fhir.rest.client.api.IClientInterceptor;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.client.api.IHttpClient;
import ca.uhn.fhir.rest.client.api.IRestfulClient;
@@ -71,13 +70,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirCustomClientConfigurationTest.class,
- FhirCustomClientConfigurationTest.TestConfiguration.class,
+ FhirCustomClientConfigurationIT.class,
+ FhirCustomClientConfigurationIT.TestConfiguration.class,
CustomNoFhirServerUrlCamelContext.class,
FhirServer.class,
}
)
-public class FhirCustomClientConfigurationTest extends AbstractFhirTestSupport
{
+public class FhirCustomClientConfigurationIT extends AbstractFhirTestSupport {
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
index 49ea486..912738a 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
@@ -46,15 +46,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirDeleteTest.class,
- FhirDeleteTest.TestConfiguration.class,
+ FhirDeleteIT.class,
+ FhirDeleteIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirDeleteTest extends AbstractFhirTestSupport {
+public class FhirDeleteIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirDeleteTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirDeleteIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirDeleteApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
similarity index 94%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
index dab4490..c77c4e9 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
@@ -46,15 +46,15 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirExtraParametersTest.class,
- FhirExtraParametersTest.TestConfiguration.class,
+ FhirExtraParametersIT.class,
+ FhirExtraParametersIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirExtraParametersTest extends AbstractFhirTestSupport {
+public class FhirExtraParametersIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirExtraParametersTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirExtraParametersIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirSearchApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
similarity index 96%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
index 261beff..8182b85 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
@@ -46,15 +46,15 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirHistoryTest.class,
- FhirHistoryTest.TestConfiguration.class,
+ FhirHistoryIT.class,
+ FhirHistoryIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirHistoryTest extends AbstractFhirTestSupport {
+public class FhirHistoryIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirHistoryTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirHistoryIT.class);
private static final String PATH_PREFIX
=
FhirApiCollection.getCollection().getApiName(FhirHistoryApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
index ee2d744..899f675 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
@@ -53,15 +53,15 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirLoadPageTest.class,
- FhirLoadPageTest.TestConfiguration.class,
+ FhirLoadPageIT.class,
+ FhirLoadPageIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirLoadPageTest extends AbstractFhirTestSupport {
+public class FhirLoadPageIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirLoadPageTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirLoadPageIT.class);
private static final String PATH_PREFIX
=
FhirApiCollection.getCollection().getApiName(FhirLoadPageApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
index 3e343e8..9f809a3 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
@@ -47,16 +47,16 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirMetaTest.class,
- FhirMetaTest.TestConfiguration.class,
+ FhirMetaIT.class,
+ FhirMetaIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirMetaTest extends AbstractFhirTestSupport {
+public class FhirMetaIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirMetaTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirMetaIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirMetaApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
index 3cc0988..7a398ab 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
@@ -47,16 +47,16 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirOperationTest.class,
- FhirOperationTest.TestConfiguration.class,
+ FhirOperationIT.class,
+ FhirOperationIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirOperationTest extends AbstractFhirTestSupport {
+public class FhirOperationIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirOperationTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirOperationIT.class);
private static final String PATH_PREFIX
=
FhirApiCollection.getCollection().getApiName(FhirOperationApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
index 55429cb..3295682 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
@@ -51,16 +51,16 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirPatchTest.class,
- FhirPatchTest.TestConfiguration.class,
+ FhirPatchIT.class,
+ FhirPatchIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirPatchTest extends AbstractFhirTestSupport {
+public class FhirPatchIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirPatchTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirPatchIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirPatchApiMethod.class).getName();
private static final String PATCH = "[ { \"op\":\"replace\",
\"path\":\"/active\", \"value\":true } ]";
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
similarity index 98%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
index 01a87d7..b42fb16 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
@@ -46,16 +46,16 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirReadTest.class,
- FhirReadTest.TestConfiguration.class,
+ FhirReadIT.class,
+ FhirReadIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirReadTest extends AbstractFhirTestSupport {
+public class FhirReadIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirReadTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirReadIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirReadApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
similarity index 94%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
index 1578fb8..0e28eba 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
@@ -43,15 +43,15 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirSearchTest.class,
- FhirSearchTest.TestConfiguration.class,
+ FhirSearchIT.class,
+ FhirSearchIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirSearchTest extends AbstractFhirTestSupport {
+public class FhirSearchIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirSearchTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirSearchIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirSearchApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
similarity index 95%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
index 197e25b..88b10b7 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
@@ -43,12 +43,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirSimpleTest.class,
- FhirSimpleTest.TestConfiguration.class,
+ FhirSimpleIT.class,
+ FhirSimpleIT.TestConfiguration.class,
FhirServer.class,
}
)
-public class FhirSimpleTest extends AbstractFhirTestSupport {
+public class FhirSimpleIT extends AbstractFhirTestSupport {
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
private static final String GIVEN_NAME = UUID.randomUUID().toString();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
similarity index 97%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
index 85181d6..4d1a7f7 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
@@ -52,15 +52,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirTransactionTest.class,
- FhirTransactionTest.TestConfiguration.class,
+ FhirTransactionIT.class,
+ FhirTransactionIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirTransactionTest extends AbstractFhirTestSupport {
+public class FhirTransactionIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirTransactionTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirTransactionIT.class);
private static final String PATH_PREFIX
=
FhirApiCollection.getCollection().getApiName(FhirTransactionApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
similarity index 98%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
index 0f46574..389d0c7 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
@@ -50,15 +50,15 @@ import static
org.junit.jupiter.api.Assertions.assertNotNull;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirUpdateTest.class,
- FhirUpdateTest.TestConfiguration.class,
+ FhirUpdateIT.class,
+ FhirUpdateIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirUpdateTest extends AbstractFhirTestSupport {
+public class FhirUpdateIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirUpdateTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirUpdateIT.class);
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirUpdateApiMethod.class).getName();
@Test
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
similarity index 96%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
index 6e692d2..d033f6d 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
@@ -49,15 +49,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- FhirValidateTest.class,
- FhirValidateTest.TestConfiguration.class,
+ FhirValidateIT.class,
+ FhirValidateIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class FhirValidateTest extends AbstractFhirTestSupport {
+public class FhirValidateIT extends AbstractFhirTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(FhirValidateTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FhirValidateIT.class);
private static final String PATH_PREFIX
=
FhirApiCollection.getCollection().getApiName(FhirValidateApiMethod.class).getName();
diff --git
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientTest.java
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
similarity index 96%
rename from
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientTest.java
rename to
components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
index 19effef..cc2a837 100644
---
a/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientTest.java
+++
b/components-starter/camel-fhir-starter/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
@@ -42,13 +42,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@SpringBootTest(
classes = {
CamelAutoConfiguration.class,
- Hl7v2PatientToFhirPatientTest.class,
- Hl7v2PatientToFhirPatientTest.TestConfiguration.class,
+ Hl7v2PatientToFhirPatientIT.class,
+ Hl7v2PatientToFhirPatientIT.TestConfiguration.class,
DefaultCamelContext.class,
FhirServer.class,
}
)
-public class Hl7v2PatientToFhirPatientTest extends AbstractFhirTestSupport {
+public class Hl7v2PatientToFhirPatientIT extends AbstractFhirTestSupport {
/*
Segment Purpose FHIR Resource