resourceList = new ArrayList<>();
@@ -497,7 +499,7 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallR4Package_DraftResourcesNotInstalled() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- byte[] bytes = loadClasspathBytes("/packages/test-draft-sample.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-draft-sample.tgz");
myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.onlydrafts/0.11.1", bytes);
PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.onlydrafts").setVersion("0.11.1").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL);
@@ -510,7 +512,7 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallR4Package_Twice() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- byte[] bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", bytes);
PackageInstallOutcomeJson outcome;
@@ -535,7 +537,7 @@ public class NpmR4Test extends BaseJpaR4Test {
myPartitionSettings.setPartitioningEnabled(true);
myInterceptorService.registerInterceptor(myRequestTenantPartitionInterceptor);
- byte[] bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", bytes);
PackageInstallOutcomeJson outcome;
@@ -559,7 +561,7 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallR4PackageWithNoDescription() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- byte[] bytes = loadClasspathBytes("/packages/UK.Core.r4-1.1.0.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/UK.Core.r4-1.1.0.tgz");
myFakeNpmServlet.myResponses.put("/UK.Core.r4/1.1.0", bytes);
PackageInstallationSpec spec = new PackageInstallationSpec().setName("UK.Core.r4").setVersion("1.1.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL);
@@ -579,8 +581,8 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testLoadPackageMetadata() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY);
myPackageInstallerSvc.install(spec);
@@ -606,9 +608,9 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testLoadPackageUsingImpreciseId() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.0.tgz"));
PackageInstallationSpec spec;
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY);
@@ -640,8 +642,8 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallNewerPackageUpdatesLatestVersionFlag() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- byte[] contents0111 = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
- byte[] contents0120 = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ byte[] contents0111 = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
+ byte[] contents0120 = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", contents0111);
myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", contents0120);
@@ -685,8 +687,8 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallOlderPackageDoesntUpdateLatestVersionFlag() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
// Install newer version
PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY);
@@ -728,7 +730,7 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallAlreadyExistingIsIgnored() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
// Install
PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY);
@@ -754,10 +756,10 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallPkgContainingSearchParameter() throws IOException {
myDaoConfig.setAllowExternalReferences(true);
- byte[] contents0111 = loadClasspathBytes("/packages/test-exchange-sample.tgz");
+ byte[] contents0111 = ClasspathUtil.loadResourceAsByteArray("/packages/test-exchange-sample.tgz");
myFakeNpmServlet.myResponses.put("/test-exchange.fhir.us.com/2.1.1", contents0111);
- contents0111 = loadClasspathBytes("/packages/test-exchange-sample-2.tgz");
+ contents0111 = ClasspathUtil.loadResourceAsByteArray("/packages/test-exchange-sample-2.tgz");
myFakeNpmServlet.myResponses.put("/test-exchange.fhir.us.com/2.1.2", contents0111);
// Install older version
@@ -799,8 +801,8 @@ public class NpmR4Test extends BaseJpaR4Test {
@Test
public void testLoadContents() throws IOException {
- byte[] contents0111 = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
- byte[] contents0120 = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ byte[] contents0111 = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
+ byte[] contents0120 = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.11.1").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(contents0111);
myPackageInstallerSvc.install(spec);
@@ -823,9 +825,9 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testDeletePackage() throws IOException {
myDaoConfig.setAllowExternalReferences(true);
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
- myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.0", loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.12.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.1", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz"));
+ myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.11.0", ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.0.tgz"));
myPackageInstallerSvc.install(new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY));
myPackageInstallerSvc.install(new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.11.1").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY));
@@ -868,7 +870,7 @@ public class NpmR4Test extends BaseJpaR4Test {
public void testInstallPkgContainingLogicalStructureDefinition() throws Exception {
myDaoConfig.setAllowExternalReferences(true);
- byte[] bytes = loadClasspathBytes("/packages/test-logical-structuredefinition.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-logical-structuredefinition.tgz");
myFakeNpmServlet.myResponses.put("/test-logical-structuredefinition/1.0.0", bytes);
PackageInstallationSpec spec = new PackageInstallationSpec().setName("test-logical-structuredefinition").setVersion("1.0.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL);
@@ -905,7 +907,7 @@ public class NpmR4Test extends BaseJpaR4Test {
myPartitionSettings.setPartitioningEnabled(true);
myInterceptorService.registerInterceptor(myRequestTenantPartitionInterceptor);
- byte[] bytes = loadClasspathBytes("/packages/test-logical-structuredefinition.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-logical-structuredefinition.tgz");
myFakeNpmServlet.myResponses.put("/test-logical-structuredefinition/1.0.0", bytes);
PackageInstallationSpec spec = new PackageInstallationSpec().setName("test-logical-structuredefinition").setVersion("1.0.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL);
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmSearchR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmSearchR4Test.java
similarity index 92%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmSearchR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmSearchR4Test.java
index 8113adb0295..e45236fa463 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmSearchR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmSearchR4Test.java
@@ -3,8 +3,9 @@ package ca.uhn.fhir.jpa.packages;
import ca.uhn.fhir.jpa.dao.data.INpmPackageDao;
import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionDao;
import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionResourceDao;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.test.utilities.ProxyUtil;
+import ca.uhn.fhir.util.ClasspathUtil;
import ca.uhn.fhir.util.JsonUtil;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
@@ -46,15 +47,15 @@ public class NpmSearchR4Test extends BaseJpaR4Test {
PackageInstallationSpec spec;
byte[] bytes;
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.11.1").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
- bytes = loadClasspathBytes("/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz");
spec = new PackageInstallationSpec().setName("nictiz.fhir.nl.stu3.questionnaires").setVersion("1.0.2").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
@@ -82,11 +83,11 @@ public class NpmSearchR4Test extends BaseJpaR4Test {
PackageInstallationSpec spec;
byte[] bytes;
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.11.1").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
@@ -124,7 +125,7 @@ public class NpmSearchR4Test extends BaseJpaR4Test {
public void testSearchByFhirVersion() throws IOException {
PackageInstallationSpec spec;
byte[] bytes;
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
@@ -182,11 +183,11 @@ public class NpmSearchR4Test extends BaseJpaR4Test {
PackageInstallationSpec spec;
byte[] bytes;
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.11.1.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.11.1").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
- bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+ bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY).setPackageContents(bytes);
igInstaller.install(spec);
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpecTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpecTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpecTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallationSpecTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageVersionComparatorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/PackageVersionComparatorTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/PackageVersionComparatorTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/PackageVersionComparatorTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionManagementProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionManagementProviderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionManagementProviderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionManagementProviderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java
index 9fb59f7630b..bbf323ad08a 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.partition;
import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.PartitionEntity;
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
import ca.uhn.fhir.rest.server.exceptions.MethodNotAllowedException;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionedSubscriptionTriggeringR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionedSubscriptionTriggeringR4Test.java
similarity index 98%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionedSubscriptionTriggeringR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionedSubscriptionTriggeringR4Test.java
index 57bdfba2633..fdebd7c87c1 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionedSubscriptionTriggeringR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/PartitionedSubscriptionTriggeringR4Test.java
@@ -7,7 +7,7 @@ import ca.uhn.fhir.interceptor.model.RequestPartitionId;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome;
import ca.uhn.fhir.jpa.api.model.ExpungeOptions;
-import ca.uhn.fhir.jpa.config.StoppableSubscriptionDeliveringRestHookSubscriber;
+import ca.uhn.fhir.jpa.test.util.StoppableSubscriptionDeliveringRestHookSubscriber;
import ca.uhn.fhir.jpa.dao.r4.BasePartitioningR4Test;
import ca.uhn.fhir.jpa.entity.PartitionEntity;
import ca.uhn.fhir.jpa.model.config.PartitionSettings;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvcTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvcTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvcTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvcTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchApplyR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchApplyR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchApplyR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchApplyR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchDiffR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchDiffR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchDiffR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchDiffR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/BaseResourceProviderDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/GraphQLR4ProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/GraphQLR4ProviderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/GraphQLR4ProviderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/GraphQLR4ProviderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/QuestionnaireResourceProviderDstu2.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/QuestionnaireResourceProviderDstu2.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/QuestionnaireResourceProviderDstu2.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/QuestionnaireResourceProviderDstu2.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
index 10229c1cbc4..89b67bab674 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
@@ -71,6 +71,7 @@ import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.util.BundleUtil;
+import ca.uhn.fhir.util.ClasspathUtil;
import ca.uhn.fhir.util.StopWatch;
import ca.uhn.fhir.util.UrlUtil;
import com.google.common.base.Charsets;
@@ -2539,7 +2540,7 @@ public class ResourceProviderDstu2Test extends BaseResourceProviderDstu2Test {
@Test
public void testTransaction() throws Exception {
- String contents = loadClasspath("/update.xml");
+ String contents = ClasspathUtil.loadResource("/update.xml");
HttpPost post = new HttpPost(ourServerBase);
post.setEntity(new StringEntity(contents, ContentType.create("application/xml+fhir", "UTF-8")));
CloseableHttpResponse resp = ourHttpClient.execute(post);
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2ValueSetTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2ValueSetTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2ValueSetTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2ValueSetTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderExpungeDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderExpungeDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderExpungeDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderExpungeDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SearchParameterMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SearchParameterMapTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SearchParameterMapTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SearchParameterMapTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SubscriptionsDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SubscriptionsDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SubscriptionsDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SubscriptionsDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTransactionSearchDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTransactionSearchDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTransactionSearchDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTransactionSearchDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyFreetextIndexingProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyFreetextIndexingProviderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyFreetextIndexingProviderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyFreetextIndexingProviderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProviderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProviderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProviderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java
index 7ff8323b4c8..abbd4e45910 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.provider.dstu3;
import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc;
-import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test;
+import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test;
import ca.uhn.fhir.jpa.graphql.GraphQLProvider;
import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CompositionDocumentDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CompositionDocumentDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CompositionDocumentDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CompositionDocumentDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CorsDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CorsDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CorsDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/CorsDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/GraphQLProviderDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/GraphQLProviderDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/GraphQLProviderDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/GraphQLProviderDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/PatientEverythingDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/PatientEverythingDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/PatientEverythingDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/PatientEverythingDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderCustomSearchParamDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderCustomSearchParamDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderCustomSearchParamDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderCustomSearchParamDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDeleteSqlDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDeleteSqlDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDeleteSqlDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDeleteSqlDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3BundleTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3BundleTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3BundleTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3BundleTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemVersionedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemVersionedTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemVersionedTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3CodeSystemVersionedTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3DistanceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3DistanceTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3DistanceTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3DistanceTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3StructureDefinitionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3StructureDefinitionTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3StructureDefinitionTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3StructureDefinitionTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java
index 148b17b0be8..85d443611cf 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java
@@ -34,6 +34,7 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.rest.server.interceptor.BaseValidatingInterceptor;
import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
+import ca.uhn.fhir.util.ClasspathUtil;
import ca.uhn.fhir.util.HapiExtensions;
import ca.uhn.fhir.util.UrlUtil;
import ca.uhn.fhir.validation.IValidatorModule;
@@ -3941,7 +3942,7 @@ public class ResourceProviderDstu3Test extends BaseResourceProviderDstu3Test {
@Test
public void testTransaction() throws Exception {
- String contents = loadClasspath("/update.xml");
+ String contents = ClasspathUtil.loadResource("/update.xml");
HttpPost post = new HttpPost(ourServerBase);
post.setEntity(new StringEntity(contents, ContentType.create("application/xml+fhir", "UTF-8")));
CloseableHttpResponse resp = ourHttpClient.execute(post);
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetVersionedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetVersionedTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetVersionedTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetVersionedTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderExpungeDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderExpungeDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderExpungeDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderExpungeDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderR3CodeSystemDesignationTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderR3CodeSystemDesignationTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderR3CodeSystemDesignationTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderR3CodeSystemDesignationTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderSearchModifierDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderSearchModifierDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderSearchModifierDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderSearchModifierDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ServerDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ServerDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ServerDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ServerDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderTransactionSearchDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderTransactionSearchDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderTransactionSearchDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderTransactionSearchDstu3Test.java
index 6fceaafe17f..d1d0d87d4a5 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderTransactionSearchDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderTransactionSearchDstu3Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.provider.dstu3;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test;
+import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test;
import ca.uhn.fhir.jpa.rp.dstu3.ObservationResourceProvider;
import ca.uhn.fhir.jpa.rp.dstu3.OrganizationResourceProvider;
import ca.uhn.fhir.jpa.rp.dstu3.PatientResourceProvider;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorJpaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorJpaR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorJpaR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorJpaR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorMultitenantJpaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorMultitenantJpaR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorMultitenantJpaR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorMultitenantJpaR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseMultitenantResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseMultitenantResourceProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseMultitenantResourceProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseMultitenantResourceProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
index 31ff06ee034..ba9da3a14a9 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc;
import ca.uhn.fhir.jpa.dao.data.IPartitionDao;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.graphql.GraphQLProvider;
import ca.uhn.fhir.jpa.provider.DiffProvider;
import ca.uhn.fhir.jpa.provider.JpaCapabilityStatementProvider;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryAccessProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryAccessProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryAccessProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryAccessProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryStorageInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryStorageInterceptorR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryStorageInterceptorR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryStorageInterceptorR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/CompositionDocumentR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/CompositionDocumentR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/CompositionDocumentR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/CompositionDocumentR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ConsentInterceptorResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ConsentInterceptorResourceProviderR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ConsentInterceptorResourceProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ConsentInterceptorResourceProviderR4Test.java
index b96b774cb2c..9abba0bdf60 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ConsentInterceptorResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ConsentInterceptorResourceProviderR4Test.java
@@ -3,9 +3,9 @@ package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.config.JpaConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
import ca.uhn.fhir.jpa.entity.Search;
import ca.uhn.fhir.jpa.model.search.SearchStatusEnum;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.api.PreferReturnEnum;
import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/CorsR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/CorsR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/CorsR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/CorsR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/DiffProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/DiffProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/DiffProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/DiffProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/EmptyIndexesR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/EmptyIndexesR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/EmptyIndexesR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/EmptyIndexesR4Test.java
index ef88b957313..d0fb591cb8a 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/EmptyIndexesR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/EmptyIndexesR4Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.rp.r4.ObservationResourceProvider;
import ca.uhn.fhir.jpa.rp.r4.OrganizationResourceProvider;
import ca.uhn.fhir.jpa.rp.r4.PatientResourceProvider;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ExpungeR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ExpungeR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ExpungeR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ExpungeR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/HookInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/HookInterceptorR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/HookInterceptorR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/HookInterceptorR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4HelperTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4HelperTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4HelperTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/MemberMatcherR4HelperTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantBatchOperationR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantBatchOperationR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantBatchOperationR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantBatchOperationR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantServerR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantServerR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantServerR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/MultitenantServerR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/OpenApiInterceptorJpaTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/OpenApiInterceptorJpaTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/OpenApiInterceptorJpaTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/OpenApiInterceptorJpaTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatchProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatchProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatchProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatchProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientMemberMatchOperationR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientMemberMatchOperationR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientMemberMatchOperationR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientMemberMatchOperationR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/QuestionnaireResourceProviderR4.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/QuestionnaireResourceProviderR4.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/QuestionnaireResourceProviderR4.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/QuestionnaireResourceProviderR4.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/RemoteTerminologyServiceResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/RemoteTerminologyServiceResourceProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/RemoteTerminologyServiceResourceProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/RemoteTerminologyServiceResourceProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderConcurrencyR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderConcurrencyR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderConcurrencyR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderConcurrencyR4Test.java
index fc7ab941960..2c3b5510c58 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderConcurrencyR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderConcurrencyR4Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.interceptor.api.Hook;
import ca.uhn.fhir.interceptor.api.Interceptor;
import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import org.apache.commons.io.IOUtils;
@@ -66,7 +66,7 @@ public class ResourceProviderConcurrencyR4Test extends BaseResourceProviderR4Tes
/**
* This test is intended to verify that we are in fact executing searches in parallel
* when two different searches come in.
- *
+ *
* We execute two identical searches (which should result in only one actual
* execution that will be reused by both) and one other search. We use an
* interceptor to artifically delay the execution of the first search in order
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderExpungeR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderExpungeR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderExpungeR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderExpungeR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderHasParamR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderHasParamR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderHasParamR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderHasParamR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInvalidDataR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInvalidDataR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInvalidDataR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInvalidDataR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderOnlySomeResourcesProvidedR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderOnlySomeResourcesProvidedR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderOnlySomeResourcesProvidedR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderOnlySomeResourcesProvidedR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemDesignationTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemDesignationTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemDesignationTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemDesignationTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemVersionedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemVersionedTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemVersionedTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemVersionedTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ConceptMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ConceptMapTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ConceptMapTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ConceptMapTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4DistanceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4DistanceTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4DistanceTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4DistanceTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ElasticTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ElasticTest.java
similarity index 96%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ElasticTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ElasticTest.java
index 367f5b325d1..1af39faf51d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ElasticTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ElasticTest.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.test.utilities.docker.RequiresDocker;
import org.apache.commons.io.IOUtils;
@@ -87,23 +87,25 @@ public class ResourceProviderR4ElasticTest extends BaseResourceProviderR4Test {
}
- public static Matcher valueSetExpansionMatching(IBaseCoding theTarget) {
- return new TypeSafeDiagnosingMatcher() {
- public void describeTo(Description description) {
- description.appendText("ValueSetExpansionContainsComponent matching ").appendValue(theTarget.getSystem() + "|" + theTarget.getCode());
- }
-
- protected boolean matchesSafely(ValueSet.ValueSetExpansionContainsComponent theItem, Description mismatchDescription) {
- return Objects.equals(theItem.getSystem(), theTarget.getSystem()) &&
- Objects.equals(theItem.getCode(), theTarget.getCode());
- }
- };
- }
-
private void createObservationWithCode(Coding c) {
Observation observation = new Observation();
observation.getCode().addCoding(c);
myObservationDao.create(observation, mySrd).getId().toUnqualifiedVersionless();
}
+ public static Matcher valueSetExpansionMatching(IBaseCoding theTarget) {
+ return new TypeSafeDiagnosingMatcher() {
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("ValueSetExpansionContainsComponent matching ").appendValue(theTarget.getSystem() + "|" + theTarget.getCode());
+ }
+
+ @Override
+ protected boolean matchesSafely(ValueSet.ValueSetExpansionContainsComponent theItem, Description mismatchDescription) {
+ return Objects.equals(theItem.getSystem(), theTarget.getSystem()) &&
+ Objects.equals(theItem.getCode(), theTarget.getCode());
+ }
+ };
+ }
+
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4RemoteTerminologyTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4RemoteTerminologyTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4RemoteTerminologyTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4RemoteTerminologyTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4SearchContainedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4SearchContainedTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4SearchContainedTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4SearchContainedTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4StructureDefinitionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4StructureDefinitionTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4StructureDefinitionTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4StructureDefinitionTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
index af857305a88..4a498b0d8b0 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
@@ -2,7 +2,6 @@ package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
import ca.uhn.fhir.jpa.dao.data.ISearchDao;
import ca.uhn.fhir.jpa.entity.Search;
import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel;
@@ -10,6 +9,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable;
import ca.uhn.fhir.jpa.model.util.JpaConstants;
import ca.uhn.fhir.jpa.model.util.UcumServiceUtil;
import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.UriDt;
@@ -39,6 +39,7 @@ import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
+import ca.uhn.fhir.util.ClasspathUtil;
import ca.uhn.fhir.util.StopWatch;
import ca.uhn.fhir.util.UrlUtil;
import com.google.common.base.Charsets;
@@ -371,14 +372,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(400, resp.getStatusLine().getStatusCode());
}
- get = new HttpGet(ourServerBase + "/Condition?onset-date=ge");
+ get = new HttpGet(ourServerBase + "/Condition?onset-date=ge");
try (CloseableHttpResponse resp = ourHttpClient.execute(get)) {
String output = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8);
assertThat(output, containsString(MSG_PREFIX_INVALID_FORMAT + ""ge""));
assertEquals(400, resp.getStatusLine().getStatusCode());
}
- get = new HttpGet(ourServerBase + "/Condition?onset-date=" + UrlUtil.escapeUrlParam(">"));
+ get = new HttpGet(ourServerBase + "/Condition?onset-date=" + UrlUtil.escapeUrlParam(">"));
try (CloseableHttpResponse resp = ourHttpClient.execute(get)) {
String output = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8);
assertThat(output, containsString(MSG_PREFIX_INVALID_FORMAT + "">""));
@@ -820,7 +821,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
ids = toUnqualifiedVersionlessIdValues(bundle);
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle));
}
-
+
return ids;
}
@@ -983,7 +984,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
List outcome = myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
- runInTransaction(()->{
+ runInTransaction(() -> {
assertEquals(100, myResourceTableDao.count());
});
@@ -2149,7 +2150,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
IIdType o1Id = createOrganization(methodName, "1");
IIdType o2Id = createOrganization(methodName, "2");
- IIdType p1Id = createPatientWithIndexAtOrganization(methodName, "1" , o1Id);
+ IIdType p1Id = createPatientWithIndexAtOrganization(methodName, "1", o1Id);
IIdType c1Id = createConditionForPatient(methodName, "1", p1Id);
IIdType p2Id = createPatientWithIndexAtOrganization(methodName, "2", o2Id);
@@ -2249,7 +2250,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
// Test combining 2 or-listed params
// e.g. _id=1,2&_id=3,4
Parameters parameters = new Parameters();
- parameters.addParameter("_id", "Patient/" +p1Id.getIdPart() + "," + p2Id.getIdPart());
+ parameters.addParameter("_id", "Patient/" + p1Id.getIdPart() + "," + p2Id.getIdPart());
parameters.addParameter("_id", p3Id.getIdPart() + "," + p4Id.getIdPart());
parameters.addParameter(new Parameters.ParametersParameterComponent().setName("_count").setValue(new UnsignedIntType(20)));
@@ -2267,7 +2268,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
// Test paging works.
// There are 12 results, lets make 2 pages of 6.
Parameters parameters = new Parameters();
- parameters.addParameter("_id", "Patient/" +p1Id.getIdPart() + "," + p2Id.getIdPart());
+ parameters.addParameter("_id", "Patient/" + p1Id.getIdPart() + "," + p2Id.getIdPart());
parameters.addParameter("_id", p3Id.getIdPart() + "," + p4Id.getIdPart());
parameters.addParameter(new Parameters.ParametersParameterComponent().setName("_count").setValue(new UnsignedIntType(6)));
@@ -2275,7 +2276,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Bundle bundle = (Bundle) output.getParameter().get(0).getResource();
String next = bundle.getLink("next").getUrl();
- Bundle nextBundle= myClient.loadPage().byUrl(next).andReturnBundle(Bundle.class).execute();
+ Bundle nextBundle = myClient.loadPage().byUrl(next).andReturnBundle(Bundle.class).execute();
assertEquals(BundleType.SEARCHSET, bundle.getType());
assertThat(bundle.getEntry(), hasSize(6));
@@ -2310,7 +2311,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient patientDEF = new Patient();
patientDEF.setId("def");
patientDEF.setManagingOrganization(new Reference(o2Id));
- IIdType pdefId= myPatientDao.update(patientDEF).getId().toUnqualifiedVersionless();
+ IIdType pdefId = myPatientDao.update(patientDEF).getId().toUnqualifiedVersionless();
IIdType c2Id = createConditionForPatient(methodName, "2", pdefId);
IIdType c3Id = createConditionForPatient(methodName, "2", null);
@@ -2331,7 +2332,6 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
-
}
private IIdType createOrganization(String methodName, String s) {
@@ -4466,9 +4466,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
CodeableConcept cc = obs.getCode();
cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValueElement(new DecimalType(125.12)).setUnit("CM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("cm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -4479,9 +4479,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
CodeableConcept cc = obs.getCode();
cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValueElement(new DecimalType(13.45)).setUnit("DM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("dm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -4494,10 +4494,10 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.setValue(new Quantity().setValueElement(new DecimalType(1.45)).setUnit("M").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("m"));
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
@@ -4505,18 +4505,18 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
CodeableConcept cc = obs.getCode();
cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValueElement(new DecimalType(25)).setUnit("CM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("cm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
// > 1m
String uri = ourServerBase + "/Observation?code-value-quantity=http://" + UrlUtil.escapeUrlParam("loinc.org|2345-7$gt1|http://unitsofmeasure.org|m");
ourLog.info("uri = " + uri);
List ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(3, ids.size());
-
+
//>= 100cm
uri = ourServerBase + "/Observation?code-value-quantity=http://" + UrlUtil.escapeUrlParam("loinc.org|2345-7$gt100|http://unitsofmeasure.org|cm");
ourLog.info("uri = " + uri);
@@ -4529,7 +4529,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(3, ids.size());
}
-
+
@Test
public void testSearchWithNormalizedQuantitySearchSupported_CombineUCUMOrNonUCUM() throws Exception {
@@ -4547,9 +4547,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.setValue(new Quantity().setValueElement(new DecimalType(1)).setUnit("M").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("m"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -4558,9 +4558,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.setValue(new Quantity().setValueElement(new DecimalType(13.45)).setUnit("DM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("dm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -4571,22 +4571,22 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.setValue(new Quantity().setValueElement(new DecimalType(1.45)).setUnit("M").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("m"));
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
CodeableConcept cc = obs.getCode();
obs.setValue(new Quantity().setValueElement(new DecimalType(100)).setUnit("CM").setSystem("http://foo").setCode("cm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
String uri;
List ids;
@@ -4600,8 +4600,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(2, ids.size());
}
-
-
+
+
@Test
public void testSearchWithNormalizedQuantitySearchSupported_DegreeFahrenheit() throws Exception {
@@ -4619,9 +4619,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.setValue(new Quantity().setValueElement(new DecimalType(99.82)).setUnit("F").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("[degF]"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -4630,9 +4630,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.setValue(new Quantity().setValueElement(new DecimalType(97.6)).setUnit("F").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("[degF]"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -4643,25 +4643,25 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.getSubject().setReferenceElement(pid0);
CodeableConcept cc = obs.getCode();
obs.setValue(new Quantity().setUnit("CM").setSystem("http://foo").setCode("cm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
myCaptureQueriesListener.clear();
Bundle returnedBundle = myClient
- .search()
- .forResource(Observation.class)
- .where(Observation.VALUE_QUANTITY.withPrefix(ParamPrefixEnum.EQUAL).number("99.82").andUnits("http://unitsofmeasure.org", "[degF]"))
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
-
+ .search()
+ .forResource(Observation.class)
+ .where(Observation.VALUE_QUANTITY.withPrefix(ParamPrefixEnum.EQUAL).number("99.82").andUnits("http://unitsofmeasure.org", "[degF]"))
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
+
assertEquals(1, returnedBundle.getEntry().size());
-
+
//-- check only use original quantity table to search
- String searchSql = myCaptureQueriesListener.getSelectQueries().get(0).getSql(true,true);
+ String searchSql = myCaptureQueriesListener.getSelectQueries().get(0).getSql(true, true);
assertThat(searchSql, containsString("HFJ_SPIDX_QUANTITY t0"));
assertThat(searchSql, not(containsString("HFJ_SPIDX_QUANTITY_NRML")));
}
@@ -4676,7 +4676,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
- myDaoConfig.setReuseCachedSearchResultsForMillis(1000L);
+ myDaoConfig.setReuseCachedSearchResultsForMillis(10000L);
Bundle result1 = myClient
.search()
@@ -5196,7 +5196,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test
public void testSearchWithCompositeSortWith_CodeValueQuantity() throws IOException {
-
+
IIdType pid0;
IIdType oid1;
IIdType oid2;
@@ -5214,59 +5214,59 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.getSubject().setReferenceElement(pid0);
obs.getCode().addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValue(200));
-
+
oid1 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.getCode().addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValue(300));
-
+
oid2 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.getCode().addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValue(150));
-
+
oid3 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
obs.getCode().addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValue(250));
-
+
oid4 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
String uri = ourServerBase + "/Observation?_sort=code-value-quantity";
Bundle found;
-
+
HttpGet get = new HttpGet(uri);
try (CloseableHttpResponse resp = ourHttpClient.execute(get)) {
String output = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8);
found = myFhirContext.newXmlParser().parseResource(Bundle.class, output);
}
-
+
ourLog.info("Bundle: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(found));
-
+
List list = toUnqualifiedVersionlessIds(found);
assertEquals(4, found.getEntry().size());
assertEquals(oid3, list.get(0));
@@ -5274,10 +5274,10 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(oid4, list.get(2));
assertEquals(oid2, list.get(3));
}
-
+
@Test
public void testSearchWithCompositeSortWith_CompCodeValueQuantity() throws IOException {
-
+
IIdType pid0;
IIdType oid1;
IIdType oid2;
@@ -5293,76 +5293,76 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
-
+
ObservationComponentComponent comp = obs.addComponent();
CodeableConcept cc = new CodeableConcept();
- cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
- comp.setCode(cc);
+ cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
+ comp.setCode(cc);
comp.setValue(new Quantity().setValue(200));
-
+
oid1 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
-
+
ObservationComponentComponent comp = obs.addComponent();
CodeableConcept cc = new CodeableConcept();
- cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
- comp.setCode(cc);
+ cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
+ comp.setCode(cc);
comp.setValue(new Quantity().setValue(300));
-
+
oid2 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
-
+
ObservationComponentComponent comp = obs.addComponent();
CodeableConcept cc = new CodeableConcept();
- cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
- comp.setCode(cc);
+ cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
+ comp.setCode(cc);
comp.setValue(new Quantity().setValue(150));
-
+
oid3 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
obs.getSubject().setReferenceElement(pid0);
-
+
ObservationComponentComponent comp = obs.addComponent();
CodeableConcept cc = new CodeableConcept();
- cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
- comp.setCode(cc);
+ cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
+ comp.setCode(cc);
comp.setValue(new Quantity().setValue(250));
oid4 = myObservationDao.create(obs, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
- String uri = ourServerBase + "/Observation?_sort=combo-code-value-quantity";
+
+ String uri = ourServerBase + "/Observation?_sort=combo-code-value-quantity";
Bundle found;
-
+
HttpGet get = new HttpGet(uri);
try (CloseableHttpResponse resp = ourHttpClient.execute(get)) {
String output = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8);
found = myFhirContext.newXmlParser().parseResource(Bundle.class, output);
}
-
+
ourLog.info("Bundle: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(found));
-
+
List list = toUnqualifiedVersionlessIds(found);
assertEquals(4, found.getEntry().size());
assertEquals(oid3, list.get(0));
@@ -5370,8 +5370,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(oid4, list.get(2));
assertEquals(oid2, list.get(3));
}
-
-
+
+
@Test
public void testSearchWithMissing() {
myDaoConfig.setIndexMissingFields(DaoConfig.IndexEnabledEnum.ENABLED);
@@ -5767,7 +5767,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test
public void testTransaction() throws Exception {
- String contents = loadClasspath("/update.xml");
+ String contents = ClasspathUtil.loadResource("/update.xml");
HttpPost post = new HttpPost(ourServerBase);
post.setEntity(new StringEntity(contents, ContentType.create("application/xml+fhir", "UTF-8")));
try (CloseableHttpResponse resp = ourHttpClient.execute(post)) {
@@ -6559,7 +6559,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
patient.addName().setFamily("Tester").addGiven("Joe");
myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless();
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
@@ -6570,8 +6570,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
- IIdType opid1 = myObservationDao.create(obs, mySrd).getId();
-
+ IIdType opid1 = myObservationDao.create(obs, mySrd).getId();
+
//-- update quantity
obs = new Observation();
obs.setId(opid1);
@@ -6580,13 +6580,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
cc = obs.getCode();
cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValueElement(new DecimalType(24.12)).setUnit("CM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("cm"));
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
-
+
myObservationDao.update(obs, mySrd);
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
@@ -6594,9 +6594,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
CodeableConcept cc = obs.getCode();
cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValueElement(new DecimalType(13.45)).setUnit("DM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("dm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
@@ -6609,10 +6609,10 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
obs.setValue(new Quantity().setValueElement(new DecimalType(1.45)).setUnit("M").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("m"));
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
{
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:system").setValue("FOO");
@@ -6620,19 +6620,19 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
CodeableConcept cc = obs.getCode();
cc.addCoding().setCode("2345-7").setSystem("http://loinc.org");
obs.setValue(new Quantity().setValueElement(new DecimalType(25)).setUnit("CM").setSystem(UcumServiceUtil.UCUM_CODESYSTEM_URL).setCode("cm"));
-
+
myObservationDao.create(obs, mySrd);
-
+
ourLog.info("Observation: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(obs));
}
-
+
// > 1m
String uri = ourServerBase + "/Observation?code-value-quantity=http://" + UrlUtil.escapeUrlParam("loinc.org|2345-7$gt1|http://unitsofmeasure.org|m");
ourLog.info("uri = " + uri);
List ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(2, ids.size());
-
-
+
+
//>= 100cm
uri = ourServerBase + "/Observation?code-value-quantity=http://" + UrlUtil.escapeUrlParam("loinc.org|2345-7$gt100|http://unitsofmeasure.org|cm");
ourLog.info("uri = " + uri);
@@ -6648,7 +6648,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test
public void testSearchWithLowerBoundDate() throws Exception {
-
+
// Issue 2424 test case
IIdType pid0;
{
@@ -6657,12 +6657,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
patient.addName().setFamily("Tester").addGiven("Joe");
patient.setBirthDateElement(new DateType("2073"));
pid0 = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless();
-
+
ourLog.info("Patient: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(patient));
-
+
System.out.println("pid0 " + pid0);
}
-
+
String uri = ourServerBase + "/Patient?_total=accurate&birthdate=gt2072";
List ids;
@@ -6675,7 +6675,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
ids = toUnqualifiedVersionlessIdValues(bundle);
ourLog.info("Patient: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle));
}
-
+
uri = ourServerBase + "/Patient?_total=accurate&birthdate=gt2072-01-01";
get = new HttpGet(uri);
@@ -6687,8 +6687,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
ids = toUnqualifiedVersionlessIdValues(bundle);
ourLog.info("Patient: \n" + myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle));
}
-
+
}
+
private String toStr(Date theDate) {
return new InstantDt(theDate).getValueAsString();
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetLuceneDisabledTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetLuceneDisabledTest.java
similarity index 88%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetLuceneDisabledTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetLuceneDisabledTest.java
index 880937138f0..4e8e8357050 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetLuceneDisabledTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetLuceneDisabledTest.java
@@ -3,14 +3,12 @@ package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoCodeSystem;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoValueSet;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
-import ca.uhn.fhir.jpa.dao.dstu2.FhirResourceDaoDstu2SearchNoFtTest;
import ca.uhn.fhir.jpa.provider.ValueSetOperationProvider;
import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
import ca.uhn.fhir.jpa.subscription.match.config.WebsocketDispatcherConfig;
-import ca.uhn.fhir.parser.IParser;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.parser.StrictErrorHandler;
import ca.uhn.fhir.rest.api.EncodingEnum;
import ca.uhn.fhir.rest.client.api.IGenericClient;
@@ -19,11 +17,9 @@ import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.interceptor.CorsInterceptor;
import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory;
import ca.uhn.fhir.test.utilities.JettyUtil;
-import org.apache.commons.io.IOUtils;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.CodeSystem;
import org.hl7.fhir.r4.model.CodeableConcept;
@@ -51,18 +47,15 @@ import org.springframework.web.servlet.DispatcherServlet;
import javax.annotation.Nonnull;
import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
-import static org.junit.jupiter.api.Assertions.fail;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = {TestR4Config.class, TestHibernateSearchAddInConfig.NoFT.class})
@SuppressWarnings({"Duplicates"})
-public class ResourceProviderR4ValueSetLuceneDisabledTest extends BaseJpaTest {
+public class ResourceProviderR4ValueSetLuceneDisabledTest extends BaseJpaTest {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderR4ValueSetLuceneDisabledTest.class);
@@ -97,16 +90,6 @@ public class ResourceProviderR4ValueSetLuceneDisabledTest extends BaseJpaTest {
loadAndPersistValueSet();
}
- private T loadResourceFromClasspath(Class type, String resourceName) throws IOException {
- InputStream stream = FhirResourceDaoDstu2SearchNoFtTest.class.getResourceAsStream(resourceName);
- if (stream == null) {
- fail("Unable to load resource: " + resourceName);
- }
- String string = IOUtils.toString(stream, StandardCharsets.UTF_8);
- IParser newJsonParser = EncodingEnum.detectEncodingNoDefault(string).newParser(myFhirCtx);
- return newJsonParser.parseResource(type, string);
- }
-
private void loadAndPersistCodeSystem() throws IOException {
CodeSystem codeSystem = loadResourceFromClasspath(CodeSystem.class, "/extensional-case-3-cs.xml");
codeSystem.setId("CodeSystem/cs");
@@ -131,11 +114,11 @@ public class ResourceProviderR4ValueSetLuceneDisabledTest extends BaseJpaTest {
private void persistValueSet(ValueSet theValueSet) {
new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
- @Override
- protected void doInTransactionWithoutResult(@Nonnull TransactionStatus theStatus) {
+ @Override
+ protected void doInTransactionWithoutResult(@Nonnull TransactionStatus theStatus) {
myExtensionalVsId = myValueSetDao.create(theValueSet, mySrd).getId().toUnqualifiedVersionless();
}
- });
+ });
myValueSetDao.readEntity(myExtensionalVsId, null).getId();
}
@@ -252,5 +235,4 @@ public class ResourceProviderR4ValueSetLuceneDisabledTest extends BaseJpaTest {
}
-
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSNoVerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSNoVerTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSNoVerTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSNoVerTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSVerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSVerTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSVerTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetVerCSVerTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSearchModifierR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSearchModifierR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSearchModifierR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSearchModifierR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSummaryModeR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSummaryModeR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSummaryModeR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSummaryModeR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerCapabilityStatementProviderJpaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerCapabilityStatementProviderJpaR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerCapabilityStatementProviderJpaR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerCapabilityStatementProviderJpaR4Test.java
index 0a93384dae6..b3286f8983b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerCapabilityStatementProviderJpaR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerCapabilityStatementProviderJpaR4Test.java
@@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.packages.PackageInstallationSpec;
import ca.uhn.fhir.rest.api.CacheControlDirective;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.server.provider.ServerCapabilityStatementProvider;
+import ca.uhn.fhir.util.ClasspathUtil;
import org.apache.commons.lang3.StringUtils;
import org.hamcrest.Matchers;
import org.hl7.fhir.r4.model.Bundle;
@@ -278,7 +279,7 @@ public class ServerCapabilityStatementProviderJpaR4Test extends BaseResourceProv
@Test
public void testRegisteredProfilesReflected_StoredInPackageRegistry() throws IOException {
- byte[] bytes = loadClasspathBytes("/packages/UK.Core.r4-1.1.0.tgz");
+ byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/UK.Core.r4-1.1.0.tgz");
PackageInstallationSpec spec = new PackageInstallationSpec()
.setName("UK.Core.r4")
.setVersion("1.1.0")
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ServerR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java
index 8970af9e6e5..50209aa7170 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java
@@ -6,7 +6,7 @@ import ca.uhn.fhir.interceptor.api.Hook;
import ca.uhn.fhir.interceptor.api.Pointcut;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.batch.config.BatchConstants;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.provider.SystemProviderDstu2Test;
import ca.uhn.fhir.jpa.rp.r4.BinaryResourceProvider;
import ca.uhn.fhir.jpa.rp.r4.DiagnosticReportResourceProvider;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderTransactionSearchR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderTransactionSearchR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderTransactionSearchR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderTransactionSearchR4Test.java
index 9a5acfe386b..c7cb2ea3e0c 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderTransactionSearchR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderTransactionSearchR4Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.provider.r4;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.rp.r4.MedicationRequestResourceProvider;
import ca.uhn.fhir.jpa.rp.r4.MedicationResourceProvider;
import ca.uhn.fhir.jpa.rp.r4.ObservationResourceProvider;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/BaseResourceProviderR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/BaseResourceProviderR5Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/BaseResourceProviderR5Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/BaseResourceProviderR5Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemDesignationTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemDesignationTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemDesignationTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemDesignationTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemVersionedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemVersionedTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemVersionedTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5CodeSystemVersionedTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ConceptMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ConceptMapTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ConceptMapTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ConceptMapTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetVersionedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetVersionedTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetVersionedTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetVersionedTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ServerR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ServerR5Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ServerR5Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r5/ServerR5Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/reindex/ReindexStepTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/reindex/ReindexStepTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/reindex/ReindexStepTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/reindex/ReindexStepTest.java
index 37572ef7cc5..cea32d5ccb8 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/reindex/ReindexStepTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/reindex/ReindexStepTest.java
@@ -6,8 +6,8 @@ import ca.uhn.fhir.batch2.api.VoidModel;
import ca.uhn.fhir.batch2.jobs.reindex.ReindexChunkIds;
import ca.uhn.fhir.batch2.jobs.reindex.ReindexStep;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
import ca.uhn.fhir.jpa.model.entity.ResourceTable;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.model.dstu2.resource.Patient;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.Enumerations;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/reindex/ResourceReindexSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/reindex/ResourceReindexSvcImplTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/reindex/ResourceReindexSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/reindex/ResourceReindexSvcImplTest.java
index 46ab03bd626..7836467c0be 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/reindex/ResourceReindexSvcImplTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/reindex/ResourceReindexSvcImplTest.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.reindex;
import ca.uhn.fhir.jpa.api.svc.IResourceReindexSvc;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/sched/BaseHapiSchedulerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/sched/BaseHapiSchedulerTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/sched/BaseHapiSchedulerTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/sched/BaseHapiSchedulerTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/sched/SchedulerServiceImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/sched/SchedulerServiceImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/sched/SchedulerServiceImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/sched/SchedulerServiceImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/PagingMultinodeProviderDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/PagingMultinodeProviderDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/PagingMultinodeProviderDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/PagingMultinodeProviderDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/PersistedJpaBundleProviderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/RawElasticJsonBuilderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregationTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregationTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregationTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteAggregationTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteElasticsearchIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteElasticsearchIT.java
similarity index 96%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteElasticsearchIT.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteElasticsearchIT.java
index 590e779f9d5..d5ac3d88805 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteElasticsearchIT.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/TokenAutocompleteElasticsearchIT.java
@@ -6,15 +6,15 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc;
import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
-import ca.uhn.fhir.jpa.dao.DaoTestDataBuilder;
import ca.uhn.fhir.jpa.model.entity.ModelConfig;
import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc;
import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
+import ca.uhn.fhir.storage.test.DaoTestDataBuilder;
import ca.uhn.fhir.test.utilities.ITestDataBuilder;
import ca.uhn.fhir.test.utilities.docker.RequiresDocker;
import org.hamcrest.Description;
@@ -51,9 +51,11 @@ import static org.hamcrest.Matchers.not;
@ExtendWith(SpringExtension.class)
@RequiresDocker
@ContextConfiguration(classes = {
- TestR4Config.class, TestHibernateSearchAddInConfig.Elasticsearch.class, DaoTestDataBuilder.Config.class
+ TestR4Config.class,
+ TestHibernateSearchAddInConfig.Elasticsearch.class,
+ DaoTestDataBuilder.Config.class
})
-public class TokenAutocompleteElasticsearchIT extends BaseJpaTest{
+public class TokenAutocompleteElasticsearchIT extends BaseJpaTest {
public static final Coding erythrocyte_by_volume = new Coding("http://loinc.org", "789-8", "Erythrocytes [#/volume] in Blood by Automated count");
@Autowired
protected PlatformTransactionManager myTxManager;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptionsTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptionsTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptionsTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteOptionsTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearchTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearchTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearchTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/autocomplete/ValueSetAutocompleteSearchTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/predicate/ResourceLinkPredicateBuilderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/BaseSearchQueryBuilderDialectTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/BaseSearchQueryBuilderDialectTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/BaseSearchQueryBuilderDialectTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/BaseSearchQueryBuilderDialectTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSqlTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSqlTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSqlTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/GeneratedSqlTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectMySqlTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectMySqlTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectMySqlTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectMySqlTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectPostgresTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectPostgresTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectPostgresTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectPostgresTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectSqlServerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectSqlServerTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectSqlServerTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderDialectSqlServerTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/cache/DatabaseSearchCacheSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/elastic/ElasticsearchHibernatePropertiesBuilderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/elastic/TestElasticsearchContainerHelper.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/elastic/TestElasticsearchContainerHelper.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/elastic/TestElasticsearchContainerHelper.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/elastic/TestElasticsearchContainerHelper.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcMultipleObservationsIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcMultipleObservationsIT.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcMultipleObservationsIT.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcMultipleObservationsIT.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcSingleObservationIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcSingleObservationIT.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcSingleObservationIT.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNElasticsearchSvcSingleObservationIT.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNTestDataGenerator.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNTestDataGenerator.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNTestDataGenerator.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/lastn/LastNTestDataGenerator.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java
index c159ae0e75b..3e51c969f74 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java
@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
import ca.uhn.fhir.jpa.dao.data.IForcedIdDao;
import ca.uhn.fhir.jpa.dao.data.IResourceReindexJobDao;
import ca.uhn.fhir.jpa.dao.data.IResourceTableDao;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java
similarity index 97%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java
index 5b97f82d2d5..41f7226825b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/searchparam/MatchUrlServiceTest.java
@@ -3,9 +3,9 @@ package ca.uhn.fhir.jpa.searchparam;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.RuntimeResourceDefinition;
import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.config.TestDstu3Config;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
import ca.uhn.fhir.jpa.searchparam.util.Dstu3DistanceHelper;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.config.TestDstu3Config;
import ca.uhn.fhir.rest.param.QuantityParam;
import ca.uhn.fhir.rest.param.ReferenceParam;
import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/README.txt b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/README.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/README.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/README.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestParserTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestParserTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestParserTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestParserTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestR4Test.java
index 2b30c3c75c5..dfca2e9ee9f 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestR4Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.stresstest;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc;
import ca.uhn.fhir.jpa.batch.config.BatchConstants;
-import ca.uhn.fhir.jpa.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR4Test.java
index c7a64326371..f4febcf4d2a 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR4Test.java
@@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
import ca.uhn.fhir.jpa.subscription.channel.impl.LinkedBlockingChannel;
import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionMatcherInterceptor;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.test.utilities.server.HashMapResourceProviderExtension;
import ca.uhn.fhir.test.utilities.server.RestfulServerExtension;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR5Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR5Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR5Test.java
index d6eaae2a64d..6eb05e9c298 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR5Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionsR5Test.java
@@ -6,6 +6,7 @@ import ca.uhn.fhir.jpa.provider.r5.BaseResourceProviderR5Test;
import ca.uhn.fhir.jpa.subscription.channel.impl.LinkedBlockingChannel;
import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscriptionChannelType;
import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionMatcherInterceptor;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.rest.annotation.Create;
import ca.uhn.fhir.rest.annotation.ResourceParam;
import ca.uhn.fhir.rest.annotation.Update;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/CountingInterceptor.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu2Util.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu2Util.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu2Util.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu2Util.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu3Util.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu3Util.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu3Util.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirDstu3Util.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirR4Util.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirR4Util.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirR4Util.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirR4Util.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirServiceUtil.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirServiceUtil.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/FhirServiceUtil.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/FhirServiceUtil.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/NotificationServlet.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/SocketImplementation.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionValidatingInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionValidatingInterceptorTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionValidatingInterceptorTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionValidatingInterceptorTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu2Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu2Test.java
index 70c60ddaf24..693213104d6 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu2Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu2Test.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.subscription.email;
import ca.uhn.fhir.jpa.provider.BaseResourceProviderDstu2Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.jpa.subscription.match.deliver.email.EmailSenderImpl;
import ca.uhn.fhir.model.dstu2.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu2.composite.CodingDt;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
index ee70ade4313..cce4f561e4e 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.email;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.jpa.subscription.match.deliver.email.EmailSenderImpl;
import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.server.mail.IMailSvc;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
index 82423a5fe25..9db497c72d4 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
@@ -1,10 +1,8 @@
package ca.uhn.fhir.jpa.subscription.module.matcher;
import ca.uhn.fhir.context.FhirContext;
-
import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.jpa.model.entity.ModelConfig;
import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel;
import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamString;
@@ -18,6 +16,7 @@ import ca.uhn.fhir.jpa.subscription.match.matcher.matching.SubscriptionMatchingS
import ca.uhn.fhir.jpa.subscription.match.matcher.matching.SubscriptionStrategyEvaluator;
import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscription;
import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
import ca.uhn.fhir.jpa.util.CoordCalculatorTest;
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.rest.param.CompositeParam;
@@ -102,11 +101,11 @@ public class InMemorySubscriptionMatcherR4Test {
@Autowired
ModelConfig myModelConfig;
-
+
@AfterEach
public void after() throws Exception {
- myModelConfig.setNormalizedQuantitySearchLevel(NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED);
- }
+ myModelConfig.setNormalizedQuantitySearchLevel(NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED);
+ }
private void assertMatched(Resource resource, SearchParameterMap params) {
InMemoryMatchResult result = match(resource, params);
@@ -248,7 +247,7 @@ public class InMemorySubscriptionMatcherR4Test {
SearchParameterMap params = new SearchParameterMap().setLoadSynchronous(true).add(param, v1);
assertMatched(o1, params);
}
-
+
@Test
public void testSearchWithNormalizedQuantitySearchSupported() {
@@ -264,7 +263,7 @@ public class InMemorySubscriptionMatcherR4Test {
QuantityParam v1 = new QuantityParam(null, 1.5, UcumServiceUtil.UCUM_CODESYSTEM_URL, "m");
SearchParameterMap params1 = new SearchParameterMap().setLoadSynchronous(true).add(param1, v1);
assertMatched(o1, params1);
-
+
Observation o2 = new Observation();
o2.addComponent()
.setCode(new CodeableConcept().addCoding(new Coding().setSystem("http://foo").setCode("cm")))
@@ -281,7 +280,7 @@ public class InMemorySubscriptionMatcherR4Test {
assertMatched(o2, params2);
}
-
+
@Test
public void testSearchWithNormalizedQuantitySearchSupported_InvalidUCUMUnit() {
myModelConfig.setNormalizedQuantitySearchLevel(NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_SUPPORTED);
@@ -297,7 +296,7 @@ public class InMemorySubscriptionMatcherR4Test {
SearchParameterMap params1 = new SearchParameterMap().setLoadSynchronous(true).add(param1, v1);
assertMatched(o1, params1);
}
-
+
@Test
public void testSearchWithNormalizedQuantitySearchSupported_NoSystem() {
myModelConfig.setNormalizedQuantitySearchLevel(NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_SUPPORTED);
@@ -313,7 +312,7 @@ public class InMemorySubscriptionMatcherR4Test {
SearchParameterMap params1 = new SearchParameterMap().setLoadSynchronous(true).add(param1, v1);
assertMatched(o1, params1);
}
-
+
@Test
public void testSearchWithNormalizedQuantitySearchSupported_NotUcumSystem() {
@@ -330,7 +329,7 @@ public class InMemorySubscriptionMatcherR4Test {
SearchParameterMap params1 = new SearchParameterMap().setLoadSynchronous(true).add(param1, v1);
assertMatched(o1, params1);
}
-
+
@Test
public void testIdSupported() {
Observation o1 = new Observation();
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookActivatesPreExistingSubscriptionsR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookActivatesPreExistingSubscriptionsR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookActivatesPreExistingSubscriptionsR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookActivatesPreExistingSubscriptionsR4Test.java
index 4c6d4fcf2ee..a39eba2268d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookActivatesPreExistingSubscriptionsR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookActivatesPreExistingSubscriptionsR4Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionMatcherInterceptor;
import ca.uhn.fhir.rest.annotation.ResourceParam;
import ca.uhn.fhir.rest.annotation.Update;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu2Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu2Test.java
index 480761b2b5a..634896120d6 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu2Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu2Test.java
@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.BaseResourceProviderDstu2Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.model.dstu2.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu2.composite.CodingDt;
import ca.uhn.fhir.model.dstu2.resource.Observation;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java
index 9e1923de84d..2e15a76b4d1 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java
@@ -6,7 +6,7 @@ import ca.uhn.fhir.interceptor.api.IInterceptorService;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
import ca.uhn.fhir.jpa.subscription.NotificationServlet;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.jpa.subscription.match.matcher.matching.SubscriptionMatchingStrategy;
import ca.uhn.fhir.jpa.subscription.util.SubscriptionDebugLogInterceptor;
import ca.uhn.fhir.rest.annotation.Create;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java
index c4b3e9f0833..aaa0de3cfee 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.config.StoppableSubscriptionDeliveringRestHookSubscriber;
+import ca.uhn.fhir.jpa.test.util.StoppableSubscriptionDeliveringRestHookSubscriber;
import ca.uhn.fhir.jpa.subscription.BaseSubscriptionsR4Test;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.rest.api.CacheControlDirective;
@@ -534,18 +534,10 @@ public class RestHookTestR4Test extends BaseSubscriptionsR4Test {
createSubscription(criteria1, payload, sendDeleteMessagesExtension);
waitForActivatedSubscriptionCount(1);
- myStoppableSubscriptionDeliveringRestHookSubscriber.pause();
- final CountDownLatch countDownLatch = new CountDownLatch(1);
- myStoppableSubscriptionDeliveringRestHookSubscriber.setCountDownLatch(countDownLatch);
-
ourLog.info("** About to send observation");
Observation observation = sendObservation("OB-01", "SNOMED-CT");
assertEquals("1", observation.getIdElement().getVersionIdPart());
-
- // Wait for our delivery channel thread to be paused
- assertTrue(countDownLatch.await(5L, TimeUnit.SECONDS));
- // Open the floodgates!
- myStoppableSubscriptionDeliveringRestHookSubscriber.unPause();
+ ourObservationProvider.waitForUpdateCount(1);
ourLog.info("** About to delete observation");
myObservationDao.delete(IdDt.of(observation).toUnqualifiedVersionless());
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java
index 2362cc5babb..ebcd37abdfc 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java
@@ -1,12 +1,11 @@
package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.config.StoppableSubscriptionDeliveringRestHookSubscriber;
+import ca.uhn.fhir.jpa.test.util.StoppableSubscriptionDeliveringRestHookSubscriber;
import ca.uhn.fhir.jpa.subscription.BaseSubscriptionsR5Test;
import ca.uhn.fhir.rest.api.CacheControlDirective;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.api.MethodOutcome;
-import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.util.HapiExtensions;
import org.hl7.fhir.instance.model.api.IBaseBundle;
@@ -19,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
index 7e24d49a2a2..4e47248d1d3 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.BaseResourceProviderDstu2Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionRegistry;
import ca.uhn.fhir.model.dstu2.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu2.composite.CodingDt;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu3Test.java
index 81ffcab1315..c54e95f1e09 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigDstu3Test.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.rest.annotation.Create;
import ca.uhn.fhir.rest.annotation.ResourceParam;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
index 35ecf3cda06..56e4704b9dc 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.model.dstu2.valueset.ResourceTypeEnum;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.rest.annotation.Create;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithEventDefinitionR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithEventDefinitionR4Test.java
similarity index 98%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithEventDefinitionR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithEventDefinitionR4Test.java
index 54804331e05..2e1e59e810d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithEventDefinitionR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithEventDefinitionR4Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.subscription.resthook;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
import ca.uhn.fhir.jpa.subscription.FhirR4Util;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.rest.api.MethodOutcome;
import com.google.common.collect.Lists;
import org.hl7.fhir.instance.model.api.IIdType;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithInterceptorR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithInterceptorR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithInterceptorR4Test.java
index 2cb229b4ac8..32dd2ce7671 100755
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithInterceptorR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookWithInterceptorR4Test.java
@@ -5,7 +5,7 @@ import ca.uhn.fhir.interceptor.api.Hook;
import ca.uhn.fhir.interceptor.api.IInterceptorService;
import ca.uhn.fhir.interceptor.api.Interceptor;
import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.config.StoppableSubscriptionDeliveringRestHookSubscriber;
+import ca.uhn.fhir.jpa.test.util.StoppableSubscriptionDeliveringRestHookSubscriber;
import ca.uhn.fhir.jpa.subscription.BaseSubscriptionsR4Test;
import ca.uhn.fhir.jpa.subscription.model.CanonicalSubscription;
import ca.uhn.fhir.jpa.subscription.model.ResourceDeliveryMessage;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/SubscriptionTriggeringDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/SubscriptionTriggeringDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/SubscriptionTriggeringDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/SubscriptionTriggeringDstu3Test.java
index 3c0f7e552c8..f11581d60d7 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/SubscriptionTriggeringDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/SubscriptionTriggeringDstu3Test.java
@@ -6,7 +6,7 @@ import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.model.sched.ISchedulerService;
import ca.uhn.fhir.jpa.model.util.JpaConstants;
import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.jpa.subscription.triggering.ISubscriptionTriggeringSvc;
import ca.uhn.fhir.jpa.subscription.triggering.SubscriptionTriggeringSvcImpl;
import ca.uhn.fhir.rest.annotation.Create;
@@ -43,7 +43,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu3Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaDstu3Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithCriteriaR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu2Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu2Test.java
index 18a73efb331..66199375e5b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu2Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu2Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.subscription.websocket;
import ca.uhn.fhir.jpa.provider.BaseResourceProviderDstu2Test;
import ca.uhn.fhir.jpa.subscription.FhirDstu2Util;
import ca.uhn.fhir.jpa.subscription.SocketImplementation;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.model.dstu2.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu2.composite.CodingDt;
import ca.uhn.fhir.model.dstu2.composite.ResourceReferenceDt;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu3Test.java
index 6f35dfdfc9b..3a5972460a3 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdDstu3Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.subscription.websocket;
import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
import ca.uhn.fhir.jpa.subscription.FhirDstu3Util;
import ca.uhn.fhir.jpa.subscription.SocketImplementation;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.rest.api.EncodingEnum;
import ca.uhn.fhir.rest.api.MethodOutcome;
import org.eclipse.jetty.websocket.api.Session;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdR4Test.java
index d1d9b1a85a1..ce8d0b0417c 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/subscription/websocket/WebsocketWithSubscriptionIdR4Test.java
@@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.subscription.websocket;
import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
import ca.uhn.fhir.jpa.subscription.FhirR4Util;
import ca.uhn.fhir.jpa.subscription.SocketImplementation;
-import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil;
+import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil;
import ca.uhn.fhir.rest.api.EncodingEnum;
import ca.uhn.fhir.rest.api.MethodOutcome;
import org.eclipse.jetty.websocket.api.Session;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/AbstractValueSetFreeTextExpansionR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/AbstractValueSetFreeTextExpansionR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/AbstractValueSetFreeTextExpansionR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/AbstractValueSetFreeTextExpansionR4Test.java
index 9d5c6cc139c..1117003df08 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/AbstractValueSetFreeTextExpansionR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/AbstractValueSetFreeTextExpansionR4Test.java
@@ -8,8 +8,7 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoValueSet;
import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc;
import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper;
-import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportSvc;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
import ca.uhn.fhir.jpa.dao.data.IResourceTableDao;
import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemDao;
import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemVersionDao;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseLoaderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseLoaderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseLoaderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseLoaderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseTermR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseTermR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseTermR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseTermR4Test.java
index 1046267cea6..efc75618dce 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseTermR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseTermR4Test.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.term;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.entity.TermConcept;
import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ITermReadSvcTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ITermReadSvcTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ITermReadSvcTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ITermReadSvcTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcTest.java
index 207793c77ba..57c0eb3889d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermCodeSystemStorageSvcTest.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.term;
import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.model.entity.ResourceTable;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermConceptMappingSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermReadSvcUtilTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermReadSvcUtilTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermReadSvcUtilTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermReadSvcUtilTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImplTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImplTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermReindexingSvcImplTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TermVersionAdapterSvcR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcCustomTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcCustomTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcCustomTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcCustomTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIcd10cmJpaTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIcd10cmJpaTest.java
similarity index 96%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIcd10cmJpaTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIcd10cmJpaTest.java
index fe5ed44f092..870a2bd93db 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIcd10cmJpaTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIcd10cmJpaTest.java
@@ -1,6 +1,6 @@
package ca.uhn.fhir.jpa.term;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.partition.SystemRequestDetails;
@@ -9,7 +9,6 @@ import ca.uhn.fhir.util.ClasspathUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.io.FileDescriptor;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImgthlaTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImgthlaTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImgthlaTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImgthlaTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIntegrationDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIntegrationDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIntegrationDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIntegrationDstu3Test.java
index d5120f67f99..2a82ff5ccf1 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIntegrationDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcIntegrationDstu3Test.java
@@ -1,9 +1,8 @@
package ca.uhn.fhir.jpa.term;
import ca.uhn.fhir.context.support.IValidationSupport;
-import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test;
+import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test;
import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc;
import com.google.common.collect.Lists;
import org.hl7.fhir.dstu3.model.CodeType;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincJpaTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincJpaTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincJpaTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincJpaTest.java
index 82f4b63f113..b14fec735fd 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincJpaTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincJpaTest.java
@@ -1,6 +1,6 @@
package ca.uhn.fhir.jpa.term;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcDeltaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcDeltaR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcDeltaR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcDeltaR4Test.java
index 717c5e0f14a..4122afa3691 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcDeltaR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcDeltaR4Test.java
@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.context.support.ValidationSupportContext;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermConcept;
import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink;
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java
index 6d4a8d40168..12d9eeae69b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplCurrentVersionR4Test.java
@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.context.support.ValidationSupportContext;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.config.JpaConfig;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.entity.TermConcept;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java
index 803804b91f3..47ed7d10463 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplDstu3Test.java
@@ -5,7 +5,7 @@ import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.context.support.ValidationSupportContext;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test;
+import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.entity.TermConcept;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplR4Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/TerminologySvcImplR4Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulatorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulatorTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulatorTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetConceptAccumulatorTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4ElasticsearchIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4ElasticsearchIT.java
similarity index 97%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4ElasticsearchIT.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4ElasticsearchIT.java
index d4ed0d802f4..e9eb297bc01 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4ElasticsearchIT.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4ElasticsearchIT.java
@@ -8,10 +8,9 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoValueSet;
import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc;
import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper;
-import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportSvc;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
import ca.uhn.fhir.jpa.dao.data.IResourceTableDao;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.entity.TermConcept;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java
index f3151fe33c9..bc72339607d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java
@@ -1940,10 +1940,32 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test {
assertThat(ValueSetTestUtil.extractExpansionMessage(expansion), containsString("Performing in-memory expansion without parameters"));
assertThat(ValueSetTestUtil.toCodes(expansion), contains("B"));
+ runInTransaction(()->{
+ List statuses = myTermValueSetDao
+ .findAll()
+ .stream()
+ .map(t -> t.getExpansionStatus())
+ .collect(Collectors.toList());
+ assertThat(statuses, contains(
+ TermValueSetPreExpansionStatusEnum.NOT_EXPANDED
+ ));
+ });
+
// Perform pre-expansion
myTerminologyDeferredStorageSvc.saveAllDeferred();
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
+ runInTransaction(()->{
+ List statuses = myTermValueSetDao
+ .findAll()
+ .stream()
+ .map(t -> t.getExpansionStatus())
+ .collect(Collectors.toList());
+ assertThat(statuses, contains(
+ TermValueSetPreExpansionStatusEnum.EXPANDED
+ ));
+ });
+
// Expand (should use the new precalculated expansion)
expansion = myValueSetDao.expand(new IdType("ValueSet/vs"), new ValueSetExpansionOptions(), mySrd);
ourLog.info(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(expansion));
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4ElasticIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4ElasticIT.java
similarity index 82%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4ElasticIT.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4ElasticIT.java
index d3aefa3c6b3..b656fc157ca 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4ElasticIT.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4ElasticIT.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.term;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4LuceneIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4LuceneIT.java
similarity index 84%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4LuceneIT.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4LuceneIT.java
index ff28472c607..50bd09061c0 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4LuceneIT.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ValueSetFreeTextExpansionR4LuceneIT.java
@@ -1,7 +1,7 @@
package ca.uhn.fhir.jpa.term;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/ZipCollectionBuilder.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/freetext/ReindexTerminologyFreetextR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/freetext/ReindexTerminologyFreetextR4Test.java
similarity index 89%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/freetext/ReindexTerminologyFreetextR4Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/freetext/ReindexTerminologyFreetextR4Test.java
index d8128fbb176..908244e514f 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/freetext/ReindexTerminologyFreetextR4Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/freetext/ReindexTerminologyFreetextR4Test.java
@@ -1,9 +1,7 @@
package ca.uhn.fhir.jpa.term.freetext;
-import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig;
-import ca.uhn.fhir.jpa.config.TestR4Config;
+import ca.uhn.fhir.jpa.test.config.TestR4Config;
import ca.uhn.fhir.jpa.dao.data.ITermConceptDao;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.entity.TermConcept;
@@ -13,7 +11,8 @@ import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider;
import ca.uhn.fhir.jpa.term.TermLoaderSvcImpl;
import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc;
import ca.uhn.fhir.jpa.term.api.ITermReadSvc;
-import ca.uhn.fhir.rest.api.server.RequestDetails;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig;
import net.ttddyy.dsproxy.ExecutionInfo;
import net.ttddyy.dsproxy.QueryInfo;
import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder;
@@ -22,10 +21,7 @@ import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
import org.hibernate.search.engine.search.query.SearchQuery;
import org.hibernate.search.mapper.orm.Search;
import org.hibernate.search.mapper.orm.common.EntityReference;
-import org.hibernate.search.mapper.orm.mapping.SearchMapping;
import org.hibernate.search.mapper.orm.session.SearchSession;
-import org.hibernate.search.mapper.orm.work.SearchWorkspace;
-import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
@@ -44,46 +40,29 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import static ca.uhn.fhir.jpa.batch.config.BatchConstants.TERM_CODE_SYSTEM_VERSION_DELETE_JOB_NAME;
import static java.util.Map.entry;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = {TestR4Config.class, TestHibernateSearchAddInConfig.LuceneFilesystem.class
- ,ReindexTerminologyFreetextR4Test.NoopMandatoryTransactionListener.class
+ , ReindexTerminologyFreetextR4Test.NoopMandatoryTransactionListener.class
})
public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
- private static final Logger ourLog = LoggerFactory.getLogger(ReindexTerminologyFreetextR4Test.class);
-
public static final String LOINC_URL = "http://loinc.org";
public static final String TEST_FILES_CLASSPATH = "loinc-reindex/";
public static final String NULL = "'null'";
-
// set to false to avoid cleanup for debugging purposes
public static final boolean CLEANUP_DATA = true;
-
public static final String CS_VERSION = "2.68";
public static final int CS_CONCEPTS_NUMBER = 81;
-
public static final String LOINC_PROPERTIES_CLASSPATH =
ResourceUtils.CLASSPATH_URL_PREFIX + TEST_FILES_CLASSPATH + "Loinc_small_v68.zip";
-
public static final String LOINC_ZIP_CLASSPATH =
ResourceUtils.CLASSPATH_URL_PREFIX + TEST_FILES_CLASSPATH + "v268_loincupload.properties";
-
-
- @Autowired private EntityManager myEntityManager;
- @Autowired private TermLoaderSvcImpl myTermLoaderSvc;
- @Autowired private ITermReadSvc myITermReadSvc;
- @Autowired private ITermConceptDao myTermConceptDao;
- @Autowired private ITermReadSvc myTermReadSvc;
-
-
+ private static final Logger ourLog = LoggerFactory.getLogger(ReindexTerminologyFreetextR4Test.class);
long termCodeSystemVersionWithVersionId;
long termCodeSystemVersionWithNoVersionId;
-
Map conceptCounts = Map.ofEntries(
entry("http://loinc.org/vs", 81L),
entry("http://loinc.org/vs/LG100-4", 0L),
@@ -98,7 +77,6 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
entry("http://loinc.org/vs/top-2000-lab-observations-si", 0L),
entry("http://loinc.org/vs/top-2000-lab-observations-us", 0L)
);
-
Map conceptDesignationCounts = Map.ofEntries(
entry("http://loinc.org/vs", 55L),
entry("http://loinc.org/vs/LG100-4", 0L),
@@ -113,9 +91,16 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
entry("http://loinc.org/vs/top-2000-lab-observations-si", 0L),
entry("http://loinc.org/vs/top-2000-lab-observations-us", 0L)
);
-
-
-
+ @Autowired
+ private EntityManager myEntityManager;
+ @Autowired
+ private TermLoaderSvcImpl myTermLoaderSvc;
+ @Autowired
+ private ITermReadSvc myITermReadSvc;
+ @Autowired
+ private ITermConceptDao myTermConceptDao;
+ @Autowired
+ private ITermReadSvc myTermReadSvc;
@Test()
public void uploadLoincCodeSystem() throws FileNotFoundException, InterruptedException {
@@ -167,7 +152,7 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
*/
private void validateFreetextCounts() {
int dbTermConceptCountForVersion = runInTransaction(() ->
- myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithVersionId) );
+ myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithVersionId));
assertEquals(CS_CONCEPTS_NUMBER, dbTermConceptCountForVersion);
long termConceptCountForVersion = searchAllIndexedTermConceptCount(termCodeSystemVersionWithVersionId);
@@ -177,7 +162,7 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
int dbTermConceptCountForNullVersion = runInTransaction(() ->
- myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithNoVersionId) );
+ myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithNoVersionId));
assertEquals(CS_CONCEPTS_NUMBER, dbTermConceptCountForNullVersion);
long termConceptCountNullVersion = searchAllIndexedTermConceptCount(termCodeSystemVersionWithNoVersionId);
@@ -187,7 +172,6 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
}
-
private void validateFreetextIndexesEmpty() {
long termConceptCountVersioned = searchAllIndexedTermConceptCount(termCodeSystemVersionWithVersionId);
assertEquals(0, termConceptCountVersioned);
@@ -203,9 +187,9 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
List termValueSets = myTermValueSetDao.findAll();
for (TermValueSet termValueSet : termValueSets) {
ourLog.debug("=================> testing ValueSet: {}", termValueSet.getUrl());
- long conceptCount = conceptCounts.get( termValueSet.getUrl() );
+ long conceptCount = conceptCounts.get(termValueSet.getUrl());
assertEquals(conceptCount, termValueSet.getTotalConcepts());
- long conceptDesignationCount = conceptDesignationCounts.get( termValueSet.getUrl() );
+ long conceptDesignationCount = conceptDesignationCounts.get(termValueSet.getUrl());
assertEquals(conceptDesignationCount, termValueSet.getTotalConceptDesignations());
}
}
@@ -214,13 +198,13 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
private void validateSavedConceptsCount() {
termCodeSystemVersionWithVersionId = getTermCodeSystemVersionNotNullId();
int dbVersionedTermConceptCount = runInTransaction(() ->
- myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithVersionId) );
+ myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithVersionId));
ourLog.info("=================> Number of stored concepts for version {}: {}", CS_VERSION, dbVersionedTermConceptCount);
assertEquals(CS_CONCEPTS_NUMBER, dbVersionedTermConceptCount);
termCodeSystemVersionWithNoVersionId = getTermCodeSystemVersionNullId();
int dbNotVersionedTermConceptCount = runInTransaction(() ->
- myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithNoVersionId) );
+ myTermConceptDao.countByCodeSystemVersion(termCodeSystemVersionWithNoVersionId));
ourLog.info("=================> Number of stored concepts for version {}: {}", NULL, dbNotVersionedTermConceptCount);
assertEquals(CS_CONCEPTS_NUMBER, dbNotVersionedTermConceptCount);
}
@@ -257,22 +241,21 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
List fileDescriptors = new ArrayList<>();
File propsFile = ResourceUtils.getFile(LOINC_PROPERTIES_CLASSPATH);
- fileDescriptors.add( new TerminologyUploaderProvider.FileBackedFileDescriptor(propsFile) );
+ fileDescriptors.add(new TerminologyUploaderProvider.FileBackedFileDescriptor(propsFile));
File zipFile = ResourceUtils.getFile(LOINC_ZIP_CLASSPATH);
- fileDescriptors.add( new TerminologyUploaderProvider.FileBackedFileDescriptor(zipFile) );
+ fileDescriptors.add(new TerminologyUploaderProvider.FileBackedFileDescriptor(zipFile));
return fileDescriptors;
}
-
private long searchAllIndexedTermConceptCount(long theCodeSystemVersionId) {
return runInTransaction(() -> {
SearchSession searchSession = Search.session(myEntityManager);
SearchPredicateFactory predicate = searchSession.scope(TermConcept.class).predicate();
PredicateFinalStep step = predicate.bool(b ->
- b.must(predicate.match().field("myCodeSystemVersionPid").matching(theCodeSystemVersionId)) );
+ b.must(predicate.match().field("myCodeSystemVersionPid").matching(theCodeSystemVersionId)));
SearchQuery termConceptsQuery = searchSession
.search(TermConcept.class)
@@ -286,24 +269,6 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
}
- /**
- * This configuration bypasses the MandatoryTransactionListener, which breaks this test
- * (I think it is because hibernate search massIndexer starts threads which don't participate of test transactions)
- */
- @Configuration
- public static class NoopMandatoryTransactionListener {
-
- @Bean
- public ProxyDataSourceBuilder.SingleQueryExecution getMandatoryTransactionListener() {
- return new ProxyDataSourceBuilder.SingleQueryExecution() {
- @Override
- public void execute(ExecutionInfo execInfo, List queryInfoList) {
- }
- };
- }
- }
-
-
@Override
public void afterCleanupDao() {
if (CLEANUP_DATA) {
@@ -338,5 +303,22 @@ public class ReindexTerminologyFreetextR4Test extends BaseJpaR4Test {
super.afterEachClearCaches();
}
}
+
+ /**
+ * This configuration bypasses the MandatoryTransactionListener, which breaks this test
+ * (I think it is because hibernate search massIndexer starts threads which don't participate of test transactions)
+ */
+ @Configuration
+ public static class NoopMandatoryTransactionListener {
+
+ @Bean
+ public ProxyDataSourceBuilder.SingleQueryExecution getMandatoryTransactionListener() {
+ return new ProxyDataSourceBuilder.SingleQueryExecution() {
+ @Override
+ public void execute(ExecutionInfo execInfo, List queryInfoList) {
+ }
+ };
+ }
+ }
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoaderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoaderTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoaderTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/icd10cm/Icd10CmLoaderTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/DynamicJobFlowSandbox.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/DynamicJobFlowSandbox.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/DynamicJobFlowSandbox.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/DynamicJobFlowSandbox.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteJobTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteJobTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteJobTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteJobTest.java
index e0b28964df2..7d7069cd1a4 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteJobTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteJobTest.java
@@ -23,7 +23,7 @@ package ca.uhn.fhir.jpa.term.job;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.batch.api.IBatchJobSubmitter;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.term.TermLoaderSvcImpl;
import ca.uhn.fhir.jpa.term.UploadStatistics;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemVersionDeleteJobTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemVersionDeleteJobTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemVersionDeleteJobTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemVersionDeleteJobTest.java
index 03e3314b4da..7dccdc6dad3 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemVersionDeleteJobTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemVersionDeleteJobTest.java
@@ -23,7 +23,7 @@ package ca.uhn.fhir.jpa.term.job;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.batch.api.IBatchJobSubmitter;
-import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test;
+import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import ca.uhn.fhir.jpa.entity.TermCodeSystem;
import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
import ca.uhn.fhir.jpa.term.TermLoaderSvcImpl;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandlerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandlerTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandlerTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandlerTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/testutil/SpringFileTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/testutil/SpringFileTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/testutil/SpringFileTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/testutil/SpringFileTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/CoordCalculatorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/CoordCalculatorTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/CoordCalculatorTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/CoordCalculatorTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/HashFunctionTester.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/HashFunctionTester.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/HashFunctionTester.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/HashFunctionTester.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/JpaClasspathTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/JpaClasspathTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/JpaClasspathTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/JpaClasspathTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/MemoryCacheServiceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/MemoryCacheServiceTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/MemoryCacheServiceTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/MemoryCacheServiceTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/ResourceCountCacheTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/ResourceCountCacheTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/ResourceCountCacheTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/ResourceCountCacheTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/ValueSetTestUtil.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java
similarity index 99%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java
index a2f2351bd4d..5525a5730df 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.util.jsonpatch;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.dao.BaseJpaTest;
+import ca.uhn.fhir.jpa.test.BaseJpaTest;
import ca.uhn.fhir.jpa.patch.JsonPatchUtils;
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
import org.hl7.fhir.r4.model.Observation;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/z/ResourceMinimizerMojo.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/z/ResourceMinimizerMojo.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/z/ResourceMinimizerMojo.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/z/ResourceMinimizerMojo.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/z/ZContextCloserDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/z/ZContextCloserDstu2Test.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/z/ZContextCloserDstu2Test.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/z/ZContextCloserDstu2Test.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/validator/AttachmentUtilTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/validator/AttachmentUtilTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/validator/AttachmentUtilTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/validator/AttachmentUtilTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/validator/ValidatorAcrossVersionsTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/validator/ValidatorAcrossVersionsTest.java
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/validator/ValidatorAcrossVersionsTest.java
rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/validator/ValidatorAcrossVersionsTest.java
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/allergyintolerance-david.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/allergyintolerance-david.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/allergyintolerance-david.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/allergyintolerance-david.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/allergyintolerance-sd-david.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/allergyintolerance-sd-david.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/allergyintolerance-sd-david.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/allergyintolerance-sd-david.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/basic-stu3.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/basic-stu3.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/basic-stu3.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/basic-stu3.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/batch-error.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/batch-error.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/batch-error.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/batch-error.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/binu_testpatient_resource.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/binu_testpatient_resource.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/binu_testpatient_resource.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/binu_testpatient_resource.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/binu_testpatient_structuredefinition_dstu2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/binu_testpatient_structuredefinition_dstu2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/binu_testpatient_structuredefinition_dstu2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/binu_testpatient_structuredefinition_dstu2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/brian-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/brian-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/brian-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/brian-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/brokenbundle_dstu2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/brokenbundle_dstu2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/brokenbundle_dstu2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/brokenbundle_dstu2.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bryn-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bryn-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bryn-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bryn-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug-410-bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug-410-bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug-410-bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug-410-bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug1044-bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug1044-bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug1044-bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug1044-bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug147-bundle-dstu3.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug147-bundle-dstu3.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug147-bundle-dstu3.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug147-bundle-dstu3.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug147-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug147-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug147-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug147-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug454_utf8.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug454_utf8.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug454_utf8.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug454_utf8.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug638.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug638.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug638.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug638.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug872-ext-with-hl7-url.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug872-ext-with-hl7-url.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug872-ext-with-hl7-url.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug872-ext-with-hl7-url.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bug_516_invalid_expansion.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bug_516_invalid_expansion.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bug_516_invalid_expansion.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bug_516_invalid_expansion.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu1.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bundle-dstu1.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu1.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bundle-dstu1.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bundle-dstu2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bundle-dstu2.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu3.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/bundle-dstu3.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu3.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/bundle-dstu3.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/cdr-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/cdr-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/cdr-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/cdr-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/conceptmap-example-specimen-type.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/conceptmap-example-specimen-type.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/conceptmap-example-specimen-type.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/conceptmap-example-specimen-type.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/custom_term/codesystem.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/codesystem.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/custom_term/codesystem.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/codesystem.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/custom_term/concepts.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/concepts.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/custom_term/concepts.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/concepts.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/custom_term/hierarchy.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/hierarchy.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/custom_term/hierarchy.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/hierarchy.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/custom_term/properties.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/properties.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/custom_term/properties.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/custom_term/properties.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/david-bundle-error.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/david-bundle-error.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/david-bundle-error.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/david-bundle-error.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/david-bundle-error2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/david-bundle-error2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/david-bundle-error2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/david-bundle-error2.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/david_big_bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/david_big_bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/david_big_bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/david_big_bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/document-bundle-dstu3.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/document-bundle-dstu3.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/document-bundle-dstu3.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/document-bundle-dstu3.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/document-father-dstu3.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/document-father-dstu3.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/document-father-dstu3.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/document-father-dstu3.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/document-father.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/document-father.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/document-father.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/document-father.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/documentmanifest.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/documentmanifest.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/documentmanifest.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/documentmanifest.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/documentreference.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/documentreference.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/documentreference.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/documentreference.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu1_bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu1_bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu1_bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu1_bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu2/Conformance-server.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu2/Conformance-server.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu2/Conformance-server.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu2/Conformance-server.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu2/createdeletebundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu2/createdeletebundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu2/createdeletebundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu2/createdeletebundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3-person.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3-person.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3-person.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3-person.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3-post1.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3-post1.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3-post1.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3-post1.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3-post2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3-post2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3-post2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3-post2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/Reilly_Libby_73.json.gz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/Reilly_Libby_73.json.gz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/Reilly_Libby_73.json.gz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/Reilly_Libby_73.json.gz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/duplicate-conditional-create.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/duplicate-conditional-create.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/duplicate-conditional-create.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/duplicate-conditional-create.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc01-cs-yesnounk.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc01-cs-yesnounk.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc01-cs-yesnounk.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc01-cs-yesnounk.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-cs-binderrecommend.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-cs-binderrecommend.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-cs-binderrecommend.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-cs-binderrecommend.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-questionnaire.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-questionnaire.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-questionnaire.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-questionnaire.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-questionnaireresponse.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-questionnaireresponse.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-questionnaireresponse.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-questionnaireresponse.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-vs-binderrecommend.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-vs-binderrecommend.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-vs-binderrecommend.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-vs-binderrecommend.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-vs-fmcyesno.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-vs-fmcyesno.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/fmc03-vs-fmcyesno.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/fmc03-vs-fmcyesno.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/iar/CodeSystem-iar-citizenship-status.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/iar/CodeSystem-iar-citizenship-status.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/iar/CodeSystem-iar-citizenship-status.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/iar/CodeSystem-iar-citizenship-status.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/iar/ValueSet-iar-citizenship-status.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/iar/ValueSet-iar-citizenship-status.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/iar/ValueSet-iar-citizenship-status.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/iar/ValueSet-iar-citizenship-status.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/nl/LandISOCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/nl/LandISOCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/nl/LandISOCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/nl/LandISOCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.20.5.2--20171231000000.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/episodeofcare-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/episodeofcare-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/episodeofcare-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/episodeofcare-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/location-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/location-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/location-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/location-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/organization-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/organization-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/organization-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/organization-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/patient-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/patient-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/patient-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/patient-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/practitioner-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/practitioner-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/no-store-header/practitioner-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/no-store-header/practitioner-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/profile-differential-patient-dstu3.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/profile-differential-patient-dstu3.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/profile-differential-patient-dstu3.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/profile-differential-patient-dstu3.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3/slow_bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/slow_bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3/slow_bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3/slow_bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3_codesystem_complete.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_codesystem_complete.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3_codesystem_complete.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_codesystem_complete.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3_custom_resource_patient.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_custom_resource_patient.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3_custom_resource_patient.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_custom_resource_patient.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3_transaction.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_transaction.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3_transaction.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_transaction.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3_transaction2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_transaction2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/dstu3_transaction2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/dstu3_transaction2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/duplicate-conditional-create.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/duplicate-conditional-create.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/duplicate-conditional-create.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/duplicate-conditional-create.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-cs-with-designations-lang.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-cs-with-designations-lang.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-cs-with-designations-lang.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-cs-with-designations-lang.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-cs-with-designations.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-cs-with-designations.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-cs-with-designations.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-cs-with-designations.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-cs.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-cs.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-cs.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-cs.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-vs-with-exclude.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-vs-with-exclude.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-vs-with-exclude.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-vs-with-exclude.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-vs.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-vs.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-3-vs.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-3-vs.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/extensional-case-dstu3.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-dstu3.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/extensional-case-dstu3.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/extensional-case-dstu3.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/grahame-transaction-with-bad.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/grahame-transaction-with-bad.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/grahame-transaction-with-bad.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/grahame-transaction-with-bad.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/grahame-transaction.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/grahame-transaction.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/grahame-transaction.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/grahame-transaction.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/icd/icd10cm_tabular_2021.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/icd/icd10cm_tabular_2021.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/icd/icd10cm_tabular_2021.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/icd/icd10cm_tabular_2021.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/imagingstudy.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/imagingstudy.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/imagingstudy.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/imagingstudy.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/imgthla/bogus.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/imgthla/bogus.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/imgthla/bogus.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/imgthla/bogus.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/imgthla/hla.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/imgthla/hla.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/imgthla/hla.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/imgthla/hla.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/imgthla/hla_nom.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/imgthla/hla_nom.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/imgthla/hla_nom.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/imgthla/hla_nom.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/issue534/bw_profile_snapshot.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/bw_profile_snapshot.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/issue534/bw_profile_snapshot.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/bw_profile_snapshot.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/issue534/example_profile.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/example_profile.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/issue534/example_profile.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/example_profile.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/issue534/fiphr-vs-bodysite.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/fiphr-vs-bodysite.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/issue534/fiphr-vs-bodysite.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/fiphr-vs-bodysite.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/issue534/fiphr-vs-observationmethod.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/fiphr-vs-observationmethod.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/issue534/fiphr-vs-observationmethod.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/issue534/fiphr-vs-observationmethod.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/josh-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/josh-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/josh-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/josh-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/lastntestbundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/lastntestbundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/lastntestbundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/lastntestbundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/logback-test.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/logback-test.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/logback-test.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/logback-test.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-reindex/Loinc_small_v68.zip b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-reindex/Loinc_small_v68.zip
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-reindex/Loinc_small_v68.zip
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-reindex/Loinc_small_v68.zip
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-reindex/v268_loincupload.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-reindex/v268_loincupload.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-reindex/v268_loincupload.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-reindex/v268_loincupload.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/loincupload.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/loincupload.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/loincupload.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/loincupload.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/loincupload_singlepartlink.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/loincupload_singlepartlink.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/loincupload_singlepartlink.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/loincupload_singlepartlink.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ConsumerName/ConsumerName.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ConsumerName/ConsumerName.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ConsumerName/ConsumerName.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ConsumerName/ConsumerName.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/DocumentOntology/DocumentOntology.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/DocumentOntology/DocumentOntology.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/DocumentOntology/DocumentOntology.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/DocumentOntology/DocumentOntology.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/Group.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/Group.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/Group.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/Group.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/GroupLoincTerms.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/GroupLoincTerms.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/GroupLoincTerms.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/GroupLoincTerms.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/ParentGroup.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/ParentGroup.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/ParentGroup.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/GroupFile/ParentGroup.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Primary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/Part.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/Part.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/Part.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/Part.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/LoincTable/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/LoincTable/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/LoincTable/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/LoincTable/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/loinc.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/loinc.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v-no-version/loinc.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v-no-version/loinc.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/ConsumerName/ConsumerName.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/ConsumerName/ConsumerName.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/ConsumerName/ConsumerName.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/ConsumerName/ConsumerName.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/DocumentOntology/DocumentOntology.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/DocumentOntology/DocumentOntology.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/DocumentOntology/DocumentOntology.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/DocumentOntology/DocumentOntology.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/Group.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/Group.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/Group.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/Group.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/GroupLoincTerms.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/GroupLoincTerms.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/GroupLoincTerms.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/GroupLoincTerms.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/ParentGroup.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/ParentGroup.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/ParentGroup.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/GroupFile/ParentGroup.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Primary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/Part.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/Part.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/Part.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/Part.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/LoincTable/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/LoincTable/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/LoincTable/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/LoincTable/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/loinc.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/loinc.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v267/loinc.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v267/loinc.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/ConsumerName/ConsumerName.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/ConsumerName/ConsumerName.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/ConsumerName/ConsumerName.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/ConsumerName/ConsumerName.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/DocumentOntology/DocumentOntology.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/DocumentOntology/DocumentOntology.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/DocumentOntology/DocumentOntology.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/DocumentOntology/DocumentOntology.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/Group.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/Group.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/Group.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/Group.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/GroupLoincTerms.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/GroupLoincTerms.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/GroupLoincTerms.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/GroupLoincTerms.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/ParentGroup.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/ParentGroup.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/ParentGroup.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/GroupFile/ParentGroup.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Primary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/Part.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/Part.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/Part.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/Part.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/LoincTable/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/LoincTable/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/LoincTable/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/LoincTable/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/loinc.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/loinc.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v268/loinc.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v268/loinc.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/ConsumerName/ConsumerName.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/ConsumerName/ConsumerName.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/ConsumerName/ConsumerName.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/ConsumerName/ConsumerName.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/DocumentOntology/DocumentOntology.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/DocumentOntology/DocumentOntology.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/DocumentOntology/DocumentOntology.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/DocumentOntology/DocumentOntology.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/Group.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/Group.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/Group.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/Group.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/GroupLoincTerms.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/GroupLoincTerms.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/GroupLoincTerms.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/GroupLoincTerms.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/ParentGroup.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/ParentGroup.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/ParentGroup.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/GroupFile/ParentGroup.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Primary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/Part.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/Part.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/Part.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/Part.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/LoincTable/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/LoincTable/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/LoincTable/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/LoincTable/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/loinc.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/loinc.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc-ver/v269/loinc.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc-ver/v269/loinc.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/AnswerFile/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/AnswerFile/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/AnswerFile/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/AnswerFile/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/AnswerFile/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/ConsumerName/ConsumerName.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/ConsumerName/ConsumerName.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/ConsumerName/ConsumerName.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/ConsumerName/ConsumerName.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/DocumentOntology/DocumentOntology.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/DocumentOntology/DocumentOntology.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/DocumentOntology/DocumentOntology.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/DocumentOntology/DocumentOntology.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/GroupFile/Group.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/GroupFile/Group.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/GroupFile/Group.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/GroupFile/Group.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/GroupFile/GroupLoincTerms.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/GroupFile/GroupLoincTerms.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/GroupFile/GroupLoincTerms.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/GroupFile/GroupLoincTerms.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/GroupFile/ParentGroup.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/GroupFile/ParentGroup.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/GroupFile/ParentGroup.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/GroupFile/ParentGroup.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/ImagingDocuments/ImagingDocumentCodes.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/LinguisticVariants.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/deAT24LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/frCA8LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LinguisticVariants/zhCN5LinguisticVariant.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LoincIeeeMedicalDeviceCodeMappingTable/LoincIeeeMedicalDeviceCodeMappingTable.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LoincRsnaRadiologyPlaybook/LoincRsnaRadiologyPlaybook.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/LoincUniversalLabOrdersValueSet/LoincUniversalLabOrdersValueSet.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/MultiAxialHierarchy/MultiAxialHierarchy.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/AnswerList.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/AnswerList.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/AnswerList.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/AnswerList.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PanelsAndForms/LoincAnswerListLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Primary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Primary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/LoincPartLink_Supplementary.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/Part.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/Part.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/Part.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/Part.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/PartFile/PartRelatedCodeMapping.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/Top2000Results/SI/Top2000CommonLabResultsSi.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/AccessoryFiles/Top2000Results/US/Top2000CommonLabResultsUs.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/LoincTable/Loinc.csv b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/LoincTable/Loinc.csv
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/LoincTable/Loinc.csv
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/LoincTable/Loinc.csv
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/loinc.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/loinc.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/loinc.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/loinc.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/loincupload.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/loincupload.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/loincupload.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/loincupload.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/loincupload_singlepartlink.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/loincupload_singlepartlink.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/loincupload_singlepartlink.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/loincupload_singlepartlink.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/v267_loincupload.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/v267_loincupload.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/v267_loincupload.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/v267_loincupload.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/v268_curr_false_loincupload.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/v268_curr_false_loincupload.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/v268_curr_false_loincupload.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/v268_curr_false_loincupload.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/loinc/v268_loincupload.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/v268_loincupload.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/loinc/v268_loincupload.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/loinc/v268_loincupload.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/mihin-resource-dstu3.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/mihin-resource-dstu3.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/mihin-resource-dstu3.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/mihin-resource-dstu3.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/npe-causing-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/npe-causing-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/npe-causing-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/npe-causing-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/oruBundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/oruBundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/oruBundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/oruBundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/UK.Core.r4-1.1.0.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/UK.Core.r4-1.1.0.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/UK.Core.r4-1.1.0.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/UK.Core.r4-1.1.0.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/basisprofil.de.tar.gz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/basisprofil.de.tar.gz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/basisprofil.de.tar.gz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/basisprofil.de.tar.gz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/de.basisprofil.r4-1.2.0.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/de.basisprofil.r4-1.2.0.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/de.basisprofil.r4-1.2.0.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/de.basisprofil.r4-1.2.0.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/erroneous-ig.tar.gz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/erroneous-ig.tar.gz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/erroneous-ig.tar.gz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/erroneous-ig.tar.gz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.0.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.0.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.0.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.0.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.1.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.1.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.1.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.11.1.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.12.0.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.12.0.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.12.0.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.12.0.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.13.0.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.13.0.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/hl7.fhir.uv.shorthand-0.13.0.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/hl7.fhir.uv.shorthand-0.13.0.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.10.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.10.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.10.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.10.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.9.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.9.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.9.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017-1.3.9.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/nictiz.fhir.nl.stu3.zib2017.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/package-davinci-cdex-0.2.0.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/package-davinci-cdex-0.2.0.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/package-davinci-cdex-0.2.0.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/package-davinci-cdex-0.2.0.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-auto-create-placeholder.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-auto-create-placeholder.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/test-auto-create-placeholder.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-auto-create-placeholder.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-draft-sample.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-draft-sample.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/test-draft-sample.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-draft-sample.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-exchange-sample-2.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-exchange-sample-2.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/test-exchange-sample-2.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-exchange-sample-2.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-exchange-sample.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-exchange-sample.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/test-exchange-sample.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-exchange-sample.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-logical-structuredefinition.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-logical-structuredefinition.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/test-logical-structuredefinition.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-logical-structuredefinition.tgz
diff --git a/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-missing-identifier-package.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-missing-identifier-package.tgz
new file mode 100644
index 00000000000..17f39064fd9
Binary files /dev/null and b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-missing-identifier-package.tgz differ
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-organizations-package.tgz b/hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-organizations-package.tgz
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/packages/test-organizations-package.tgz
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/packages/test-organizations-package.tgz
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/questionnaire_dstu3.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/questionnaire_dstu3.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/questionnaire_dstu3.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/questionnaire_dstu3.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/CodeSystem-iar-chymh-cb-calculated-cap-10.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/CodeSystem-iar-chymh-cb-calculated-cap-10.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/CodeSystem-iar-chymh-cb-calculated-cap-10.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/CodeSystem-iar-chymh-cb-calculated-cap-10.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/ConceptMap-icd-sct.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/ConceptMap-icd-sct.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/ConceptMap-icd-sct.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/ConceptMap-icd-sct.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/StructureDefinition-kfdrc-patient-no-phi.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/StructureDefinition-kfdrc-patient-no-phi.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/StructureDefinition-kfdrc-patient-no-phi.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/StructureDefinition-kfdrc-patient-no-phi.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/StructureDefinition-kfdrc-patient.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/StructureDefinition-kfdrc-patient.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/StructureDefinition-kfdrc-patient.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/StructureDefinition-kfdrc-patient.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/ValueSet-iar-chymh-cb-calculated-cap-10.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/ValueSet-iar-chymh-cb-calculated-cap-10.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/ValueSet-iar-chymh-cb-calculated-cap-10.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/ValueSet-iar-chymh-cb-calculated-cap-10.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/adi-cs.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-cs.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/adi-cs.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-cs.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/adi-ptbundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-ptbundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/adi-ptbundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-ptbundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/adi-vs.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-vs.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/adi-vs.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-vs.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/adi-vs2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-vs2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/adi-vs2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/adi-vs2.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/batch-error.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/batch-error.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/batch-error.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/batch-error.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-code-in-valueset.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-code-in-valueset.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-code-in-valueset.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-code-in-valueset.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-code-not-in-valueset.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-code-not-in-valueset.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-code-not-in-valueset.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-code-not-in-valueset.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-value-is-not-quantity.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-value-is-not-quantity.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-value-is-not-quantity.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-value-is-not-quantity.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-value-is-not-quantity2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-value-is-not-quantity2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-obs-value-is-not-quantity2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-obs-value-is-not-quantity2.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-sd.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-sd.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-sd.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-sd.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-vs.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-vs.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bl/bb-vs.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bl/bb-vs.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bug-410-bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug-410-bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bug-410-bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug-410-bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bug147-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug147-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bug147-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug147-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bug801.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug801.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bug801.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug801.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bug832-korean-text.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug832-korean-text.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bug832-korean-text.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bug832-korean-text.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/code-in-unknown-system-with-required-binding.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/code-in-unknown-system-with-required-binding.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/code-in-unknown-system-with-required-binding.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/code-in-unknown-system-with-required-binding.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/codesystem_complete.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/codesystem_complete.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/codesystem_complete.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/codesystem_complete.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/collection-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/collection-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/collection-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/collection-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/conceptmap.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/conceptmap.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/conceptmap.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/conceptmap.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/createdeletebundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/createdeletebundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/createdeletebundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/createdeletebundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/custom_resource_patient.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/custom_resource_patient.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/custom_resource_patient.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/custom_resource_patient.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/document-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/document-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/document-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/document-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/document-father.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/document-father.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/document-father.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/document-father.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/documentmanifest.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/documentmanifest.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/documentmanifest.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/documentmanifest.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/documentreference.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/documentreference.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/documentreference.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/documentreference.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/eob-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/eob-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/eob-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/eob-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/expand-multi-cs.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/expand-multi-cs.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/expand-multi-cs.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/expand-multi-cs.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/expand-multi-vs-all.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/expand-multi-vs-all.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/expand-multi-vs-all.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/expand-multi-vs-all.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/extensional-case-r4.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/extensional-case-r4.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/extensional-case-r4.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/extensional-case-r4.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/extensional-case.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/extensional-case.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/extensional-case.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/extensional-case.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/fragment/codesystem.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/fragment/codesystem.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/fragment/codesystem.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/fragment/codesystem.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/fragment/structuredefinition.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/fragment/structuredefinition.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/fragment/structuredefinition.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/fragment/structuredefinition.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/fragment/valueset.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/fragment/valueset.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/fragment/valueset.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/fragment/valueset.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/iar/CodeSystem-iar-citizenship-status.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/iar/CodeSystem-iar-citizenship-status.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/iar/CodeSystem-iar-citizenship-status.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/iar/CodeSystem-iar-citizenship-status.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/iar/ValueSet-iar-citizenship-status.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/iar/ValueSet-iar-citizenship-status.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/iar/ValueSet-iar-citizenship-status.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/iar/ValueSet-iar-citizenship-status.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/identical-tags-batch.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/identical-tags-batch.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/identical-tags-batch.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/identical-tags-batch.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/imagingstudy.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/imagingstudy.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/imagingstudy.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/imagingstudy.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/impact-sp.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/impact-sp.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/impact-sp.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/impact-sp.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/large-transaction.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/large-transaction.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/large-transaction.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/large-transaction.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/load_bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/load_bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/load_bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/load_bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/oruBundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/oruBundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/oruBundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/oruBundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/post1.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/post1.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/post1.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/post1.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/post2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/post2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/post2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/post2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/preexisting-patient.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/preexisting-patient.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/preexisting-patient.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/preexisting-patient.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/profile-differential-patient-r4.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/profile-differential-patient-r4.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/profile-differential-patient-r4.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/profile-differential-patient-r4.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/profile-vitalsigns-all-loinc.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/profile-vitalsigns-all-loinc.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/profile-vitalsigns-all-loinc.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/profile-vitalsigns-all-loinc.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/r4-create-structuredefinition-vital-signs.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/r4-create-structuredefinition-vital-signs.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/r4-create-structuredefinition-vital-signs.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/r4-create-structuredefinition-vital-signs.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/r4_transaction2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/r4_transaction2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/r4_transaction2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/r4_transaction2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/sd-david-dhtest7.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/sd-david-dhtest7.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/sd-david-dhtest7.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/sd-david-dhtest7.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/tls_communication_bug_communication.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/tls_communication_bug_communication.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/tls_communication_bug_communication.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/tls_communication_bug_communication.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-no-contained-2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-no-contained-2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-no-contained-2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-no-contained-2.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-no-contained.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-no-contained.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-no-contained.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-no-contained.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-perf-bundle-smallchanges.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-perf-bundle-smallchanges.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-perf-bundle-smallchanges.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-perf-bundle-smallchanges.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-perf-bundle.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-perf-bundle.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/transaction-perf-bundle.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/transaction-perf-bundle.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/CodeSystem-cdcrec.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/CodeSystem-cdcrec.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/CodeSystem-cdcrec.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/CodeSystem-cdcrec.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/CodeSystem-dummy-loinc.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/CodeSystem-dummy-loinc.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/CodeSystem-dummy-loinc.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/CodeSystem-dummy-loinc.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-birthsex.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-birthsex.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-birthsex.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-birthsex.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-ethnicity.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-ethnicity.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-ethnicity.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-ethnicity.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-observation-lab.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-observation-lab.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-observation-lab.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-observation-lab.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-patient.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-patient.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-patient.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-patient.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-pulse-oximetry.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-pulse-oximetry.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-pulse-oximetry.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-pulse-oximetry.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-race.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-race.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/StructureDefinition-us-core-race.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/StructureDefinition-us-core-race.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-birthsex.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-birthsex.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-birthsex.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-birthsex.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-detailed-ethnicity.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-detailed-ethnicity.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-detailed-ethnicity.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-detailed-ethnicity.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-detailed-race.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-detailed-race.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-detailed-race.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-detailed-race.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-omb-ethnicity-category.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-omb-ethnicity-category.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-omb-ethnicity-category.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-omb-ethnicity-category.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-omb-race-category.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-omb-race-category.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-omb-race-category.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-omb-race-category.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-us-core-usps-state.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-us-core-usps-state.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/ValueSet-us-core-usps-state.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/ValueSet-us-core-usps-state.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/observation-pulseox.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/observation-pulseox.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/observation-pulseox.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/observation-pulseox.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/observation-resource-good.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/observation-resource-good.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/observation-resource-good.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/observation-resource-good.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/patient-resource-badcode.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/patient-resource-badcode.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/patient-resource-badcode.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/patient-resource-badcode.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/patient-resource-good.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/patient-resource-good.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/r4/uscore/patient-resource-good.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/r4/uscore/patient-resource-good.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sample-document.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sample-document.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sample-document.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sample-document.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Concept_Full-en_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Concept_Full-en_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Concept_Full-en_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Concept_Full-en_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Concept_Full_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Concept_Full_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Concept_Full_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Concept_Full_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Description_Full-en_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Description_Full-en_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Description_Full-en_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Description_Full-en_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Identifier_Full_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Identifier_Full_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Identifier_Full_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Identifier_Full_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Relationship_Full_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Relationship_Full_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_Relationship_Full_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_Relationship_Full_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_StatedRelationship_Full_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_StatedRelationship_Full_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_StatedRelationship_Full_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_StatedRelationship_Full_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_TextDefinition_Full-en_INT_20160131.txt b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_TextDefinition_Full-en_INT_20160131.txt
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sct/sct2_TextDefinition_Full-en_INT_20160131.txt
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sct/sct2_TextDefinition_Full-en_INT_20160131.txt
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/sd-david-dhtest7.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/sd-david-dhtest7.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/sd-david-dhtest7.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/sd-david-dhtest7.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/simone-conditional-url.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/simone-conditional-url.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/simone-conditional-url.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/simone-conditional-url.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/simone_bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/simone_bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/simone_bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/simone_bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/simone_bundle2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/simone_bundle2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/simone_bundle2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/simone_bundle2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/simone_bundle3.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/simone_bundle3.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/simone_bundle3.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/simone_bundle3.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/spring.properties b/hapi-fhir-jpaserver-test-utilities/src/test/resources/spring.properties
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/spring.properties
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/spring.properties
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/subscription/spring-context-loader.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/subscription/spring-context-loader.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/subscription/spring-context-loader.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/subscription/spring-context-loader.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/subscription/web.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/subscription/web.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/subscription/web.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/subscription/web.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/term-delta-json.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/term-delta-json.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/term-delta-json.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/term-delta-json.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/testbundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/testbundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/testbundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/testbundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/transaction-bundle.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundle.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/transaction-bundle.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundle.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/transaction-bundle2.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundle2.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/transaction-bundle2.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundle2.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/transaction-bundles/transaction-with-full-request-url.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundles/transaction-with-full-request-url.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/transaction-bundles/transaction-with-full-request-url.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundles/transaction-with-full-request-url.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/transaction-bundles/transaction-with-preceding-slash-request-url.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundles/transaction-with-preceding-slash-request-url.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/transaction-bundles/transaction-with-preceding-slash-request-url.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction-bundles/transaction-with-preceding-slash-request-url.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/transaction_link_patient_eve.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction_link_patient_eve.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/transaction_link_patient_eve.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction_link_patient_eve.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/transaction_link_patient_eve_temp.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction_link_patient_eve_temp.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/transaction_link_patient_eve_temp.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/transaction_link_patient_eve_temp.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/two_questionnaires.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/two_questionnaires.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/two_questionnaires.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/two_questionnaires.json
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/update.xml b/hapi-fhir-jpaserver-test-utilities/src/test/resources/update.xml
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/update.xml
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/update.xml
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/valueset-dstu2.json b/hapi-fhir-jpaserver-test-utilities/src/test/resources/valueset-dstu2.json
similarity index 100%
rename from hapi-fhir-jpaserver-base/src/test/resources/valueset-dstu2.json
rename to hapi-fhir-jpaserver-test-utilities/src/test/resources/valueset-dstu2.json
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java
index 0af922abb5c..e5216e7ce1c 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/ApacheProxyAddressStrategy.java
@@ -155,4 +155,4 @@ public class ApacheProxyAddressStrategy extends IncomingRequestAddressStrategy {
public static ApacheProxyAddressStrategy forHttps() {
return new ApacheProxyAddressStrategy(true);
}
-}
\ No newline at end of file
+}
diff --git a/hapi-fhir-storage-test-utilities/pom.xml b/hapi-fhir-storage-test-utilities/pom.xml
new file mode 100644
index 00000000000..5b8238bc2b3
--- /dev/null
+++ b/hapi-fhir-storage-test-utilities/pom.xml
@@ -0,0 +1,40 @@
+
+
+
+ ca.uhn.hapi.fhir
+ hapi-deployable-pom
+ 6.0.0-PRE10-SNAPSHOT
+ ../hapi-deployable-pom/pom.xml
+
+ 4.0.0
+
+ hapi-fhir-storage-test-utilities
+
+
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-storage
+ ${project.version}
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-test-utilities
+ ${project.version}
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ compile
+
+
+ org.junit.jupiter
+ junit-jupiter-params
+ compile
+
+
+
+
diff --git a/hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/BaseDateSearchDaoTests.java b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java
similarity index 88%
rename from hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/BaseDateSearchDaoTests.java
rename to hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java
index 5ffb387253a..49b10c328bc 100644
--- a/hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/BaseDateSearchDaoTests.java
+++ b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseDateSearchDaoTests.java
@@ -1,4 +1,24 @@
-package ca.uhn.fhir.jpa.dao;
+package ca.uhn.fhir.storage.test;
+
+/*-
+ * #%L
+ * hapi-fhir-storage-test-utilities
+ * %%
+ * Copyright (C) 2014 - 2022 Smile CDR, Inc.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.conformance.DateSearchTestCase;
diff --git a/hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessorTest.java b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseTransactionProcessorTest.java
similarity index 82%
rename from hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessorTest.java
rename to hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseTransactionProcessorTest.java
index 675507ac2d6..e97fd476801 100644
--- a/hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessorTest.java
+++ b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/BaseTransactionProcessorTest.java
@@ -1,5 +1,27 @@
-package ca.uhn.fhir.jpa.dao;
+package ca.uhn.fhir.storage.test;
+/*-
+ * #%L
+ * hapi-fhir-storage-test-utilities
+ * %%
+ * Copyright (C) 2014 - 2022 Smile CDR, Inc.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.jpa.dao.BaseTransactionProcessor;
+import ca.uhn.fhir.jpa.dao.IdSubstitutionMap;
import ca.uhn.fhir.util.UrlUtil;
import org.hl7.fhir.r4.model.IdType;
import org.junit.jupiter.api.Test;
diff --git a/hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/DaoTestDataBuilder.java b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java
similarity index 79%
rename from hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/DaoTestDataBuilder.java
rename to hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java
index 59e4e52f2f8..f1e55b3f7a9 100644
--- a/hapi-fhir-storage/src/test/java/ca/uhn/fhir/jpa/dao/DaoTestDataBuilder.java
+++ b/hapi-fhir-storage-test-utilities/src/main/java/ca/uhn/fhir/storage/test/DaoTestDataBuilder.java
@@ -1,4 +1,24 @@
-package ca.uhn.fhir.jpa.dao;
+package ca.uhn.fhir.storage.test;
+
+/*-
+ * #%L
+ * hapi-fhir-storage-test-utilities
+ * %%
+ * Copyright (C) 2014 - 2022 Smile CDR, Inc.
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml
index cedcaa104c0..4f5cf3b479f 100644
--- a/hapi-fhir-storage/pom.xml
+++ b/hapi-fhir-storage/pom.xml
@@ -158,18 +158,6 @@
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.2.0
-
-
-
- test-jar
-
-
-
-
org.jacoco
jacoco-maven-plugin
diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java
index 21f52c0b426..5cbb0915624 100644
--- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java
+++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/svc/NullBinaryStorageSvcImpl.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.binary.svc;
/*-
* #%L
- * HAPI FHIR JPA Server
+ * HAPI FHIR Storage api
* %%
* Copyright (C) 2014 - 2022 Smile CDR, Inc.
* %%
diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java
index 54fde3adb1e..c2bc2409030 100644
--- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java
+++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java
@@ -1882,7 +1882,7 @@ public abstract class BaseTransactionProcessor {
* @param theMatchUrl
* @return
*/
- static String performIdSubstitutionsInMatchUrl(IdSubstitutionMap theIdSubstitutions, String theMatchUrl) {
+ public static String performIdSubstitutionsInMatchUrl(IdSubstitutionMap theIdSubstitutions, String theMatchUrl) {
String matchUrl = theMatchUrl;
if (isNotBlank(matchUrl) && !theIdSubstitutions.isEmpty()) {
diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/ClientConnectionReuseTest.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/ClientConnectionReuseTest.java
new file mode 100644
index 00000000000..7dbdcb83973
--- /dev/null
+++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/ClientConnectionReuseTest.java
@@ -0,0 +1,109 @@
+package ca.uhn.fhir.rest.client;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.client.apache.GZipContentInterceptor;
+import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ca.uhn.fhir.rest.client.interceptor.AdditionalRequestHeadersInterceptor;
+import ca.uhn.fhir.test.utilities.server.HashMapResourceProviderExtension;
+import ca.uhn.fhir.test.utilities.server.RestfulServerExtension;
+import ca.uhn.fhir.util.StopWatch;
+import com.google.common.collect.Lists;
+import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled
+public class ClientConnectionReuseTest {
+
+ private static final Logger ourLog = LoggerFactory.getLogger(ClientConnectionReuseTest.class);
+ @RegisterExtension
+ @Order(0)
+ private static RestfulServerExtension ourServer = new RestfulServerExtension(FhirContext.forR4Cached());
+ @RegisterExtension
+ @Order(1)
+ private static HashMapResourceProviderExtension ourPatientProvider = new HashMapResourceProviderExtension<>(ourServer, Patient.class);
+
+ @ParameterizedTest()
+ @MethodSource("clients")
+ public void testRead(IGenericClient theClient) {
+ Patient patient = new Patient();
+ patient.setId("Patient/P");
+ ourPatientProvider.store(patient);
+
+ StopWatch sw = new StopWatch();
+ int reps = 100;
+ for (int i = 0; i < reps; i++) {
+ ourServer
+ .getFhirClient()
+ .read()
+ .resource(Patient.class)
+ .withId("Patient/P")
+ .execute();
+ }
+ ourLog.info("Invoked {} counts in {}", reps, sw);
+
+ assertEquals(1, ourServer.getConnectionsOpenedCount());
+ }
+
+ @ParameterizedTest()
+ @MethodSource("clients")
+ public void testSearch(IGenericClient theClient) {
+ StopWatch sw = new StopWatch();
+ int reps = 100;
+ for (int i = 0; i < reps; i++) {
+ ourServer
+ .getFhirClient()
+ .search()
+ .forResource(Patient.class)
+ .returnBundle(Bundle.class)
+ .execute();
+ }
+ ourLog.info("Invoked {} counts in {}", reps, sw);
+
+ assertEquals(1, ourServer.getConnectionsOpenedCount());
+ }
+
+ @ParameterizedTest()
+ @MethodSource("clients")
+ public void testCreate(IGenericClient theClient) {
+ StopWatch sw = new StopWatch();
+ int reps = 100;
+ for (int i = 0; i < reps; i++) {
+ ourServer
+ .getFhirClient()
+ .create()
+ .resource(new Patient().setActive(true))
+ .execute();
+ }
+ ourLog.info("Invoked {} counts in {}", reps, sw);
+
+ assertEquals(1, ourServer.getConnectionsOpenedCount());
+ }
+
+
+ public static List clients() {
+ FhirContext ctx = FhirContext.forR4Cached();
+
+ IGenericClient client = ctx.newRestfulGenericClient(ourServer.getBaseUrl());
+
+ IGenericClient gzipClient = ctx.newRestfulGenericClient(ourServer.getBaseUrl());
+ gzipClient.registerInterceptor(new GZipContentInterceptor());
+ AdditionalRequestHeadersInterceptor additionalRequestHeadersInterceptor = new AdditionalRequestHeadersInterceptor();
+ additionalRequestHeadersInterceptor.addHeaderValue(Constants.HEADER_ACCEPT_ENCODING, Constants.ENCODING_GZIP);
+ gzipClient.registerInterceptor(additionalRequestHeadersInterceptor);
+
+ return Lists.newArrayList(client, gzipClient);
+ }
+
+}
diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java
index d32718fa4f3..cc04bd04ebc 100644
--- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java
+++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/BaseJettyServerExtension.java
@@ -26,7 +26,12 @@ import org.apache.commons.lang3.Validate;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.eclipse.jetty.io.Connection;
+import org.eclipse.jetty.io.Connection.Listener;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -52,21 +57,22 @@ import java.util.EnumSet;
import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
public abstract class BaseJettyServerExtension> implements BeforeEachCallback, AfterEachCallback, AfterAllCallback {
private static final Logger ourLog = LoggerFactory.getLogger(BaseJettyServerExtension.class);
-
+ private final List> myRequestHeaders = new ArrayList<>();
+ private final List myRequestContentTypes = new ArrayList<>();
private String myServletPath = "/*";
private Server myServer;
private CloseableHttpClient myHttpClient;
private int myPort = 0;
private boolean myKeepAliveBetweenTests;
private String myContextPath = "";
- private final List> myRequestHeaders = new ArrayList<>();
- private final List myRequestContentTypes = new ArrayList<>();
+ private AtomicLong myConnectionsOpenedCounter;
@SuppressWarnings("unchecked")
public T withContextPath(String theContextPath) {
@@ -74,6 +80,19 @@ public abstract class BaseJettyServerExtension
-
-
org.junit.jupiter
junit-jupiter
@@ -832,7 +829,7 @@
1.2.2.RELEASE
3.1.4
- 1.16.2
+ 1.16.3
3.0.14.RELEASE
4.4.1
@@ -935,13 +932,13 @@
com.icegreen
greenmail
1.6.4
- test
+ compile
com.icegreen
greenmail-junit5
1.6.4
- test
+ compile
@@ -2803,6 +2800,7 @@
hapi-fhir-storage
hapi-fhir-storage-batch2
hapi-fhir-storage-batch2-jobs
+ hapi-fhir-storage-test-utilities
hapi-fhir-jpaserver-cql
hapi-fhir-jpaserver-model
hapi-fhir-jpaserver-searchparam
@@ -2976,6 +2974,20 @@
+
+ LGTM
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+ true
+
+
+
+
+