diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 047a62348cc..9071a9e77fc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,78 +1,78 @@ # HAPI FHIR Build Pipeline variables: - MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository - #MAVEN_CACHE_FOLDER: $(Agent.TempDirectory)/.m2/repository - #MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' - MAVEN_OPTS: '' + MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository + #MAVEN_CACHE_FOLDER: $(Agent.TempDirectory)/.m2/repository + #MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' + MAVEN_OPTS: '' trigger: -- master + - master pool: - vmImage: 'ubuntu-latest' + vmImage: 'ubuntu-latest' jobs: - - job: Build - timeoutInMinutes: 360 - container: maven:3.8-openjdk-17 - steps: - - task: Maven@3 - env: - JAVA_HOME_11_X64: /usr/java/openjdk-17 - displayName: Checkstyle Build - inputs: - mavenPomFile: 'hapi-fhir-checkstyle/pom.xml' - goals: 'clean install' - options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' - jdkVersionOption: 1.11 - - task: DockerInstaller@0 - displayName: Docker Installer - inputs: - dockerVersion: 17.09.0-ce - releaseType: stable - - task: Cache@2 - inputs: - key: 'maven | "$(Agent.OS)" | ./pom.xml' - path: $(MAVEN_CACHE_FOLDER) - - task: Bash@3 - inputs: - targetType: 'inline' - script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER) - - task: Maven@3 - env: - JAVA_HOME_11_X64: /usr/java/openjdk-17 - inputs: - goals: 'clean install' - # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy - options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true' - # These are JVM options (and don't show up in the build logs) - mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto' - jdkVersionOption: 1.11 - - task: CopyFiles@2 - condition: always() - inputs: - sourceFolder: '$(System.DefaultWorkingDirectory)/' - contents: '**/target/*-reports/*.txt' - targetFolder: '$(Build.ArtifactStagingDirectory)' - - task: PublishPipelineArtifact@1 - displayName: 'Publish Full Test Output' - condition: always() - inputs: - targetPath: '$(Build.ArtifactStagingDirectory)/' - artifactName: 'full_logs.zip' - - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) - displayName: 'codecov' - - task: PublishTestResults@2 - inputs: - testResultsFormat: 'JUnit' - testResultsFiles: '**/TEST-*.xml' - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: 'JaCoCo' - summaryFileLocation: $(System.DefaultWorkingDirectory)/hapi-fhir-jacoco/target/site/jacoco-report/jacoco.xml - reportDirectory: $(System.DefaultWorkingDirectory)/hapi-fhir-jacoco/target/site/jacoco-report/ - failIfCoverageEmpty: false + - job: Build + timeoutInMinutes: 360 + container: maven:3.8-openjdk-17 + steps: + - task: Cache@2 + inputs: + key: 'maven | "$(Agent.OS)" | ./pom.xml' + path: $(MAVEN_CACHE_FOLDER) + - task: Maven@3 + env: + JAVA_HOME_11_X64: /usr/java/openjdk-17 + displayName: Checkstyle Build + inputs: + mavenPomFile: 'hapi-fhir-checkstyle/pom.xml' + goals: 'clean install' + options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' + jdkVersionOption: 1.11 + - task: DockerInstaller@0 + displayName: Docker Installer + inputs: + dockerVersion: 17.09.0-ce + releaseType: stable + - task: Bash@3 + inputs: + targetType: 'inline' + script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER) + - task: Maven@3 + env: + JAVA_HOME_11_X64: /usr/java/openjdk-17 + inputs: + goals: 'clean install' + # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy + options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true' + # These are JVM options (and don't show up in the build logs) + mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto' + jdkVersionOption: 1.11 + - task: CopyFiles@2 + condition: always() + inputs: + sourceFolder: '$(System.DefaultWorkingDirectory)/' + contents: '**/target/*-reports/*.txt' + targetFolder: '$(Build.ArtifactStagingDirectory)' + - task: PublishPipelineArtifact@1 + displayName: 'Publish Full Test Output' + condition: always() + inputs: + targetPath: '$(Build.ArtifactStagingDirectory)/' + artifactName: 'full_logs.zip' + - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) + displayName: 'codecov' + - task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: '**/TEST-*.xml' + - task: PublishCodeCoverageResults@1 + inputs: + codeCoverageTool: 'JaCoCo' + summaryFileLocation: $(System.DefaultWorkingDirectory)/hapi-fhir-jacoco/target/site/jacoco-report/jacoco.xml + reportDirectory: $(System.DefaultWorkingDirectory)/hapi-fhir-jacoco/target/site/jacoco-report/ + failIfCoverageEmpty: false # Potential Additional Maven3 Options: #publishJUnitResults: true diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index b13bae1377d..435cd28f21b 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -91,6 +91,11 @@ hapi-fhir-jpaserver-base ${project.version} + + ca.uhn.hapi.fhir + hapi-fhir-jpaserver-test-utilities + ${project.version} + ca.uhn.hapi.fhir hapi-fhir-client-okhttp diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 7e1d64298a8..2a85b3162cb 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -154,15 +154,6 @@ - - ca.uhn.hapi.fhir - hapi-fhir-storage - ${project.version} - tests - test-jar - test - - ch.qos.logback logback-classic @@ -205,17 +196,6 @@ springdoc-openapi-ui - - com.helger - ph-schematron - test - - - com.helger - ph-commons - test - - org.thymeleaf thymeleaf @@ -267,37 +247,6 @@ javax.annotation-api - - - - org.apache.derby - derby - test - - - org.apache.derby - derbytools - test - - - com.h2database - h2 - test - - - ca.uhn.hapi.fhir - hapi-fhir-test-utilities - ${project.version} - test - - - javax.servlet javax.servlet-api @@ -397,92 +346,6 @@ guava - - org.eclipse.jetty - jetty-servlets - test - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-util - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty.websocket - websocket-api - test - - - org.eclipse.jetty.websocket - websocket-client - test - - - org.eclipse.jetty.websocket - websocket-server - test - - - org.springframework.boot - spring-boot-test - test - - - org.springframework - spring-test - test - - - com.icegreen - greenmail - test - - - com.icegreen - greenmail-junit5 - test - - - org.hamcrest - hamcrest - test - - - org.testcontainers - testcontainers - test - - - org.testcontainers - elasticsearch - test - - - org.testcontainers - junit-jupiter - test - - - org.hl7.fhir.testcases - fhir-test-cases - test - - ca.uhn.hapi.fhir hapi-fhir-server-openapi @@ -495,27 +358,10 @@ caffeine - - com.google.guava - guava-testlib - test - - - junit - junit - - - org.jetbrains annotations - - org.mortbay.jetty - servlet-api - 2.5-20081211 - test - org.apache.jena jena-arq @@ -543,52 +389,7 @@ - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - test-jar - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.2 - - true - 1 - false - alphabetical - - **/*IT.java - - - - - - integration-test - verify - - - - de.jpdigital hibernate54-ddl-maven-plugin @@ -650,16 +451,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - alphabetical - @{argLine} ${surefire_jvm_args} - 0.6C - *StressTest* - - ca.uhn.hapi.fhir hapi-tinder-plugin @@ -783,79 +574,4 @@ - - - - org.apache.maven.plugins - maven-jxr-plugin - - - - - - - NOPARALLEL - - - - org.apache.maven.plugins - maven-surefire-plugin - - 1 - - **/stresstest/* - - - - - - - - CI - - - - org.apache.maven.plugins - maven-surefire-plugin - - 1 - alphabetical - - - - - - - - REDUCED_JPA_TESTS - - - - org.apache.maven.plugins - maven-surefire-plugin - - 2 - true - alphabetical - true - - **/*Dstu2* - **/*Dstu3* - **/stresstest/* - - - - - - - - diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java index 97f4a1cdbad..4ee1e396f7b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java @@ -49,9 +49,7 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameter; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersInvalidException; -import org.springframework.batch.core.launch.JobExecutionNotRunningException; import org.springframework.batch.core.launch.JobOperator; -import org.springframework.batch.core.launch.NoSuchJobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.transaction.PlatformTransactionManager; @@ -112,10 +110,12 @@ public class TermDeferredStorageSvcImpl implements ITermDeferredStorageSvc { @Autowired private JobOperator myJobOperator; - @Autowired @Qualifier(TERM_CODE_SYSTEM_DELETE_JOB_NAME) + @Autowired + @Qualifier(TERM_CODE_SYSTEM_DELETE_JOB_NAME) private org.springframework.batch.core.Job myTermCodeSystemDeleteJob; - @Autowired @Qualifier(TERM_CODE_SYSTEM_VERSION_DELETE_JOB_NAME) + @Autowired + @Qualifier(TERM_CODE_SYSTEM_VERSION_DELETE_JOB_NAME) private org.springframework.batch.core.Job myTermCodeSystemVersionDeleteJob; @@ -262,13 +262,14 @@ public class TermDeferredStorageSvcImpl implements ITermDeferredStorageSvc { private void clearJobExecutions() { for (JobExecution jobExecution : myCurrentJobExecutions) { - if (! jobExecution.isRunning()) { continue; } + if (!jobExecution.isRunning()) { + continue; + } try { myJobOperator.stop(jobExecution.getId()); - - } catch (NoSuchJobExecutionException | JobExecutionNotRunningException theE) { - ourLog.error("Couldn't stop job execution {}: {}", jobExecution.getId(), theE); + } catch (Exception e) { + ourLog.error("Couldn't stop job execution {}: {}", jobExecution.getId(), e); } } @@ -367,7 +368,7 @@ public class TermDeferredStorageSvcImpl implements ITermDeferredStorageSvc { private void deleteTermCodeSystemVersionOffline(Long theCodeSystemVersionPid) { JobParameters jobParameters = new JobParameters( Collections.singletonMap( - JOB_PARAM_CODE_SYSTEM_VERSION_ID, new JobParameter(theCodeSystemVersionPid, true) )); + JOB_PARAM_CODE_SYSTEM_VERSION_ID, new JobParameter(theCodeSystemVersionPid, true))); try { @@ -384,7 +385,7 @@ public class TermDeferredStorageSvcImpl implements ITermDeferredStorageSvc { private void deleteTermCodeSystemOffline(Long theCodeSystemPid) { JobParameters jobParameters = new JobParameters( Collections.singletonMap( - JOB_PARAM_CODE_SYSTEM_ID, new JobParameter(theCodeSystemPid, true) )); + JOB_PARAM_CODE_SYSTEM_ID, new JobParameter(theCodeSystemPid, true))); try { @@ -411,7 +412,7 @@ public class TermDeferredStorageSvcImpl implements ITermDeferredStorageSvc { } private boolean isJobsExecuting() { - return myCurrentJobExecutions.stream().anyMatch(JobExecution::isRunning); + return myCurrentJobExecutions.stream().anyMatch(JobExecution::isRunning); } diff --git a/hapi-fhir-jpaserver-base/src/test/java/META-INF/MANIFEST.MF b/hapi-fhir-jpaserver-base/src/test/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e9495128c0..00000000000 --- a/hapi-fhir-jpaserver-base/src/test/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/hapi-fhir-jpaserver-base/src/test/java/where_are_the_tests.txt b/hapi-fhir-jpaserver-base/src/test/java/where_are_the_tests.txt new file mode 100644 index 00000000000..8f13a9c9354 --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/where_are_the_tests.txt @@ -0,0 +1,3 @@ +Tests for this module can be found in the path: + + hapi-fhir-jpaserver-test-utilities/src/test/java diff --git a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-missing-identifier-package.tgz b/hapi-fhir-jpaserver-base/src/test/resources/packages/test-missing-identifier-package.tgz deleted file mode 100644 index 46025afc0a2..00000000000 Binary files a/hapi-fhir-jpaserver-base/src/test/resources/packages/test-missing-identifier-package.tgz and /dev/null differ diff --git a/hapi-fhir-jpaserver-base/src/test/resources/where_are_the_tests.txt b/hapi-fhir-jpaserver-base/src/test/resources/where_are_the_tests.txt new file mode 100644 index 00000000000..8f13a9c9354 --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/resources/where_are_the_tests.txt @@ -0,0 +1,3 @@ +Tests for this module can be found in the path: + + hapi-fhir-jpaserver-test-utilities/src/test/java diff --git a/hapi-fhir-jpaserver-cql/pom.xml b/hapi-fhir-jpaserver-cql/pom.xml index 00a7850e6f1..55b69f1d85b 100644 --- a/hapi-fhir-jpaserver-cql/pom.xml +++ b/hapi-fhir-jpaserver-cql/pom.xml @@ -144,14 +144,6 @@ - - ca.uhn.hapi.fhir - hapi-fhir-jpaserver-base - ${project.version} - tests - test-jar - test - org.testcontainers junit-jupiter @@ -173,6 +165,12 @@ ${project.version} test + + ca.uhn.hapi.fhir + hapi-fhir-storage-test-utilities + ${project.version} + test + ca.uhn.hapi.fhir hapi-fhir-jpaserver-test-utilities diff --git a/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlDstu3Test.java b/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlDstu3Test.java index 084453c5c94..8e07c4d58bb 100644 --- a/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlDstu3Test.java +++ b/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlDstu3Test.java @@ -7,8 +7,8 @@ import ca.uhn.fhir.cql.config.CqlDstu3Config; import ca.uhn.fhir.cql.config.TestCqlConfig; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; -import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.test.utilities.RequestDetailsHelper; import org.apache.commons.io.FileUtils; @@ -38,10 +38,10 @@ public class BaseCqlDstu3Test extends BaseJpaDstu3Test implements CqlProviderTes protected DaoRegistry myDaoRegistry; @Autowired - IFhirSystemDao mySystemDao; - @Autowired @RegisterExtension protected PartitionHelper myPartitionHelper; + @Autowired + IFhirSystemDao mySystemDao; protected int loadDataFromDirectory(String theDirectoryName) throws IOException { int count = 0; @@ -84,14 +84,6 @@ public class BaseCqlDstu3Test extends BaseJpaDstu3Test implements CqlProviderTes return bundle; } - @Configuration - static class Config { - @Bean - public PartitionHelper myPartitionHelper() { - return new PartitionHelper(); - } - } - protected Bundle loadBundle(String theLocation) throws IOException { Bundle bundle = parseBundle(theLocation); return loadBundle(bundle); @@ -101,4 +93,12 @@ public class BaseCqlDstu3Test extends BaseJpaDstu3Test implements CqlProviderTes public FhirContext getTestFhirContext() { return myFhirContext; } + + @Configuration + static class Config { + @Bean + public PartitionHelper myPartitionHelper() { + return new PartitionHelper(); + } + } } diff --git a/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlR4Test.java b/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlR4Test.java index 11a4b371f94..21c61ccdc34 100644 --- a/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlR4Test.java +++ b/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/BaseCqlR4Test.java @@ -8,8 +8,8 @@ import ca.uhn.fhir.cql.config.TestCqlConfig; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.parser.LenientErrorHandler; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.test.utilities.RequestDetailsHelper; @@ -109,6 +109,11 @@ public class BaseCqlR4Test extends BaseJpaR4Test implements CqlProviderTestBase return (Bundle) mySystemDao.transaction(theRequestDetails, bundle); } + @Override + public FhirContext getTestFhirContext() { + return myFhirContext; + } + @Configuration static class Config { @Bean @@ -116,9 +121,4 @@ public class BaseCqlR4Test extends BaseJpaR4Test implements CqlProviderTestBase return new PartitionHelper(); } } - - @Override - public FhirContext getTestFhirContext() { - return myFhirContext; - } } diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml index e158b4c1c91..3ba02805b62 100644 --- a/hapi-fhir-jpaserver-mdm/pom.xml +++ b/hapi-fhir-jpaserver-mdm/pom.xml @@ -34,10 +34,8 @@ ca.uhn.hapi.fhir - hapi-fhir-jpaserver-base + hapi-fhir-jpaserver-test-utilities ${project.version} - tests - test-jar test diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java index fc0dddd805e..894359ca5a2 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java @@ -7,7 +7,6 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao; import ca.uhn.fhir.jpa.dao.index.IJpaIdHelperService; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.entity.MdmLink; import ca.uhn.fhir.jpa.mdm.config.MdmConsumerConfig; import ca.uhn.fhir.jpa.mdm.config.MdmSubmitterConfig; @@ -26,6 +25,7 @@ import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.searchparam.registry.SearchParamRegistryImpl; import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.mdm.api.IMdmSettings; import ca.uhn.fhir.mdm.api.MdmConstants; import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum; diff --git a/hapi-fhir-jpaserver-test-utilities/pom.xml b/hapi-fhir-jpaserver-test-utilities/pom.xml index 5b627067f66..46553669c4f 100644 --- a/hapi-fhir-jpaserver-test-utilities/pom.xml +++ b/hapi-fhir-jpaserver-test-utilities/pom.xml @@ -25,6 +25,30 @@ hapi-fhir-jpaserver-base ${project.version} + + ca.uhn.hapi.fhir + hapi-fhir-storage-test-utilities + ${project.version} + compile + + + ca.uhn.hapi.fhir + hapi-fhir-server-openapi + ${project.version} + compile + + + ca.uhn.hapi.fhir + hapi-fhir-storage + ${project.version} + compile + + + + org.hl7.fhir.testcases + fhir-test-cases + + ch.qos.logback logback-classic @@ -37,6 +61,46 @@ com.h2database h2 + + org.apache.derby + derby + + + org.eclipse.jetty + jetty-servlets + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-webapp + + + org.eclipse.jetty.websocket + websocket-api + + + org.eclipse.jetty.websocket + websocket-client + + + org.eclipse.jetty.websocket + websocket-server + + + org.springframework.boot + spring-boot-test + org.apache.commons commons-dbcp2 @@ -62,5 +126,181 @@ junit-jupiter-engine compile - + + org.hamcrest + hamcrest + + + org.testcontainers + elasticsearch + compile + + + org.testcontainers + testcontainers + compile + + + org.hamcrest + hamcrest-core + + + junit + junit + + + + + org.mockito + mockito-core + + + com.helger + ph-schematron + + + com.helger + ph-commons + + + org.testcontainers + junit-jupiter + + + com.jayway.jsonpath + json-path-assert + test + + + com.icegreen + greenmail + + + junit + junit + + + + + com.icegreen + greenmail-junit5 + + + + junit + junit + 4.13.2 + provided + + + org.hamcrest + hamcrest-core + + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + 1 + false + alphabetical + + **/*IT.java + + false + + + + + integration-test + verify + + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit_version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + alphabetical + @{argLine} ${surefire_jvm_args} + 0.6C + *StressTest* + ${skipFailsafe} + + + + org.jacoco + jacoco-maven-plugin + + true + + + + default-prepare-agent + + prepare-agent + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + true + + + + + + + + NOPARALLEL + + + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + + **/stresstest/* + + + + + + + + CI + + + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + alphabetical + + + + + + + diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java similarity index 93% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java index dc58a138897..d2e5802da87 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java @@ -1,4 +1,24 @@ -package ca.uhn.fhir.jpa.dao.dstu3; +package ca.uhn.fhir.jpa.test; + +/*- + * #%L + * HAPI FHIR JPA Server 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.context.support.IValidationSupport; @@ -14,9 +34,6 @@ import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc; import ca.uhn.fhir.jpa.batch.api.IBatchJobSubmitter; import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper; -import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportSvc; -import ca.uhn.fhir.jpa.config.TestDstu3Config; -import ca.uhn.fhir.jpa.dao.BaseJpaTest; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.dao.data.IResourceIndexedComboStringUniqueDao; import ca.uhn.fhir.jpa.dao.data.IResourceIndexedSearchParamStringDao; @@ -31,8 +48,6 @@ import ca.uhn.fhir.jpa.dao.data.ITermConceptDao; import ca.uhn.fhir.jpa.dao.data.ITermConceptMapDao; import ca.uhn.fhir.jpa.dao.data.ITermConceptMapGroupElementTargetDao; import ca.uhn.fhir.jpa.dao.data.ITermValueSetDao; -import ca.uhn.fhir.jpa.dao.dstu2.FhirResourceDaoDstu2SearchNoFtTest; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; @@ -45,16 +60,14 @@ import ca.uhn.fhir.jpa.term.TermDeferredStorageSvcImpl; import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvc; +import ca.uhn.fhir.jpa.test.config.TestDstu3Config; import ca.uhn.fhir.jpa.util.ResourceCountCache; -import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.parser.StrictErrorHandler; import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.util.UrlUtil; -import org.apache.commons.io.IOUtils; import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_30_40; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_30_40; import org.hl7.fhir.dstu3.model.AllergyIntolerance; @@ -105,7 +118,6 @@ import org.hl7.fhir.dstu3.model.Substance; import org.hl7.fhir.dstu3.model.Task; import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; @@ -121,13 +133,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; import javax.persistence.EntityManager; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; import java.util.Map; -import static org.junit.jupiter.api.Assertions.fail; - @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestDstu3Config.class}) public abstract class BaseJpaDstu3Test extends BaseJpaTest { @@ -343,10 +350,10 @@ public abstract class BaseJpaDstu3Test extends BaseJpaTest { @Autowired protected ITermCodeSystemStorageSvc myTermCodeSystemStorageSvc; @Autowired - private IValidationSupport myJpaValidationSupportChainDstu3; - @Autowired protected ITermValueSetDao myTermValueSetDao; @Autowired + private IValidationSupport myJpaValidationSupportChainDstu3; + @Autowired private IBulkDataExportJobSchedulingHelper myBulkDataScheduleHelper; @AfterEach() @@ -407,16 +414,6 @@ public abstract class BaseJpaDstu3Test extends BaseJpaTest { return myTxManager; } - protected 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(myFhirContext); - return newJsonParser.parseResource(type, string); - } - @Override public TransactionTemplate newTxTemplate() { TransactionTemplate retVal = new TransactionTemplate(myTxManager); @@ -432,7 +429,7 @@ public abstract class BaseJpaDstu3Test extends BaseJpaTest { } /** - * Creates a single {@link org.hl7.fhir.dstu3.model.ConceptMap} entity that includes: + * Creates a single {@link ConceptMap} entity that includes: *
*
    *
  • @@ -452,7 +449,7 @@ public abstract class BaseJpaDstu3Test extends BaseJpaTest { * The first two groups also include an element with the same source code. *
    * - * @return A {@link org.hl7.fhir.dstu3.model.ConceptMap} entity for testing. + * @return A {@link ConceptMap} entity for testing. */ public static ConceptMap createConceptMap() { try { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java index 19d9bd07d9b..44fe2d990aa 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java @@ -1,4 +1,24 @@ -package ca.uhn.fhir.jpa.dao.r4; +package ca.uhn.fhir.jpa.test; + +/*- + * #%L + * HAPI FHIR JPA Server 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.context.support.IValidationSupport; @@ -18,8 +38,6 @@ import ca.uhn.fhir.jpa.batch.api.IBatchJobSubmitter; import ca.uhn.fhir.jpa.binary.provider.BinaryAccessProvider; import ca.uhn.fhir.jpa.binary.interceptor.BinaryStorageInterceptor; import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper; -import ca.uhn.fhir.jpa.config.TestR4Config; -import ca.uhn.fhir.jpa.dao.BaseJpaTest; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.dao.data.IForcedIdDao; import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao; @@ -77,6 +95,7 @@ import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvcR4; +import ca.uhn.fhir.jpa.test.config.TestR4Config; import ca.uhn.fhir.jpa.util.MemoryCacheService; import ca.uhn.fhir.jpa.util.ResourceCountCache; import ca.uhn.fhir.jpa.validation.ValidationSettings; @@ -200,7 +219,8 @@ import static org.mockito.Mockito.mock; @ContextConfiguration(classes = {TestR4Config.class}) public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuilder { public static final String MY_VALUE_SET = "my-value-set"; - + public static final String URL_MY_VALUE_SET = "http://example.com/my_value_set"; + public static final String URL_MY_CODE_SYSTEM = "http://example.com/my_code_system"; @Autowired protected IPackageInstallerSvc myPackageInstallerSvc; @Autowired @@ -315,8 +335,6 @@ public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuil @Autowired protected EntityManager myEntityManager; @Autowired - protected FhirContext myFhirContext; - @Autowired @Qualifier("myGroupDaoR4") protected IFhirResourceDao myGroupDao; @Autowired @@ -596,10 +614,6 @@ public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuil return myTxManager; } - protected T loadResourceFromClasspath(Class type, String resourceName) throws IOException { - return ClasspathUtil.loadResource(myFhirContext, type, resourceName); - } - protected void validate(IBaseResource theResource) { FhirValidator validatorModule = myFhirContext.newValidator(); FhirInstanceValidator instanceValidator = new FhirInstanceValidator(myValidationSupport); @@ -707,7 +721,7 @@ public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuil protected void createLocalCsAndVs() { //@formatter:off CodeSystem codeSystem = new CodeSystem(); - codeSystem.setUrl(FhirResourceDaoR4TerminologyTest.URL_MY_CODE_SYSTEM); + codeSystem.setUrl(URL_MY_CODE_SYSTEM); codeSystem.setContent(CodeSystem.CodeSystemContentMode.COMPLETE); codeSystem .addConcept().setCode("A").setDisplay("Code A").addDesignation( @@ -731,11 +745,17 @@ public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuil protected void createLocalVs(CodeSystem codeSystem) { ValueSet valueSet = new ValueSet(); valueSet.setId(MY_VALUE_SET); - valueSet.setUrl(FhirResourceDaoR4TerminologyTest.URL_MY_VALUE_SET); + valueSet.setUrl(URL_MY_VALUE_SET); valueSet.getCompose().addInclude().setSystem(codeSystem.getUrl()); myValueSetDao.update(valueSet, mySrd); } + @AfterEach + public void afterEachClearCaches() { + myValueSetDao.purgeCaches(); + myJpaValidationSupportChainR4.invalidateCaches(); + } + private static void flattenExpansionHierarchy(List theFlattenedHierarchy, List theCodes, String thePrefix) { theCodes.sort((o1, o2) -> { int s1 = o1.getSequence() != null ? o1.getSequence() : o1.getCode().hashCode(); @@ -753,14 +773,8 @@ public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuil } } - @AfterEach - public void afterEachClearCaches() { - myValueSetDao.purgeCaches(); - myJpaValidationSupportChainR4.invalidateCaches(); - } - /** - * Creates a single {@link org.hl7.fhir.r4.model.ConceptMap} entity that includes: + * Creates a single {@link ConceptMap} entity that includes: *
    *
      *
    • @@ -779,7 +793,7 @@ public abstract class BaseJpaR4Test extends BaseJpaTest implements ITestDataBuil *
      * The first two groups also include an element with the same source code. * - * @return A {@link org.hl7.fhir.r4.model.ConceptMap} entity for testing. + * @return A {@link ConceptMap} entity for testing. */ public static ConceptMap createConceptMap() { ConceptMap conceptMap = new ConceptMap(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java index 3ad9a7d0445..5b3d19c96bf 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java @@ -1,4 +1,24 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.test; + +/*- + * #%L + * HAPI FHIR JPA Server 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.context.support.IValidationSupport; @@ -12,6 +32,9 @@ import ca.uhn.fhir.jpa.api.svc.IIdHelperService; import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc; import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper; import ca.uhn.fhir.jpa.config.JpaConfig; +import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; +import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; +import ca.uhn.fhir.jpa.dao.JpaPersistedResourceValidationSupport; import ca.uhn.fhir.jpa.dao.data.IForcedIdDao; import ca.uhn.fhir.jpa.dao.data.IResourceHistoryTableDao; import ca.uhn.fhir.jpa.dao.data.IResourceIndexedComboTokensNonUniqueDao; @@ -37,7 +60,6 @@ import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.model.util.JpaConstants; import ca.uhn.fhir.jpa.partition.IPartitionLookupSvc; -import ca.uhn.fhir.jpa.provider.SystemProviderDstu2Test; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.PersistedJpaBundleProvider; import ca.uhn.fhir.jpa.search.cache.ISearchCacheSvc; @@ -56,16 +78,15 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.test.BaseTest; -import ca.uhn.fhir.jpa.util.Batch2JobHelper; import ca.uhn.fhir.test.utilities.BatchJobHelper; import ca.uhn.fhir.test.utilities.LoggingExtension; import ca.uhn.fhir.test.utilities.ProxyUtil; import ca.uhn.fhir.test.utilities.UnregisterScheduledProcessor; import ca.uhn.fhir.util.BundleUtil; +import ca.uhn.fhir.util.ClasspathUtil; import ca.uhn.fhir.util.FhirVersionIndependentConcept; import ca.uhn.fhir.util.StopWatch; import ca.uhn.fhir.util.TestUtil; -import org.apache.commons.io.IOUtils; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -101,7 +122,6 @@ import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Nonnull; import javax.persistence.EntityManager; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -153,6 +173,8 @@ public abstract class BaseJpaTest extends BaseTest { protected ServletRequestDetails mySrd; protected InterceptorService mySrdInterceptorService; @Autowired + protected FhirContext myFhirContext; + @Autowired protected DaoConfig myDaoConfig = new DaoConfig(); @Autowired protected DatabaseBackedPagingProvider myDatabaseBackedPagingProvider; @@ -197,8 +219,6 @@ public abstract class BaseJpaTest extends BaseTest { @Autowired protected ITermConceptPropertyDao myTermConceptPropertyDao; @Autowired - private IIdHelperService myIdHelperService; - @Autowired private MemoryCacheService myMemoryCacheService; @Qualifier(JpaConfig.JPA_VALIDATION_SUPPORT) @Autowired @@ -218,6 +238,10 @@ public abstract class BaseJpaTest extends BaseTest { @Autowired(required = false) private JobInstanceDao myMapJobInstanceDao; + protected T loadResourceFromClasspath(Class type, String resourceName) throws IOException { + return ClasspathUtil.loadResource(myFhirContext, type, resourceName); + } + @AfterEach public void afterEnsureNoStaleBatchJobs() { if (myMapJobInstanceDao != null) { @@ -736,18 +760,6 @@ public abstract class BaseJpaTest extends BaseTest { doRandomizeLocaleAndTimezone(); } - public static String loadClasspath(String resource) throws IOException { - return new String(loadClasspathBytes(resource), Constants.CHARSET_UTF8); - } - - public static byte[] loadClasspathBytes(String resource) throws IOException { - InputStream bundleRes = SystemProviderDstu2Test.class.getResourceAsStream(resource); - if (bundleRes == null) { - throw new NullPointerException("Can not load " + resource); - } - return IOUtils.toByteArray(bundleRes); - } - @SuppressWarnings("BusyWait") protected static void purgeDatabase(DaoConfig theDaoConfig, IFhirSystemDao theSystemDao, IResourceReindexingSvc theResourceReindexingSvc, ISearchCoordinatorSvc theSearchCoordinatorSvc, ISearchParamRegistry theSearchParamRegistry, IBulkDataExportJobSchedulingHelper theBulkDataJobActivator) { theSearchCoordinatorSvc.cancelAllActiveSearches(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/Batch2JobHelper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java similarity index 59% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/Batch2JobHelper.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java index 7b68e3a1af7..0bf99717a52 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/Batch2JobHelper.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/Batch2JobHelper.java @@ -1,4 +1,24 @@ -package ca.uhn.fhir.jpa.util; +package ca.uhn.fhir.jpa.test; + +/*- + * #%L + * HAPI FHIR JPA Server 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.batch2.api.IJobCleanerService; import ca.uhn.fhir.batch2.api.IJobCoordinator; diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java new file mode 100644 index 00000000000..26dfc06d6b9 --- /dev/null +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/BlockLargeNumbersOfParamsListener.java @@ -0,0 +1,57 @@ +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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 net.ttddyy.dsproxy.ExecutionInfo; +import net.ttddyy.dsproxy.QueryInfo; +import net.ttddyy.dsproxy.proxy.ParameterSetOperation; +import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; +import org.apache.commons.lang3.Validate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +/** + * What's going on here: + *

      + * Oracle chokes on queries that have more than 1000 parameters. We have stress tests that + * do giant queries, so this is here to cause a failure if these result in lots of + * bound parameters that would cause a failure in oracle. By default these don't cause issues + * in Derby which is why we simulate the failure using this listener. + *

      + */ +public class BlockLargeNumbersOfParamsListener implements ProxyDataSourceBuilder.SingleQueryExecution { + + private static final Logger ourLog = LoggerFactory.getLogger(BlockLargeNumbersOfParamsListener.class); + + @Override + public void execute(ExecutionInfo theExecInfo, List theQueryInfoList) { + ourLog.trace("SqlQuery with {} queries", theQueryInfoList.size()); + for (QueryInfo next : theQueryInfoList) { + ourLog.trace("Have {} param lists", next.getParametersList().size()); + for (List nextParamsList : next.getParametersList()) { + ourLog.trace("Have {} sub-param lists", nextParamsList.size()); + Validate.isTrue(nextParamsList.size() < 1000, "SqlQuery has %s parameters: %s", nextParamsList.size(), next.getQuery()); + } + } + } +} diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java new file mode 100644 index 00000000000..720f39c3850 --- /dev/null +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/ConnectionWrapper.java @@ -0,0 +1,323 @@ +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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 java.sql.Array; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.SQLClientInfoException; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Savepoint; +import java.sql.Statement; +import java.sql.Struct; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.Executor; + +public class ConnectionWrapper implements Connection { + + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ConnectionWrapper.class); + + private Connection myWrap; + + public ConnectionWrapper(Connection theConnection) { + myWrap = theConnection; + } + + @Override + public void abort(Executor theExecutor) throws SQLException { + myWrap.abort(theExecutor); + } + + @Override + public void clearWarnings() throws SQLException { + myWrap.clearWarnings(); + } + + @Override + public void close() throws SQLException { + myWrap.close(); + } + + @Override + public void commit() throws SQLException { + myWrap.commit(); + } + + @Override + public Array createArrayOf(String theTypeName, Object[] theElements) throws SQLException { + return myWrap.createArrayOf(theTypeName, theElements); + } + + @Override + public Blob createBlob() throws SQLException { + return myWrap.createBlob(); + } + + @Override + public Clob createClob() throws SQLException { + return myWrap.createClob(); + } + + @Override + public NClob createNClob() throws SQLException { + return myWrap.createNClob(); + } + + @Override + public SQLXML createSQLXML() throws SQLException { + return myWrap.createSQLXML(); + } + + @Override + public Statement createStatement() throws SQLException { + return myWrap.createStatement(); + } + + @Override + public Statement createStatement(int theResultSetType, int theResultSetConcurrency) throws SQLException { + return myWrap.createStatement(theResultSetType, theResultSetConcurrency); + } + + @Override + public Statement createStatement(int theResultSetType, int theResultSetConcurrency, int theResultSetHoldability) throws SQLException { + return myWrap.createStatement(theResultSetType, theResultSetConcurrency, theResultSetHoldability); + } + + @Override + public Struct createStruct(String theTypeName, Object[] theAttributes) throws SQLException { + return myWrap.createStruct(theTypeName, theAttributes); + } + + @Override + public boolean getAutoCommit() throws SQLException { + return myWrap.getAutoCommit(); + } + + @Override + public String getCatalog() throws SQLException { + return myWrap.getCatalog(); + } + + @Override + public Properties getClientInfo() throws SQLException { + return myWrap.getClientInfo(); + } + + @Override + public String getClientInfo(String theName) throws SQLException { + return myWrap.getClientInfo(theName); + } + + @Override + public int getHoldability() throws SQLException { + return myWrap.getHoldability(); + } + + @Override + public DatabaseMetaData getMetaData() throws SQLException { + return myWrap.getMetaData(); + } + + @Override + public int getNetworkTimeout() throws SQLException { + return myWrap.getNetworkTimeout(); + } + + @Override + public String getSchema() throws SQLException { + return myWrap.getSchema(); + } + + @Override + public int getTransactionIsolation() throws SQLException { + return myWrap.getTransactionIsolation(); + } + + @Override + public Map> getTypeMap() throws SQLException { + return myWrap.getTypeMap(); + } + + @Override + public SQLWarning getWarnings() throws SQLException { + return myWrap.getWarnings(); + } + + @Override + public boolean isClosed() throws SQLException { + return myWrap.isClosed(); + } + + @Override + public boolean isReadOnly() throws SQLException { + return myWrap.isReadOnly(); + } + + @Override + public boolean isValid(int theTimeout) throws SQLException { + return myWrap.isValid(theTimeout); + } + + @Override + public boolean isWrapperFor(Class theIface) throws SQLException { + return myWrap.isWrapperFor(theIface); + } + + @Override + public String nativeSQL(String theSql) throws SQLException { + return myWrap.nativeSQL(theSql); + } + + @Override + public CallableStatement prepareCall(String theSql) throws SQLException { + return myWrap.prepareCall(theSql); + } + + @Override + public CallableStatement prepareCall(String theSql, int theResultSetType, int theResultSetConcurrency) throws SQLException { + return myWrap.prepareCall(theSql, theResultSetType, theResultSetConcurrency); + } + + @Override + public CallableStatement prepareCall(String theSql, int theResultSetType, int theResultSetConcurrency, int theResultSetHoldability) throws SQLException { + return myWrap.prepareCall(theSql, theResultSetType, theResultSetConcurrency, theResultSetHoldability); + } + + @Override + public PreparedStatement prepareStatement(String theSql) throws SQLException { + return myWrap.prepareStatement(theSql); + } + + @Override + public PreparedStatement prepareStatement(String theSql, int theAutoGeneratedKeys) throws SQLException { + return myWrap.prepareStatement(theSql, theAutoGeneratedKeys); + } + + @Override + public PreparedStatement prepareStatement(String theSql, int theResultSetType, int theResultSetConcurrency) throws SQLException { + return myWrap.prepareStatement(theSql, theResultSetType, theResultSetConcurrency); + } + + @Override + public PreparedStatement prepareStatement(String theSql, int theResultSetType, int theResultSetConcurrency, int theResultSetHoldability) throws SQLException { + return myWrap.prepareStatement(theSql, theResultSetType, theResultSetConcurrency, theResultSetHoldability); + } + + @Override + public PreparedStatement prepareStatement(String theSql, int[] theColumnIndexes) throws SQLException { + return myWrap.prepareStatement(theSql, theColumnIndexes); + } + + @Override + public PreparedStatement prepareStatement(String theSql, String[] theColumnNames) throws SQLException { + return myWrap.prepareStatement(theSql, theColumnNames); + } + + @Override + public void releaseSavepoint(Savepoint theSavepoint) throws SQLException { + myWrap.releaseSavepoint(theSavepoint); + } + + @Override + public void rollback() throws SQLException { + myWrap.rollback(); + } + + @Override + public void rollback(Savepoint theSavepoint) throws SQLException { + myWrap.rollback(theSavepoint); + } + + @Override + public void setAutoCommit(boolean theAutoCommit) throws SQLException { + myWrap.setAutoCommit(theAutoCommit); + } + + @Override + public void setCatalog(String theCatalog) throws SQLException { + myWrap.setCatalog(theCatalog); + } + + @Override + public void setClientInfo(Properties theProperties) throws SQLClientInfoException { + myWrap.setClientInfo(theProperties); + } + + @Override + public void setClientInfo(String theName, String theValue) throws SQLClientInfoException { + myWrap.setClientInfo(theName, theValue); + } + + @Override + public void setHoldability(int theHoldability) throws SQLException { + myWrap.setHoldability(theHoldability); + } + + @Override + public void setNetworkTimeout(Executor theExecutor, int theMilliseconds) throws SQLException { + myWrap.setNetworkTimeout(theExecutor, theMilliseconds); + } + + @Override + public void setReadOnly(boolean theReadOnly) throws SQLException { + ourLog.debug("Setting connection as readonly"); + myWrap.setReadOnly(theReadOnly); + } + + @Override + public Savepoint setSavepoint() throws SQLException { + return myWrap.setSavepoint(); + } + + @Override + public Savepoint setSavepoint(String theName) throws SQLException { + return myWrap.setSavepoint(theName); + } + + @Override + public void setSchema(String theSchema) throws SQLException { + myWrap.setSchema(theSchema); + } + + @Override + public void setTransactionIsolation(int theLevel) throws SQLException { + myWrap.setTransactionIsolation(theLevel); + } + + @Override + public void setTypeMap(Map> theMap) throws SQLException { + myWrap.setTypeMap(theMap); + } + + @Override + public T unwrap(Class theIface) throws SQLException { + return myWrap.unwrap(theIface); + } + +} diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java new file mode 100644 index 00000000000..16eb336a90e --- /dev/null +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/MandatoryTransactionListener.java @@ -0,0 +1,46 @@ +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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 net.ttddyy.dsproxy.ExecutionInfo; +import net.ttddyy.dsproxy.QueryInfo; +import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; +import org.springframework.transaction.support.TransactionSynchronizationManager; + +import java.util.List; +import java.util.Locale; + +public class MandatoryTransactionListener implements ProxyDataSourceBuilder.SingleQueryExecution { + @Override + public void execute(ExecutionInfo execInfo, List queryInfoList) { + if (!TransactionSynchronizationManager.isSynchronizationActive()) { + for (QueryInfo nextQuery : queryInfoList) { + String query = nextQuery.getQuery().toLowerCase(Locale.US); + if (query.contains("hfj_") || query.contains("trm_")) { + if (query.startsWith("select ") || query.startsWith("insert ") || query.startsWith("update ")) { + throw new IllegalStateException("No transaction active executing query: " + nextQuery.getQuery()); + } + } + + } + } + } +} diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java similarity index 88% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java index 98b0efd09ce..6df4a8da1ab 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu2Config.java @@ -1,8 +1,30 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.batch2.JpaBatch2Config; +import ca.uhn.fhir.jpa.config.HapiJpaConfig; +import ca.uhn.fhir.jpa.config.JpaDstu2Config; import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil; import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import ca.uhn.fhir.jpa.util.CircularQueueCaptureQueriesListener; @@ -60,6 +82,8 @@ public class TestDstu2Config { } + @Autowired + TestHibernateSearchAddInConfig.IHibernateSearchConfigurer hibernateSearchConfigurer; private Exception myLastStackTrace; private String myLastStackTraceThreadName; @@ -152,9 +176,6 @@ public class TestDstu2Config { return ourMaxThreads; } - @Autowired - TestHibernateSearchAddInConfig.IHibernateSearchConfigurer hibernateSearchConfigurer; - private Properties jpaProperties() { Properties extraProperties = new Properties(); extraProperties.put("hibernate.format_sql", "true"); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java similarity index 89% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java index bbfc6d32348..b979f928593 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestDstu3Config.java @@ -1,8 +1,29 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.batch2.JpaBatch2Config; +import ca.uhn.fhir.jpa.config.HapiJpaConfig; import ca.uhn.fhir.jpa.config.dstu3.JpaDstu3Config; import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil; import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; @@ -47,15 +68,15 @@ import static org.junit.jupiter.api.Assertions.fail; public class TestDstu3Config { static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(TestDstu3Config.class); + @Autowired + TestHibernateSearchAddInConfig.IHibernateSearchConfigurer hibernateSearchConfigurer; private Exception myLastStackTrace; - @Bean public CircularQueueCaptureQueriesListener captureQueriesListener() { return new CircularQueueCaptureQueriesListener(); } - @Bean public BasicDataSource basicDataSource() { BasicDataSource retVal = new BasicDataSource() { @@ -159,9 +180,6 @@ public class TestDstu3Config { return retVal; } - @Autowired - TestHibernateSearchAddInConfig.IHibernateSearchConfigurer hibernateSearchConfigurer; - private Properties jpaProperties() { Properties extraProperties = new Properties(); extraProperties.put("hibernate.jdbc.batch_size", "50"); diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java new file mode 100644 index 00000000000..ec61ac72b17 --- /dev/null +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestElasticsearchContainerHelper.java @@ -0,0 +1,41 @@ +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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 org.testcontainers.elasticsearch.ElasticsearchContainer; + +import java.time.Duration; + +import static java.time.temporal.ChronoUnit.SECONDS; + +public class TestElasticsearchContainerHelper { + + + public static final String ELASTICSEARCH_VERSION = "7.10.2"; + public static final String ELASTICSEARCH_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch:" + ELASTICSEARCH_VERSION; + + public static ElasticsearchContainer getEmbeddedElasticSearch() { + + return new ElasticsearchContainer(ELASTICSEARCH_IMAGE) + .withStartupTimeout(Duration.of(300, SECONDS)); + } + +} diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestHibernateSearchAddInConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHibernateSearchAddInConfig.java similarity index 90% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestHibernateSearchAddInConfig.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHibernateSearchAddInConfig.java index b0d48f9c23f..5e0f93de952 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestHibernateSearchAddInConfig.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestHibernateSearchAddInConfig.java @@ -1,11 +1,30 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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.FulltextSearchSvcImpl; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer; import ca.uhn.fhir.jpa.search.elastic.ElasticsearchHibernatePropertiesBuilder; -import ca.uhn.fhir.jpa.search.elastic.TestElasticsearchContainerHelper; import ca.uhn.fhir.jpa.search.lastn.ElasticsearchSvcImpl; import ca.uhn.fhir.test.utilities.docker.RequiresDocker; import org.hibernate.search.backend.elasticsearch.index.IndexStatus; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestJPAConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java similarity index 74% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestJPAConfig.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java index 2f03a57fb51..7127d5920f6 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestJPAConfig.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestJPAConfig.java @@ -1,16 +1,37 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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.config.DaoConfig; import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc; import ca.uhn.fhir.jpa.binstore.MemoryBinaryStorageSvcImpl; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.model.entity.ModelConfig; -import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil; import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig; import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig; import ca.uhn.fhir.jpa.subscription.match.deliver.resthook.SubscriptionDeliveringRestHookSubscriber; import ca.uhn.fhir.jpa.subscription.submit.config.SubscriptionSubmitterConfig; -import ca.uhn.fhir.jpa.util.Batch2JobHelper; +import ca.uhn.fhir.jpa.test.Batch2JobHelper; +import ca.uhn.fhir.jpa.test.util.StoppableSubscriptionDeliveringRestHookSubscriber; +import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil; import ca.uhn.fhir.test.utilities.BatchJobHelper; import org.springframework.batch.core.explore.JobExplorer; import org.springframework.context.annotation.Bean; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java similarity index 90% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java index b62a449b947..06e8bf66a11 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR4Config.java @@ -1,10 +1,31 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.batch2.JpaBatch2Config; import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc; import ca.uhn.fhir.jpa.binstore.MemoryBinaryStorageSvcImpl; +import ca.uhn.fhir.jpa.config.HapiJpaConfig; import ca.uhn.fhir.jpa.config.r4.JpaR4Config; import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil; import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; @@ -155,7 +176,7 @@ public class TestR4Config { // .logQueryBySlf4j(level) .logSlowQueryBySlf4j(10, TimeUnit.SECONDS, level) .beforeQuery(new BlockLargeNumbersOfParamsListener()) - .beforeQuery( getMandatoryTransactionListener() ) + .beforeQuery(getMandatoryTransactionListener()) .afterQuery(captureQueriesListener()) .afterQuery(new CurrentThreadCaptureQueriesListener()) .countQuery(singleQueryCountHolder()) diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java similarity index 89% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java index db4b2e82e2d..14fde56ef1e 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/config/TestR5Config.java @@ -1,10 +1,31 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.config; + +/*- + * #%L + * HAPI FHIR JPA Server 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.batch2.jobs.config.Batch2JobsConfig; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.batch2.JpaBatch2Config; import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc; import ca.uhn.fhir.jpa.binstore.MemoryBinaryStorageSvcImpl; +import ca.uhn.fhir.jpa.config.HapiJpaConfig; import ca.uhn.fhir.jpa.config.r5.JpaR5Config; import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil; import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; @@ -64,9 +85,10 @@ public class TestR5Config { } } + @Autowired + TestHibernateSearchAddInConfig.IHibernateSearchConfigurer hibernateSearchConfigurer; @Autowired private Environment myEnvironment; - private Exception myLastStackTrace; @Bean @@ -154,9 +176,6 @@ public class TestR5Config { return retVal; } - @Autowired - TestHibernateSearchAddInConfig.IHibernateSearchConfigurer hibernateSearchConfigurer; - private Properties jpaProperties() { Properties extraProperties = new Properties(); extraProperties.put("hibernate.format_sql", "false"); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/StoppableSubscriptionDeliveringRestHookSubscriber.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java similarity index 65% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/StoppableSubscriptionDeliveringRestHookSubscriber.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java index 1368c1cc509..6caf0694628 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/StoppableSubscriptionDeliveringRestHookSubscriber.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/StoppableSubscriptionDeliveringRestHookSubscriber.java @@ -1,4 +1,24 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.test.util; + +/*- + * #%L + * HAPI FHIR JPA Server 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.subscription.match.deliver.resthook.SubscriptionDeliveringRestHookSubscriber; import org.slf4j.Logger; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionTestUtil.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java similarity index 84% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionTestUtil.java rename to hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java index dcd410fee70..5b58793a873 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionTestUtil.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/util/SubscriptionTestUtil.java @@ -1,4 +1,24 @@ -package ca.uhn.fhir.jpa.subscription; +package ca.uhn.fhir.jpa.test.util; + +/*- + * #%L + * HAPI FHIR JPA Server 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.config.DaoConfig; import ca.uhn.fhir.jpa.cache.IResourceChangeListenerCacheRefresher; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/client/ClientThreadedCapabilitiesTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/client/ClientThreadedCapabilitiesTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/client/ClientThreadedCapabilitiesTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/client/ClientThreadedCapabilitiesTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/job/MultiUrlJobParameterUtil.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/job/MultiUrlJobParameterUtil.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/job/MultiUrlJobParameterUtil.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/job/MultiUrlJobParameterUtil.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/mdm/job/MdmLinkDeleterTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/mdm/job/MdmLinkDeleterTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/mdm/job/MdmLinkDeleterTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/mdm/job/MdmLinkDeleterTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/reader/BatchDateThresholdUpdaterTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/reader/BatchDateThresholdUpdaterTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/reader/BatchDateThresholdUpdaterTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/reader/BatchDateThresholdUpdaterTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/reader/ReverseCronologicalBatchResourcePidReaderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/reader/ReverseCronologicalBatchResourcePidReaderTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch/reader/ReverseCronologicalBatchResourcePidReaderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch/reader/ReverseCronologicalBatchResourcePidReaderTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java index 84e7fe6fe44..447e7c9db22 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java @@ -8,9 +8,9 @@ import ca.uhn.fhir.batch2.model.StatusEnum; import ca.uhn.fhir.batch2.model.WorkChunk; import ca.uhn.fhir.jpa.dao.data.IBatch2JobInstanceRepository; import ca.uhn.fhir.jpa.dao.data.IBatch2WorkChunkRepository; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.entity.Batch2JobInstanceEntity; import ca.uhn.fhir.jpa.entity.Batch2WorkChunkEntity; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.util.JsonUtil; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; @@ -66,7 +66,7 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { // Verify - runInTransaction(()->{ + runInTransaction(() -> { assertEquals(0, myJobInstanceRepository.findAll().size()); assertEquals(0, myWorkChunkRepository.findAll().size()); }); @@ -93,7 +93,7 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { // Verify - runInTransaction(()->{ + runInTransaction(() -> { assertEquals(1, myJobInstanceRepository.findAll().size()); assertEquals(0, myWorkChunkRepository.findAll().size()); }); @@ -141,7 +141,7 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { assertEquals(JOB_DEFINITION_ID, foundInstance.getJobDefinitionId()); assertEquals(JOB_DEF_VER, foundInstance.getJobDefinitionVersion()); assertEquals(StatusEnum.IN_PROGRESS, foundInstance.getStatus()); - assertTrue( foundInstance.isCancelled()); + assertTrue(foundInstance.isCancelled()); assertEquals(CHUNK_DATA, foundInstance.getParameters()); } @@ -164,7 +164,7 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { JobInstance instance = createInstance(); String instanceId = mySvc.storeNewInstance(instance); - List ids =new ArrayList<>(); + List ids = new ArrayList<>(); for (int i = 0; i < 10; i++) { String id = storeWorkChunk(JOB_DEFINITION_ID, TARGET_STEP_ID, instanceId, i, CHUNK_DATA); ids.add(id); @@ -174,23 +174,23 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { assertEquals(null, chunks.get(0).getData()); assertEquals(null, chunks.get(1).getData()); assertEquals(null, chunks.get(2).getData()); - assertThat(chunks.stream().map(t->t.getId()).collect(Collectors.toList()), + assertThat(chunks.stream().map(t -> t.getId()).collect(Collectors.toList()), contains(ids.get(0), ids.get(1), ids.get(2))); chunks = mySvc.fetchWorkChunksWithoutData(instanceId, 3, 1); - assertThat(chunks.stream().map(t->t.getId()).collect(Collectors.toList()), + assertThat(chunks.stream().map(t -> t.getId()).collect(Collectors.toList()), contains(ids.get(3), ids.get(4), ids.get(5))); chunks = mySvc.fetchWorkChunksWithoutData(instanceId, 3, 2); - assertThat(chunks.stream().map(t->t.getId()).collect(Collectors.toList()), + assertThat(chunks.stream().map(t -> t.getId()).collect(Collectors.toList()), contains(ids.get(6), ids.get(7), ids.get(8))); chunks = mySvc.fetchWorkChunksWithoutData(instanceId, 3, 3); - assertThat(chunks.stream().map(t->t.getId()).collect(Collectors.toList()), + assertThat(chunks.stream().map(t -> t.getId()).collect(Collectors.toList()), contains(ids.get(9))); chunks = mySvc.fetchWorkChunksWithoutData(instanceId, 3, 4); - assertThat(chunks.stream().map(t->t.getId()).collect(Collectors.toList()), + assertThat(chunks.stream().map(t -> t.getId()).collect(Collectors.toList()), empty()); } @@ -377,7 +377,7 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { mySvc.markInstanceAsCompleted(instanceId); - runInTransaction(()->{ + runInTransaction(() -> { Batch2JobInstanceEntity entity = myJobInstanceRepository.findById(instanceId).orElseThrow(() -> new IllegalArgumentException()); assertEquals(StatusEnum.COMPLETED, entity.getStatus()); }); @@ -403,7 +403,7 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test { mySvc.updateInstance(instance); - runInTransaction(()->{ + runInTransaction(() -> { Batch2JobInstanceEntity entity = myJobInstanceRepository.findById(instanceId).orElseThrow(() -> new IllegalArgumentException()); assertEquals(instance.getStartTime().getTime(), entity.getStartTime().getTime()); assertEquals(instance.getEndTime().getTime(), entity.getEndTime().getTime()); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/BaseBinaryStorageSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/BaseBinaryStorageSvcImplTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/BaseBinaryStorageSvcImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/BaseBinaryStorageSvcImplTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/BinaryAccessProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/BinaryAccessProviderTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/BinaryAccessProviderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/BinaryAccessProviderTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImplTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImplTest.java index 81ae871e8d2..43c2833f629 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImplTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/DatabaseBlobBinaryStorageSvcImplTest.java @@ -3,8 +3,8 @@ package ca.uhn.fhir.jpa.binstore; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc; import ca.uhn.fhir.jpa.binary.api.StoredDetails; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.model.entity.BinaryStorageEntity; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import org.hl7.fhir.r4.model.IdType; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImplTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/FilesystemBinaryStorageSvcImplTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/NullBinaryStorageSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/NullBinaryStorageSvcImplTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/binstore/NullBinaryStorageSvcImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/binstore/NullBinaryStorageSvcImplTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportProviderTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportProviderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportProviderTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java index 2631168afda..19590d0d721 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java @@ -17,7 +17,7 @@ import ca.uhn.fhir.jpa.bulk.export.model.BulkExportJobStatusEnum; import ca.uhn.fhir.jpa.dao.data.IBulkExportCollectionDao; import ca.uhn.fhir.jpa.dao.data.IBulkExportCollectionFileDao; import ca.uhn.fhir.jpa.dao.data.IBulkExportJobDao; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.entity.BulkExportCollectionEntity; import ca.uhn.fhir.jpa.entity.BulkExportCollectionFileEntity; import ca.uhn.fhir.jpa.entity.BulkExportJobEntity; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java index 4a778989a8d..0bb343787fc 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java @@ -12,7 +12,7 @@ import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobJson; import ca.uhn.fhir.jpa.bulk.imprt.model.JobFileRowProcessingModeEnum; import ca.uhn.fhir.jpa.dao.data.IBulkImportJobDao; import ca.uhn.fhir.jpa.dao.data.IBulkImportJobFileDao; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.entity.BulkImportJobEntity; import ca.uhn.fhir.jpa.entity.BulkImportJobFileEntity; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImplTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImplTest.java index a742bf6ea15..1af93adfef2 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImplTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImplTest.java @@ -8,7 +8,7 @@ import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobStatusEnum; import ca.uhn.fhir.jpa.bulk.imprt.model.JobFileRowProcessingModeEnum; import ca.uhn.fhir.jpa.dao.data.IBulkImportJobDao; import ca.uhn.fhir.jpa.dao.data.IBulkImportJobFileDao; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.entity.BulkImportJobEntity; import ca.uhn.fhir.jpa.entity.BulkImportJobFileEntity; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/BulkImportR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/BulkImportR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/BulkImportR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/BulkImportR4Test.java index dff49c8b779..8874bfd3268 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/BulkImportR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/BulkImportR4Test.java @@ -12,7 +12,7 @@ import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.dao.data.IBatch2JobInstanceRepository; import ca.uhn.fhir.jpa.dao.data.IBatch2WorkChunkRepository; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver; import ca.uhn.fhir.jpa.subscription.channel.impl.LinkedBlockingChannel; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/ConsumeFilesStepR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/ConsumeFilesStepR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/ConsumeFilesStepR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/ConsumeFilesStepR4Test.java index 40d9dade7f9..bac1f4a08a0 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/ConsumeFilesStepR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/bulk/imprt2/ConsumeFilesStepR4Test.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.bulk.imprt2; import ca.uhn.fhir.batch2.api.JobExecutionFailedException; import ca.uhn.fhir.batch2.jobs.imprt.ConsumeFilesStep; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Patient; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImplIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImplIT.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImplIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImplIT.java index 4d93e91e0f1..8099a04b045 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImplIT.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/cache/ResourceChangeListenerRegistryImplIT.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.cache; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.HookParams; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.param.DateRangeParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/cache/ResourceVersionCacheSvcTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/cache/ResourceVersionCacheSvcTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/cache/ResourceVersionCacheSvcTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/cache/ResourceVersionCacheSvcTest.java index 267fdbda222..05581631783 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/cache/ResourceVersionCacheSvcTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/cache/ResourceVersionCacheSvcTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.cache; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; 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/config/BlockLargeNumbersOfParamsListener.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/BlockLargeNumbersOfParamsListener.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/BlockLargeNumbersOfParamsListener.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/BlockLargeNumbersOfParamsListener.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ConnectionWrapper.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/ConnectionWrapper.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ConnectionWrapper.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/ConnectionWrapper.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/DispatcherServletConfig.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/DispatcherServletConfig.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/DispatcherServletConfig.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/DispatcherServletConfig.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialectTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialectTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialectTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/HapiFhirHibernateJpaDialectTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/JpaEntityTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/JpaEntityTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/JpaEntityTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/JpaEntityTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/MandatoryTransactionListener.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/MandatoryTransactionListener.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/MandatoryTransactionListener.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/MandatoryTransactionListener.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/min/ResourceMinimizerMojo.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/min/ResourceMinimizerMojo.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/min/ResourceMinimizerMojo.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/min/ResourceMinimizerMojo.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProviderTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProviderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/config/util/ConnectionPoolInfoProviderTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDaoTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDaoTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDaoTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDaoTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDaoTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDaoTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDaoTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDaoTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/DaoConfigTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/DaoConfigTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/DaoConfigTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/DaoConfigTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupportTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupportTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupportTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupportTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/LegacySearchBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/LegacySearchBuilderTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/LegacySearchBuilderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/LegacySearchBuilderTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/SearchFilterSyntaxTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/SearchFilterSyntaxTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/SearchFilterSyntaxTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/SearchFilterSyntaxTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/TestDaoSearch.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/TolerantJsonParserR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/TolerantJsonParserR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/TolerantJsonParserR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/TolerantJsonParserR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/TransactionProcessorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/TransactionProcessorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/TransactionProcessorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/TransactionProcessorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2SystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2SystemTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2SystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2SystemTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java similarity index 91% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java index 3a12504ad10..923db55bad4 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java @@ -9,9 +9,8 @@ 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.TestDstu2Config; -import ca.uhn.fhir.jpa.dao.BaseJpaTest; +import ca.uhn.fhir.jpa.test.config.TestDstu2Config; +import ca.uhn.fhir.jpa.test.BaseJpaTest; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.dao.data.IResourceIndexedSearchParamStringDao; import ca.uhn.fhir.jpa.dao.data.IResourceIndexedSearchParamTokenDao; @@ -56,13 +55,9 @@ import ca.uhn.fhir.model.dstu2.resource.StructureDefinition; import ca.uhn.fhir.model.dstu2.resource.Subscription; import ca.uhn.fhir.model.dstu2.resource.Substance; import ca.uhn.fhir.model.dstu2.resource.ValueSet; -import ca.uhn.fhir.parser.IParser; -import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; -import org.apache.commons.io.IOUtils; import org.hl7.fhir.common.hapi.validation.support.ValidationSupportChain; -import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; @@ -77,9 +72,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; import javax.persistence.EntityManager; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; import static org.junit.jupiter.api.Assertions.fail; @@ -256,16 +248,6 @@ public abstract class BaseJpaDstu2Test extends BaseJpaTest { return myTxManager; } - protected 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(myFhirContext); - return newJsonParser.parseResource(type, string); - } - @Override public TransactionTemplate newTxTemplate() { TransactionTemplate retVal = new TransactionTemplate(myTxManager); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchCustomSearchParamTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchCustomSearchParamTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchCustomSearchParamTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchCustomSearchParamTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchFtTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchFtTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java index ab203884744..81be65238cb 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.jpa.dao.dstu2; import ca.uhn.fhir.i18n.Msg; -import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.dao.data.ISearchParamPresentDao; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamDate; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamNumber; @@ -12,6 +11,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamUri; import ca.uhn.fhir.jpa.model.entity.ResourceLink; import ca.uhn.fhir.jpa.searchparam.SearchParamConstants; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.util.TestUtil; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.Include; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2UpdateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2UpdateTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2UpdateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2UpdateTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2ValidateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2ValidateTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2ValidateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2ValidateTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoValueSetDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoValueSetDstu2Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoValueSetDstu2Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoValueSetDstu2Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSearchDaoDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSearchDaoDstu2Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSearchDaoDstu2Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSearchDaoDstu2Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2SearchTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2SearchTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2SearchTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2SearchTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2Test.java index d429ff99579..8d2b7c174d9 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirSystemDaoDstu2Test.java @@ -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.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.util.ClasspathUtil; import org.apache.commons.io.IOUtils; import org.hl7.fhir.dstu3.model.IdType; import org.hl7.fhir.instance.model.api.IIdType; @@ -208,7 +209,7 @@ public class FhirSystemDaoDstu2Test extends BaseJpaDstu2SystemTest { */ @Test public void testTransactionBug638() throws Exception { - String input = loadClasspath("/bug638.xml"); + String input = ClasspathUtil.loadResource("/bug638.xml"); Bundle request = myFhirContext.newXmlParser().parseResource(Bundle.class, input); Bundle resp = mySystemDao.transaction(mySrd, request); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java index 26b5b890da7..f9835681abc 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster; import ca.uhn.fhir.jpa.rp.dstu3.PatientResourceProvider; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; import org.junit.jupiter.api.BeforeEach; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/CustomObservationDstu3.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/CustomObservationDstu3.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/CustomObservationDstu3.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/CustomObservationDstu3.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirDaoConcurrencyDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirDaoConcurrencyDstu3Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirDaoConcurrencyDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirDaoConcurrencyDstu3Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoCustomTypeDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoCustomTypeDstu3Test.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoCustomTypeDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoCustomTypeDstu3Test.java index 990d2a0a3fd..efa40aedb9e 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoCustomTypeDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoCustomTypeDstu3Test.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import org.hl7.fhir.dstu3.model.StringType; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java similarity index 94% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java index 05fe5feea7b..a8b13f3add8 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDocumentDstu3Test.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import org.apache.commons.io.IOUtils; import org.hl7.fhir.dstu3.model.Bundle; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3CodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3CodeSystemTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3CodeSystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3CodeSystemTest.java index 9030b86f230..45e85e3a78d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3CodeSystemTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3CodeSystemTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.term.TermReindexingSvcImpl; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.test.utilities.BatchJobHelper; import org.apache.commons.io.IOUtils; import org.hl7.fhir.dstu3.model.CodeSystem; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java index bb152dc9446..1232383e032 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.context.support.TranslateConceptResult; import ca.uhn.fhir.context.support.TranslateConceptResults; import ca.uhn.fhir.jpa.api.model.TranslationRequest; import ca.uhn.fhir.jpa.entity.TermConceptMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import org.hl7.fhir.dstu3.model.ConceptMap; import org.hl7.fhir.dstu3.model.Enumerations.PublicationStatus; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ContainedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ContainedTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ContainedTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ContainedTest.java index b71cfc6dfc5..e3744013dd9 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ContainedTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ContainedTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.TokenParamModifier; import org.hl7.fhir.dstu3.model.Observation; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ExternalReferenceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ExternalReferenceTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ExternalReferenceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ExternalReferenceTest.java index 318ac05aa44..fa99f7f2d79 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ExternalReferenceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ExternalReferenceTest.java @@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import org.hl7.fhir.dstu3.model.Organization; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3PhoneticSearchNoFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3PhoneticSearchNoFtTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3PhoneticSearchNoFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3PhoneticSearchNoFtTest.java index fed39699ed8..e47cd5d5d77 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3PhoneticSearchNoFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3PhoneticSearchNoFtTest.java @@ -4,9 +4,10 @@ import ca.uhn.fhir.context.phonetic.ApacheEncoder; import ca.uhn.fhir.context.phonetic.NumericEncoder; import ca.uhn.fhir.context.phonetic.PhoneticEncoderEnum; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamString; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.util.HapiExtensions; @@ -34,12 +35,12 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; @ContextConfiguration(classes = TestHibernateSearchAddInConfig.NoFT.class) public class FhirResourceDaoDstu3PhoneticSearchNoFtTest extends BaseJpaDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3PhoneticSearchNoFtTest.class); public static final String GALE = "Gale"; public static final String GAIL = "Gail"; public static final String NAME_SOUNDEX_SP = "nameSoundex"; public static final String ADDRESS_LINE_SOUNDEX_SP = "addressLineSoundex"; public static final String PHONE_NUMBER_SP = "phoneNumber"; + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3PhoneticSearchNoFtTest.class); private static final String BOB = "BOB"; private static final String ADDRESS = "123 Nohili St"; private static final String ADDRESS_CLOSE = "123 Nohily St"; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ReferentialIntegrityTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ReferentialIntegrityTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ReferentialIntegrityTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ReferentialIntegrityTest.java index 0fc5f02ac17..726ab71c3de 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ReferentialIntegrityTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ReferentialIntegrityTest.java @@ -2,15 +2,14 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.dstu3.model.Organization; import org.hl7.fhir.dstu3.model.Patient; import org.hl7.fhir.dstu3.model.Reference; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java index 6d4deb21b5b..11b4ead6fc4 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchCustomSearchParamTest.java @@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamToken; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.DateParam; @@ -15,6 +16,7 @@ import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.util.ClasspathUtil; import org.hl7.fhir.dstu3.model.Appointment; import org.hl7.fhir.dstu3.model.Appointment.AppointmentStatus; import org.hl7.fhir.dstu3.model.CodeType; @@ -210,7 +212,7 @@ public class FhirResourceDaoDstu3SearchCustomSearchParamTest extends BaseJpaDstu pract.addName().setFamily("PRACT"); myPractitionerDao.update(pract); - Patient pat = myFhirContext.newJsonParser().parseResource(Patient.class, loadClasspath("/dstu3_custom_resource_patient.json")); + Patient pat = myFhirContext.newJsonParser().parseResource(Patient.class, ClasspathUtil.loadResource("/dstu3_custom_resource_patient.json")); IIdType pid = myPatientDao.create(pat, mySrd).getId().toUnqualifiedVersionless(); SearchParameterMap params = new SearchParameterMap(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchDistanceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchDistanceTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchDistanceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchDistanceTest.java index e8ff123641a..b3bc2fcdbc7 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchDistanceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchDistanceTest.java @@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.jpa.util.CoordCalculatorTest; import ca.uhn.fhir.rest.param.TokenParam; import org.hl7.fhir.dstu3.model.Location; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java index cc7b6b60bc3..8707265802d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDao; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.param.StringAndListParam; import ca.uhn.fhir.rest.param.StringOrListParam; @@ -9,10 +10,7 @@ import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.TokenParamModifier; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; -import ca.uhn.fhir.util.TestUtil; -import org.hl7.fhir.dstu3.model.Base64BinaryType; import org.hl7.fhir.dstu3.model.Device; -import org.hl7.fhir.dstu3.model.Media; import org.hl7.fhir.dstu3.model.Observation; import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.hl7.fhir.dstu3.model.Patient; @@ -20,7 +18,6 @@ import org.hl7.fhir.dstu3.model.Quantity; import org.hl7.fhir.dstu3.model.StringType; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java index 3e0f8c5616c..7928541f73b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java @@ -2,7 +2,6 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamDate; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamNumber; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamQuantity; @@ -13,6 +12,8 @@ import ca.uhn.fhir.jpa.model.entity.ResourceLink; import ca.uhn.fhir.jpa.searchparam.SearchParamConstants; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap.EverythingModeEnum; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.util.TestUtil; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchSqlTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchSqlTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchSqlTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchSqlTest.java index b99983bf540..8b146c10498 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchSqlTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchSqlTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.jpa.dao.data.ISearchDao; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.jpa.util.SqlQuery; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.ReferenceParam; @@ -21,8 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.lessThan; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SourceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SourceTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SourceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SourceTest.java index 2499653d695..f3a91c7b305 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SourceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SourceTest.java @@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; -import ca.uhn.fhir.jpa.util.TestUtil; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.TokenAndListParam; @@ -17,7 +17,6 @@ import org.hl7.fhir.dstu3.model.Patient; import org.hl7.fhir.dstu3.model.StringType; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3StructureDefinitionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3StructureDefinitionTest.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3StructureDefinitionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3StructureDefinitionTest.java index a588e8bae4d..90fd7f474d6 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3StructureDefinitionTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3StructureDefinitionTest.java @@ -1,5 +1,6 @@ package ca.uhn.fhir.jpa.dao.dstu3; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import org.hl7.fhir.dstu3.model.StructureDefinition; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3TerminologyTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3TerminologyTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3TerminologyTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3TerminologyTest.java index 5c5e97039e2..842d938fd9b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3TerminologyTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3TerminologyTest.java @@ -11,6 +11,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.term.TermReindexingSvcImpl; import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId; import ca.uhn.fhir.rest.param.TokenParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java index 61849b8c0fa..fca56980ba9 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java @@ -9,6 +9,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamString; import ca.uhn.fhir.jpa.model.entity.TagTypeEnum; import ca.uhn.fhir.jpa.searchparam.SearchParamConstants; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.valueset.BundleEntrySearchModeEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java index 43953b11b4c..b86ec84111c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.model.primitive.InstantDt; @@ -11,7 +12,6 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.Coding; import org.hl7.fhir.dstu3.model.IdType; @@ -20,7 +20,6 @@ import org.hl7.fhir.dstu3.model.Organization; import org.hl7.fhir.dstu3.model.Patient; import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.instance.model.api.IIdType; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java index 9078eff907b..bcbb64f841a 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java @@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.dao.dstu3; import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.jpa.config.JpaConfig; import ca.uhn.fhir.jpa.dao.JpaPersistedResourceValidationSupport; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.ValidationModeEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java index 7e93f1b5151..5cca9aa52ae 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.dao.data.ITermValueSetConceptDao; import ca.uhn.fhir.jpa.entity.TermValueSet; import ca.uhn.fhir.jpa.model.entity.ResourceTable; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.ValueSet; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetTest.java index 902d05dd499..97e8d62e6f5 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.context.support.IValidationSupport; import ca.uhn.fhir.context.support.ValueSetExpansionOptions; import ca.uhn.fhir.jpa.entity.TermValueSet; import ca.uhn.fhir.jpa.entity.TermValueSetPreExpansionStatusEnum; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.CodeType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java index 916d2841305..48333915455 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java @@ -6,10 +6,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.List; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId; import org.hl7.fhir.dstu3.model.Organization; import org.hl7.fhir.dstu3.model.Patient; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +17,6 @@ import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.param.*; -import ca.uhn.fhir.util.TestUtil; public class FhirSearchDaoDstu3Test extends BaseJpaDstu3Test { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java index d7a521fc882..d122a2679ec 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java @@ -25,6 +25,7 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.util.ClasspathUtil; import ca.uhn.fhir.util.StopWatch; import com.google.common.base.Charsets; import com.google.common.collect.Maps; @@ -629,7 +630,7 @@ public class FhirSystemDaoDstu3Test extends BaseJpaDstu3SystemTest { @Test public void testTransaction1() throws IOException { - String inputBundleString = loadClasspath("/david-bundle-error.json"); + String inputBundleString = ClasspathUtil.loadResource("/david-bundle-error.json"); Bundle bundle = myFhirContext.newJsonParser().parseResource(Bundle.class, inputBundleString); Bundle resp = mySystemDao.transaction(mySrd, bundle); @@ -2487,7 +2488,7 @@ public class FhirSystemDaoDstu3Test extends BaseJpaDstu3SystemTest { @Test public void testTransactionWithMultiBundle() throws IOException { - String inputBundleString = loadClasspath("/batch-error.xml"); + String inputBundleString = ClasspathUtil.loadResource("/batch-error.xml"); Bundle bundle = myFhirContext.newXmlParser().parseResource(Bundle.class, inputBundleString); Bundle resp = mySystemDao.transaction(mySrd, bundle); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoTransactionDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoTransactionDstu3Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoTransactionDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoTransactionDstu3Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/DeleteExpungeDaoTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/DeleteExpungeDaoTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/DeleteExpungeDaoTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/DeleteExpungeDaoTest.java index e0374be7000..60138e97333 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/DeleteExpungeDaoTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/DeleteExpungeDaoTest.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.model.DeleteMethodOutcome; import ca.uhn.fhir.jpa.batch.listener.PidReaderCounterListener; import ca.uhn.fhir.jpa.batch.writer.SqlExecutorWriter; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.model.util.JpaConstants; import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.rest.api.Constants; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeHookTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeHookTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeHookTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeHookTest.java index 8cd0e76e03c..6f04d934eb1 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeHookTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ExpungeHookTest.java @@ -6,7 +6,7 @@ import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoPatient; import ca.uhn.fhir.jpa.api.model.ExpungeOptions; -import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.test.concurrency.PointcutLatch; import org.hl7.fhir.dstu3.model.Patient; @@ -15,7 +15,6 @@ import org.hl7.fhir.instance.model.api.IIdType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import static org.hamcrest.Matchers.containsString; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunnerTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunnerTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunnerTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/PartitionRunnerTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java index 722e3f46d38..c62a069d4c8 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.dao.expunge; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolverTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolverTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolverTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolverTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/IdHelperServiceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/IdHelperServiceTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/IdHelperServiceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/IdHelperServiceTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/index/ResourceVersionSvcTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilderCoordsTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilderCoordsTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilderCoordsTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/predicate/PredicateBuilderCoordsTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtilTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtilTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtilTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/predicate/SearchFuzzUtilTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseComboParamsR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseComboParamsR4Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseComboParamsR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseComboParamsR4Test.java index 4c0b9ae9cd4..6593a6a64aa 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseComboParamsR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseComboParamsR4Test.java @@ -8,6 +8,7 @@ import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.model.search.StorageProcessingMessage; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.reindex.ResourceReindexingSvcImpl; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.SpringObjectCaster; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import org.junit.jupiter.api.AfterEach; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4SystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4SystemTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4SystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4SystemTest.java index aaaf618ed16..23f1baacc55 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4SystemTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseJpaR4SystemTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.rp.r4.PatientResourceProvider; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.RestfulServer; import org.junit.jupiter.api.BeforeEach; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java index 988b413c6f9..3578cadbffa 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java @@ -84,7 +84,7 @@ public abstract class BasePartitioningR4Test extends BaseJpaR4SystemTest { myModelConfig.setDefaultSearchParamsCanBeOverridden(true); myPartitionDate = LocalDate.of(2020, Month.JANUARY, 14); - myPartitionDate2 = LocalDate.of(2020, Month.JANUARY, 15); + myPartitionDate2 = LocalDate.of(2020, Month.FEBRUARY, 15); myPartitionId = 1; myPartitionId2 = 2; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseR4SearchLastN.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseR4SearchLastN.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseR4SearchLastN.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseR4SearchLastN.java index ad748a683c9..522034861c3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseR4SearchLastN.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/BaseR4SearchLastN.java @@ -4,11 +4,11 @@ import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoObservation; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoPatient; -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.TestR4Config; import ca.uhn.fhir.jpa.search.lastn.ElasticsearchSvcImpl; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaTest; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.rest.param.DateAndListParam; import ca.uhn.fhir.rest.param.DateOrListParam; import ca.uhn.fhir.rest.param.DateParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ChainingR4SearchTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ChainingR4SearchTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ChainingR4SearchTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ChainingR4SearchTest.java index 40a28fb2ece..e541aeb6ccb 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ChainingR4SearchTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ChainingR4SearchTest.java @@ -7,6 +7,7 @@ import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.jpa.searchparam.ResourceSearch; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.SqlQuery; import ca.uhn.fhir.parser.StrictErrorHandler; import ca.uhn.fhir.rest.api.server.IBundleProvider; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java index e927da93ee1..67df82c6dc6 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; import ca.uhn.fhir.interceptor.api.IPointcut; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.config.TestR4Config; +import ca.uhn.fhir.jpa.test.config.TestR4Config; import ca.uhn.fhir.jpa.entity.Search; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.rest.api.SortOrderEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/CustomObservationR4.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/CustomObservationR4.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/CustomObservationR4.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/CustomObservationR4.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ElasticsearchPrefixTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ElasticsearchPrefixTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ElasticsearchPrefixTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/ElasticsearchPrefixTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCreatePlaceholdersR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCreatePlaceholdersR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCreatePlaceholdersR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCreatePlaceholdersR4Test.java index 6900a83ac4e..2eef6f892d3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCreatePlaceholdersR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCreatePlaceholdersR4Test.java @@ -7,6 +7,7 @@ import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.param.TokenParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCustomTypeR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCustomTypeR4Test.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCustomTypeR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCustomTypeR4Test.java index f360879bb36..ee44de14fcd 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCustomTypeR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoCustomTypeR4Test.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.StringType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoDocumentR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoDocumentR4Test.java similarity index 94% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoDocumentR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoDocumentR4Test.java index 7021cb73f62..652971c7aca 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoDocumentR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoDocumentR4Test.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.apache.commons.io.IOUtils; import org.hl7.fhir.r4.model.Bundle; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CacheWarmingTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CacheWarmingTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CacheWarmingTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CacheWarmingTest.java index 9a442965176..9744058c53b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CacheWarmingTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CacheWarmingTest.java @@ -8,6 +8,7 @@ import ca.uhn.fhir.jpa.search.PersistedJpaBundleProvider; import ca.uhn.fhir.jpa.search.cache.SearchCacheStatusEnum; import ca.uhn.fhir.jpa.search.warm.CacheWarmingSvcImpl; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.parser.DataFormatException; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.StringParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CodeSystemTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CodeSystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CodeSystemTest.java index 2785e61acd7..0849f815a7c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CodeSystemTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CodeSystemTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.term.TermReindexingSvcImpl; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.test.utilities.BatchJobHelper; import org.apache.commons.io.IOUtils; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboNonUniqueParamTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboNonUniqueParamTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboNonUniqueParamTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboNonUniqueParamTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboUniqueParamTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboUniqueParamTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboUniqueParamTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ComboUniqueParamTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java index 2036fb1da3a..55f95f103dd 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java @@ -8,6 +8,7 @@ import ca.uhn.fhir.jpa.dao.data.ITermConceptMapGroupDao; import ca.uhn.fhir.jpa.dao.data.ITermConceptMapGroupElementDao; import ca.uhn.fhir.jpa.dao.data.ITermConceptMapGroupElementTargetDao; import ca.uhn.fhir.jpa.entity.TermConceptMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.CanonicalType; import org.hl7.fhir.r4.model.CodeableConcept; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConcurrentWriteTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConcurrentWriteTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConcurrentWriteTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConcurrentWriteTest.java index e255ec4bf69..29b9a00472a 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConcurrentWriteTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConcurrentWriteTest.java @@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.interceptor.TransactionConcurrencySemaphoreInterceptor; import ca.uhn.fhir.jpa.interceptor.UserRequestRetryVersionConflictsInterceptor; import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.PatchTypeEnum; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.TokenParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ContainedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ContainedTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ContainedTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ContainedTest.java index 13d29540fd1..ae80bf05095 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ContainedTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ContainedTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java index 10bde60f354..2bb5ba4bd14 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4CreateTest.java @@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; -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.ResourceHistoryTable; @@ -15,6 +15,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.model.util.UcumServiceUtil; import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.QuantityParam; import ca.uhn.fhir.rest.param.ReferenceParam; @@ -24,6 +25,7 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; import ca.uhn.fhir.util.BundleBuilder; +import ca.uhn.fhir.util.ClasspathUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -366,7 +368,7 @@ public class FhirResourceDaoR4CreateTest extends BaseJpaR4Test { @Test public void testCreateResourceWithKoreanText() throws IOException { - String input = loadClasspath("/r4/bug832-korean-text.xml"); + String input = ClasspathUtil.loadResource("/r4/bug832-korean-text.xml"); Patient p = myFhirContext.newXmlParser().parseResource(Patient.class, input); String id = myPatientDao.create(p).getId().toUnqualifiedVersionless().getValue(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4DeleteTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4DeleteTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4DeleteTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4DeleteTest.java index 9c68174d289..2e13cde355a 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4DeleteTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4DeleteTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable; import ca.uhn.fhir.jpa.model.entity.ResourceTable; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException; import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ExternalReferenceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ExternalReferenceTest.java similarity index 93% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ExternalReferenceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ExternalReferenceTest.java index d0cd9e2e6ab..e4e3a47a66b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ExternalReferenceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ExternalReferenceTest.java @@ -12,24 +12,16 @@ import java.util.Set; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Organization; import org.hl7.fhir.r4.model.Patient; -import org.hl7.fhir.instance.model.api.IIdType; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; -import ca.uhn.fhir.rest.param.ReferenceParam; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import ca.uhn.fhir.util.TestUtil; - public class FhirResourceDaoR4ExternalReferenceTest extends BaseJpaR4Test { @BeforeEach diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterLegacySearchBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterLegacySearchBuilderTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterLegacySearchBuilderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterLegacySearchBuilderTest.java index f48bfcc95dc..ab9f05b855d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterLegacySearchBuilderTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterLegacySearchBuilderTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.dao.data.IResourceProvenanceDao; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.StringParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterTest.java index 63844f4afa7..2c12e5a3a0f 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4FilterTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.dao.data.IResourceProvenanceDao; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.StringParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InlineResourceModeTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InlineResourceModeTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InlineResourceModeTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InlineResourceModeTest.java index 6b0398b10e2..94a7680b4e1 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InlineResourceModeTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InlineResourceModeTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Patient; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java index 587dcde48e2..ab2117fa15c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java @@ -4,6 +4,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.api.model.DeleteMethodOutcome; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.interceptor.IServerOperationInterceptor; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InvalidSubscriptionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InvalidSubscriptionTest.java similarity index 93% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InvalidSubscriptionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InvalidSubscriptionTest.java index 2106b951364..96cb680956e 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InvalidSubscriptionTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InvalidSubscriptionTest.java @@ -3,13 +3,12 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; -import ca.uhn.fhir.jpa.subscription.SubscriptionTestUtil; +import ca.uhn.fhir.jpa.test.util.SubscriptionTestUtil; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Subscription; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LegacySearchBuilderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LegacySearchBuilderTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LegacySearchBuilderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LegacySearchBuilderTest.java index bc255c67d1e..b486bbf02ee 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LegacySearchBuilderTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LegacySearchBuilderTest.java @@ -6,7 +6,8 @@ import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.dao.BaseDateSearchDaoTests; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; +import ca.uhn.fhir.storage.test.BaseDateSearchDaoTests; import ca.uhn.fhir.jpa.entity.Search; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.model.entity.ModelConfig; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4MetaTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4MetaTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4MetaTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4MetaTest.java index ec870ec3a83..7d279e8cbeb 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4MetaTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4MetaTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.TokenParam; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ReferentialIntegrityTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ReferentialIntegrityTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ReferentialIntegrityTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ReferentialIntegrityTest.java index e11cd7f0af0..0258bab4194 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ReferentialIntegrityTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ReferentialIntegrityTest.java @@ -2,14 +2,13 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Organization; import org.hl7.fhir.r4.model.Patient; import org.hl7.fhir.r4.model.Reference; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchCustomSearchParamTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchCustomSearchParamTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchCustomSearchParamTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchCustomSearchParamTest.java index e9d7f434d45..9d08b2debf3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchCustomSearchParamTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchCustomSearchParamTest.java @@ -7,13 +7,12 @@ import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel; -import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamString; import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamToken; import ca.uhn.fhir.jpa.model.search.StorageProcessingMessage; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.DateParam; @@ -24,6 +23,7 @@ import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; +import ca.uhn.fhir.util.ClasspathUtil; import ca.uhn.fhir.util.HapiExtensions; import org.hamcrest.Matchers; import org.hl7.fhir.instance.model.api.IIdType; @@ -508,7 +508,7 @@ public class FhirResourceDaoR4SearchCustomSearchParamTest extends BaseJpaR4Test pract.addName().setFamily("PRACT"); myPractitionerDao.update(pract); - Patient pat = myFhirContext.newJsonParser().parseResource(Patient.class, loadClasspath("/r4/custom_resource_patient.json")); + Patient pat = myFhirContext.newJsonParser().parseResource(Patient.class, ClasspathUtil.loadResource("/r4/custom_resource_patient.json")); IIdType pid = myPatientDao.create(pat, mySrd).getId().toUnqualifiedVersionless(); SearchParameterMap params = new SearchParameterMap(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchDistanceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchDistanceTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchDistanceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchDistanceTest.java index d1169b0df8f..d5328e9362b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchDistanceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchDistanceTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.CoordCalculatorTest; import org.hl7.fhir.r4.model.Location; import org.junit.jupiter.api.BeforeEach; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java index 46745f4b5ae..6b9fb82c340 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; import ca.uhn.fhir.jpa.search.autocomplete.ValueSetAutocompleteOptions; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.param.QuantityParam; import ca.uhn.fhir.rest.param.StringAndListParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchIncludeTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchIncludeTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchIncludeTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchIncludeTest.java index c7dfd5527f0..f555ca31da7 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchIncludeTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchIncludeTest.java @@ -1,9 +1,9 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.search.PersistedJpaBundleProvider; import ca.uhn.fhir.jpa.search.PersistedJpaSearchFirstPageBundleProvider; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.TokenParam; @@ -31,9 +31,6 @@ import java.util.stream.IntStream; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; -import static org.hl7.fhir.r4.model.ResourceType.BodyStructure; -import static org.hl7.fhir.r4.model.ResourceType.Patient; -import static org.hl7.fhir.r4.model.ResourceType.Procedure; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNAsyncIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNAsyncIT.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNAsyncIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNAsyncIT.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNIT.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNIT.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexAsyncIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexAsyncIT.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexAsyncIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexAsyncIT.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexIT.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchLastNUsingExtendedLuceneIndexIT.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchMissingTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchMissingTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchMissingTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchMissingTest.java index 82251b374f7..320d2338c39 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchMissingTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchMissingTest.java @@ -4,6 +4,7 @@ import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.model.entity.NormalizedQuantitySearchLevel; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.DateParam; import ca.uhn.fhir.rest.param.QuantityParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java index 6b43abbf19d..c36abfaea0b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java @@ -6,7 +6,6 @@ import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.entity.Search; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.model.entity.ModelConfig; @@ -26,6 +25,8 @@ import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap.EverythingModeEnum; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.util.SqlQuery; import ca.uhn.fhir.jpa.util.TestUtil; import ca.uhn.fhir.model.api.Include; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java index 4017f6bc12a..fcbfc07c6ce 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoHashesTest.java @@ -16,6 +16,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.model.util.UcumServiceUtil; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap.EverythingModeEnum; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.TestUtil; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java index 7e4f13c07b2..4a2b3fe4368 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java @@ -12,6 +12,7 @@ import ca.uhn.fhir.jpa.search.PersistedJpaBundleProvider; import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.SearchTotalModeEnum; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.api.SummaryEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java index 64c22c667d6..603a4825792 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchPageExpiryTest.java @@ -6,6 +6,7 @@ import ca.uhn.fhir.jpa.entity.Search; import ca.uhn.fhir.jpa.model.search.SearchStatusEnum; import ca.uhn.fhir.jpa.search.cache.DatabaseSearchCacheSvcImpl; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchSqlTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchSqlTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchSqlTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchSqlTest.java index 1836d982d61..5dd27666685 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchSqlTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchSqlTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.StringParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java index 66012e0c43f..565479f53b9 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithElasticSearchIT.java @@ -10,11 +10,6 @@ import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; 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.BaseDateSearchDaoTests; -import ca.uhn.fhir.jpa.dao.BaseJpaTest; -import ca.uhn.fhir.jpa.dao.DaoTestDataBuilder; import ca.uhn.fhir.jpa.dao.TestDaoSearch; import ca.uhn.fhir.jpa.dao.data.IResourceTableDao; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; @@ -29,6 +24,9 @@ import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc; import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvcR4; +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.DataFormatException; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.api.Constants; @@ -40,6 +38,8 @@ import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.TokenParamModifier; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; +import ca.uhn.fhir.storage.test.BaseDateSearchDaoTests; +import ca.uhn.fhir.storage.test.DaoTestDataBuilder; import ca.uhn.fhir.test.utilities.ITestDataBuilder; import ca.uhn.fhir.test.utilities.LogbackLevelOverrideExtension; import ca.uhn.fhir.test.utilities.docker.RequiresDocker; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithLuceneDisabledTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithLuceneDisabledTest.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithLuceneDisabledTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithLuceneDisabledTest.java index 29a9f1dbc5d..3d7a5c8a2b9 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithLuceneDisabledTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchWithLuceneDisabledTest.java @@ -10,15 +10,14 @@ 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.TestR4Config; import ca.uhn.fhir.jpa.dao.dstu2.FhirResourceDaoDstu2SearchNoFtTest; import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvc; +import ca.uhn.fhir.jpa.test.BaseJpaTest; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.util.ValueSetTestUtil; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.api.EncodingEnum; @@ -346,17 +345,6 @@ public class FhirResourceDaoR4SearchWithLuceneDisabledTest extends BaseJpaTest { } - protected 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); - } - - /** * A valueset that includes a whole system (i.e. no properties) should expand */ diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SelectiveUpdateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SelectiveUpdateTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SelectiveUpdateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SelectiveUpdateTest.java index c91fe542436..4aaadfe660a 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SelectiveUpdateTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SelectiveUpdateTest.java @@ -1,14 +1,13 @@ package ca.uhn.fhir.jpa.dao.r4; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.RequestDetails; import ca.uhn.fhir.rest.server.interceptor.ServerOperationInterceptorAdapter; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Identifier; import org.hl7.fhir.r4.model.Patient; import org.hl7.fhir.r4.model.Resource; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java index 8b835fcb207..2fb82952185 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.SortOrderEnum; import ca.uhn.fhir.rest.api.SortSpec; @@ -11,13 +12,11 @@ import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.param.ParamPrefixEnum; import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.param.TokenParam; -import ca.uhn.fhir.util.TestUtil; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.DateTimeType; import org.hl7.fhir.r4.model.Enumerations.AdministrativeGender; import org.hl7.fhir.r4.model.Observation; import org.hl7.fhir.r4.model.Patient; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SourceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SourceTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SourceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SourceTest.java index d8fae6f100c..496ec5ffb36 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SourceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SourceTest.java @@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; -import ca.uhn.fhir.jpa.util.TestUtil; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.StringParam; @@ -17,7 +17,6 @@ import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StandardQueriesNoFTTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StandardQueriesNoFTTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StandardQueriesNoFTTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StandardQueriesNoFTTest.java index 2cd9f3d656b..aca3874f496 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StandardQueriesNoFTTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StandardQueriesNoFTTest.java @@ -3,13 +3,13 @@ package ca.uhn.fhir.jpa.dao.r4; 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.config.TestHibernateSearchAddInConfig; -import ca.uhn.fhir.jpa.config.TestR4Config; -import ca.uhn.fhir.jpa.dao.BaseDateSearchDaoTests; -import ca.uhn.fhir.jpa.dao.BaseJpaTest; -import ca.uhn.fhir.jpa.dao.DaoTestDataBuilder; import ca.uhn.fhir.jpa.dao.TestDaoSearch; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; +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.storage.test.BaseDateSearchDaoTests; +import ca.uhn.fhir.storage.test.DaoTestDataBuilder; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Observation; @@ -42,6 +42,8 @@ import static org.hamcrest.Matchers.not; }) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { + @Autowired + protected DaoRegistry myDaoRegistry; @Autowired PlatformTransactionManager myTxManager; @Autowired @@ -50,8 +52,6 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { @Qualifier("myObservationDaoR4") IFhirResourceDao myObservationDao; @Autowired - protected DaoRegistry myDaoRegistry; - @Autowired MatchUrlService myMatchUrlService; @RegisterExtension @Autowired @@ -79,7 +79,7 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { } @Nested - public class TokenSearch { + public class TokenSearch { @Nested public class Queries { @@ -106,6 +106,22 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { assertFind("by code, any system", "/Observation?code=value"); } + @SafeVarargs + private IIdType withObservation(Consumer... theBuilder) { + myObservationId = myDataBuilder.createObservation(theBuilder); + return myObservationId; + } + + private void assertFind(String theMessage, String theUrl) { + List resourceIds = myTestDaoSearch.searchForIds(theUrl); + assertThat(theMessage, resourceIds, hasItem(equalTo(myObservationId.getIdPart()))); + } + + private void assertNotFind(String theMessage, String theUrl) { + List resourceIds = myTestDaoSearch.searchForIds(theUrl); + assertThat(theMessage, resourceIds, not(hasItem(equalTo(myObservationId.getIdPart())))); + } + @Nested public class NotModifier { @Test @@ -159,29 +175,18 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { assertThat(allIds, hasItems(idExA, idExD, idExM)); } } - - @SafeVarargs - private IIdType withObservation(Consumer... theBuilder) { - myObservationId = myDataBuilder.createObservation(theBuilder); - return myObservationId; - } - - private void assertFind(String theMessage, String theUrl) { - List resourceIds = myTestDaoSearch.searchForIds(theUrl); - assertThat(theMessage, resourceIds, hasItem(equalTo(myObservationId.getIdPart()))); - } - - private void assertNotFind(String theMessage, String theUrl) { - List resourceIds = myTestDaoSearch.searchForIds(theUrl); - assertThat(theMessage, resourceIds, not(hasItem(equalTo(myObservationId.getIdPart())))); - } } } @Nested - public class NumericSearch { + public class NumericSearch { IIdType myResourceId; + private IIdType withRiskAssessmentWithProbabilty(double theValue) { + myResourceId = myDataBuilder.createResource("RiskAssessment", myDataBuilder.withPrimitiveAttribute("prediction.probabilityDecimal", theValue)); + return myResourceId; + } + @Nested public class Queries { @@ -267,11 +272,6 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { } } - private IIdType withRiskAssessmentWithProbabilty(double theValue) { - myResourceId = myDataBuilder.createResource("RiskAssessment", myDataBuilder.withPrimitiveAttribute("prediction.probabilityDecimal", theValue)); - return myResourceId; - } - @Nested public class Sorting { @Test @@ -292,6 +292,20 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { public class QuantitySearch { IIdType myResourceId; + private IIdType withObservationWithValueQuantity(double theValue) { +// IBase quantity = myDataBuilder.withElementOfType("Quantity", +// myDataBuilder.withPrimitiveAttribute("value", theValue), +// myDataBuilder.withPrimitiveAttribute("unit", "mmHg"), +// myDataBuilder.withPrimitiveAttribute("system", "http://unitsofmeasure.org")); + myResourceId = myDataBuilder.createObservation(myDataBuilder.withElementAt("valueQuantity", + myDataBuilder.withPrimitiveAttribute("value", theValue), + myDataBuilder.withPrimitiveAttribute("unit", "mmHg"), + myDataBuilder.withPrimitiveAttribute("system", "http://unitsofmeasure.org"), + myDataBuilder.withPrimitiveAttribute("code", "mm[Hg]") + )); + return myResourceId; + } + @Nested public class Queries { @@ -381,20 +395,6 @@ public class FhirResourceDaoR4StandardQueriesNoFTTest extends BaseJpaTest { } } - private IIdType withObservationWithValueQuantity(double theValue) { -// IBase quantity = myDataBuilder.withElementOfType("Quantity", -// myDataBuilder.withPrimitiveAttribute("value", theValue), -// myDataBuilder.withPrimitiveAttribute("unit", "mmHg"), -// myDataBuilder.withPrimitiveAttribute("system", "http://unitsofmeasure.org")); - myResourceId = myDataBuilder.createObservation(myDataBuilder.withElementAt("valueQuantity", - myDataBuilder.withPrimitiveAttribute("value", theValue), - myDataBuilder.withPrimitiveAttribute("unit", "mmHg"), - myDataBuilder.withPrimitiveAttribute("system", "http://unitsofmeasure.org"), - myDataBuilder.withPrimitiveAttribute("code", "mm[Hg]") - )); - return myResourceId; - } - @Nested public class Sorting { @Test diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StructureDefinitionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StructureDefinitionTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StructureDefinitionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StructureDefinitionTest.java index 53bdc7c4cfb..e1eb4e73754 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StructureDefinitionTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4StructureDefinitionTest.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.context.support.DefaultProfileValidationSupport; import ca.uhn.fhir.context.support.ValidationSupportContext; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.hl7.fhir.common.hapi.validation.support.SnapshotGeneratingValidationSupport; import org.hl7.fhir.common.hapi.validation.support.ValidationSupportChain; import org.hl7.fhir.r4.model.StructureDefinition; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TagsTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TagsTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TagsTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TagsTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyElasticsearchIT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyElasticsearchIT.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyElasticsearchIT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyElasticsearchIT.java index 44649e6445e..56f8c31a12b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyElasticsearchIT.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyElasticsearchIT.java @@ -7,16 +7,15 @@ 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.TestR4Config; import ca.uhn.fhir.jpa.dao.data.IResourceTableDao; import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion; import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc; import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc; +import ca.uhn.fhir.jpa.test.BaseJpaTest; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java index cabc307935a..f330f668d4d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4TerminologyTest.java @@ -10,6 +10,7 @@ import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink.RelationshipTypeEnum; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.jpa.term.TermReindexingSvcImpl; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId; import ca.uhn.fhir.rest.param.TokenParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java index edff36b835f..334dae55b5f 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java @@ -20,6 +20,7 @@ import ca.uhn.fhir.jpa.model.util.UcumServiceUtil; import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl; import ca.uhn.fhir.jpa.searchparam.SearchParamConstants; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.TestUtil; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTagSnapshotTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTagSnapshotTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTagSnapshotTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTagSnapshotTest.java index 52fed86ab43..235d7c57ffc 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTagSnapshotTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTagSnapshotTest.java @@ -1,12 +1,11 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.model.util.JpaConstants; -import ca.uhn.fhir.util.TestUtil; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import com.google.common.collect.Lists; import org.hamcrest.Matchers; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Patient; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTest.java index b7e54a182de..5275a7ab29a 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4UpdateTest.java @@ -6,6 +6,7 @@ import ca.uhn.fhir.jpa.model.entity.ResourceHistoryTable; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.model.util.JpaConstants; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.TestUtil; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.rest.api.MethodOutcome; @@ -17,10 +18,8 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.util.BundleBuilder; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.CanonicalType; import org.hl7.fhir.r4.model.CodeSystem; import org.hl7.fhir.r4.model.Coding; @@ -28,10 +27,8 @@ import org.hl7.fhir.r4.model.ContactPoint; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.InstantType; import org.hl7.fhir.r4.model.Meta; -import org.hl7.fhir.r4.model.Observation; import org.hl7.fhir.r4.model.Organization; import org.hl7.fhir.r4.model.Patient; -import org.hl7.fhir.r4.model.Reference; import org.hl7.fhir.r4.model.Resource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -45,7 +42,6 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; import java.util.UUID; -import java.util.function.Supplier; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java index eeddfd45f59..e717fb03b36 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java @@ -15,6 +15,7 @@ import ca.uhn.fhir.jpa.term.BaseTermReadSvcImpl; import ca.uhn.fhir.jpa.term.api.ITermLoaderSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvc; import ca.uhn.fhir.jpa.term.custom.CustomTerminologySet; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.validation.JpaValidationSupportChain; import ca.uhn.fhir.jpa.validation.ValidationSettings; import ca.uhn.fhir.parser.LenientErrorHandler; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetMultiVersionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetMultiVersionTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetMultiVersionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetMultiVersionTest.java index a1b28d52556..469df94da69 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetMultiVersionTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetMultiVersionTest.java @@ -4,15 +4,14 @@ import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.dao.data.ITermValueSetConceptDao; import ca.uhn.fhir.jpa.entity.TermValueSet; import ca.uhn.fhir.jpa.model.entity.ResourceTable; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.ValueSetTestUtil; -import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException; import org.hamcrest.Matchers; import org.hl7.fhir.r4.model.CodeSystem; import org.hl7.fhir.r4.model.ValueSet; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; -import org.springframework.test.annotation.DirtiesContext; import java.util.HashMap; import java.util.HashSet; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetTest.java index 0a3911c604c..1c30b124880 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValueSetTest.java @@ -10,6 +10,7 @@ import ca.uhn.fhir.jpa.entity.TermConcept; import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink; import ca.uhn.fhir.jpa.term.BaseTermReadSvcImpl; import ca.uhn.fhir.jpa.term.custom.CustomTerminologySet; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4VersionedReferenceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4VersionedReferenceTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4VersionedReferenceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4VersionedReferenceTest.java index 08fade9894b..bb0d3ed2509 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4VersionedReferenceTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4VersionedReferenceTest.java @@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome; import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.TokenParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java index 5837b58d666..7d99cd55221 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchListTest.java @@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.searchparam.MatchUrlService; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.HasParam; import org.hl7.fhir.instance.model.api.IBaseResource; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchParameterR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchParameterR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchParameterR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSearchParameterR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSearchDaoR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSearchDaoR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSearchDaoR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSearchDaoR4Test.java index 832c2e6508a..df3fae38d9b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSearchDaoR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSearchDaoR4Test.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.SearchTotalModeEnum; import ca.uhn.fhir.rest.api.server.IBundleProvider; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4SearchTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4SearchTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4SearchTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4SearchTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java index 817c0e233b9..cb57cdfcd36 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java @@ -828,7 +828,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { @Test public void testTransaction1() throws IOException { - String inputBundleString = loadClasspath("/david-bundle-error.json"); + String inputBundleString = ClasspathUtil.loadResource("/david-bundle-error.json"); Bundle bundle = myFhirContext.newJsonParser().parseResource(Bundle.class, inputBundleString); Bundle resp = mySystemDao.transaction(mySrd, bundle); @@ -3895,7 +3895,7 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest { @Test public void testTransactionWithMultiBundle() throws IOException { - String inputBundleString = loadClasspath("/r4/batch-error.xml"); + String inputBundleString = ClasspathUtil.loadResource("/r4/batch-error.xml"); Bundle bundle = myFhirContext.newXmlParser().parseResource(Bundle.class, inputBundleString); Bundle resp = mySystemDao.transaction(mySrd, bundle); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/JpaHistoryR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/JpaHistoryR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/JpaHistoryR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/JpaHistoryR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningNonNullDefaultPartitionR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningNonNullDefaultPartitionR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningNonNullDefaultPartitionR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningNonNullDefaultPartitionR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSearchCacheR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSearchCacheR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSearchCacheR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSearchCacheR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSqlR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSqlR4Test.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSqlR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSqlR4Test.java index 833a7b261e8..48a6d992121 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSqlR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningSqlR4Test.java @@ -67,6 +67,7 @@ import org.mockito.ArgumentCaptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.time.LocalDate; import java.util.Date; import java.util.List; import java.util.Locale; @@ -78,9 +79,11 @@ import java.util.stream.Collectors; import static ca.uhn.fhir.util.TestUtil.sleepAtLeast; import static org.apache.commons.lang3.StringUtils.countMatches; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.matchesPattern; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; @@ -299,7 +302,7 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { PartitionablePartitionId partitionId = resourceTable.getPartitionId(); assertNotNull(partitionId); assertNull(partitionId.getPartitionId()); - assertEquals(myPartitionDate, partitionId.getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, partitionId.getPartitionDate()); }); } @@ -395,63 +398,63 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { // HFJ_RESOURCE ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); assertEquals(myPartitionId, resourceTable.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); // HFJ_RES_TAG List tags = myResourceTagDao.findAll(); assertEquals(1, tags.size()); assertEquals(myPartitionId, tags.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, tags.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, tags.get(0).getPartitionId().getPartitionDate()); // HFJ_RES_VER ResourceHistoryTable version = myResourceHistoryTableDao.findForIdAndVersionAndFetchProvenance(patientId, 1L); assertEquals(myPartitionId, version.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, version.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, version.getPartitionId().getPartitionDate()); // HFJ_HISTORY_TAG List historyTags = myResourceHistoryTagDao.findAll(); assertEquals(1, historyTags.size()); assertEquals(myPartitionId, historyTags.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, historyTags.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, historyTags.get(0).getPartitionId().getPartitionDate()); // HFJ_RES_VER_PROV assertNotNull(version.getProvenance()); assertEquals(myPartitionId, version.getProvenance().getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, version.getProvenance().getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, version.getProvenance().getPartitionId().getPartitionDate()); // HFJ_SPIDX_STRING List strings = myResourceIndexedSearchParamStringDao.findAllForResourceId(patientId); ourLog.info("\n * {}", strings.stream().map(ResourceIndexedSearchParamString::toString).collect(Collectors.joining("\n * "))); assertEquals(9, strings.size()); assertEquals(myPartitionId, strings.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, strings.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, strings.get(0).getPartitionId().getPartitionDate()); // HFJ_SPIDX_DATE List dates = myResourceIndexedSearchParamDateDao.findAllForResourceId(patientId); ourLog.info("\n * {}", dates.stream().map(ResourceIndexedSearchParamDate::toString).collect(Collectors.joining("\n * "))); assertEquals(2, dates.size()); assertEquals(myPartitionId, dates.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, dates.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, dates.get(0).getPartitionId().getPartitionDate()); assertEquals(myPartitionId, dates.get(1).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, dates.get(1).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, dates.get(1).getPartitionId().getPartitionDate()); // HFJ_RES_LINK List resourceLinks = myResourceLinkDao.findAllForSourceResourceId(patientId); assertEquals(1, resourceLinks.size()); assertEquals(myPartitionId, resourceLinks.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceLinks.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resourceLinks.get(0).getPartitionId().getPartitionDate()); // HFJ_RES_PARAM_PRESENT List presents = mySearchParamPresentDao.findAllForResource(resourceTable); assertEquals(3, presents.size()); assertEquals(myPartitionId, presents.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, presents.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, presents.get(0).getPartitionId().getPartitionDate()); // HFJ_IDX_CMP_STRING_UNIQ List uniques = myResourceIndexedCompositeStringUniqueDao.findAllForResourceIdForUnitTest(patientId); assertEquals(1, uniques.size()); assertEquals(myPartitionId, uniques.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, uniques.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, uniques.get(0).getPartitionId().getPartitionDate()); }); } @@ -479,29 +482,29 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { // HFJ_RESOURCE ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); assertEquals(null, resourceTable.getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); // HFJ_RES_TAG List tags = myResourceTagDao.findAll(); assertEquals(1, tags.size()); assertEquals(null, tags.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, tags.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, tags.get(0).getPartitionId().getPartitionDate()); // HFJ_RES_VER ResourceHistoryTable version = myResourceHistoryTableDao.findForIdAndVersionAndFetchProvenance(patientId, 1L); assertEquals(null, version.getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, version.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, version.getPartitionId().getPartitionDate()); // HFJ_HISTORY_TAG List historyTags = myResourceHistoryTagDao.findAll(); assertEquals(1, historyTags.size()); assertEquals(null, historyTags.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, historyTags.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, historyTags.get(0).getPartitionId().getPartitionDate()); // HFJ_RES_VER_PROV assertNotNull(version.getProvenance()); assertEquals(null, version.getProvenance().getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, version.getProvenance().getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, version.getProvenance().getPartitionId().getPartitionDate()); // HFJ_SPIDX_STRING List strings = myResourceIndexedSearchParamStringDao.findAllForResourceId(patientId); @@ -511,34 +514,34 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { assertThat(stringsDesc, not(containsString("_content"))); assertEquals(9, strings.size(), stringsDesc); assertEquals(null, strings.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, strings.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, strings.get(0).getPartitionId().getPartitionDate()); // HFJ_SPIDX_DATE List dates = myResourceIndexedSearchParamDateDao.findAllForResourceId(patientId); ourLog.info("\n * {}", dates.stream().map(ResourceIndexedSearchParamDate::toString).collect(Collectors.joining("\n * "))); assertEquals(2, dates.size()); assertEquals(null, dates.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, dates.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, dates.get(0).getPartitionId().getPartitionDate()); assertEquals(null, dates.get(1).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, dates.get(1).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, dates.get(1).getPartitionId().getPartitionDate()); // HFJ_RES_LINK List resourceLinks = myResourceLinkDao.findAllForSourceResourceId(patientId); assertEquals(1, resourceLinks.size()); assertEquals(null, resourceLinks.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, resourceLinks.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resourceLinks.get(0).getPartitionId().getPartitionDate()); // HFJ_RES_PARAM_PRESENT List presents = mySearchParamPresentDao.findAllForResource(resourceTable); assertEquals(3, presents.size()); assertEquals(null, presents.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, presents.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, presents.get(0).getPartitionId().getPartitionDate()); // HFJ_IDX_CMP_STRING_UNIQ List uniques = myResourceIndexedCompositeStringUniqueDao.findAllForResourceIdForUnitTest(patientId); assertEquals(1, uniques.size()); assertEquals(null, uniques.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, uniques.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, uniques.get(0).getPartitionId().getPartitionDate()); }); } @@ -563,9 +566,9 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { List forcedIds = myForcedIdDao.findAll(); assertEquals(2, forcedIds.size()); assertEquals(myPartitionId, forcedIds.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, forcedIds.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, forcedIds.get(0).getPartitionId().getPartitionDate()); assertEquals(myPartitionId, forcedIds.get(1).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, forcedIds.get(1).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, forcedIds.get(1).getPartitionId().getPartitionDate()); }); } @@ -613,9 +616,9 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { List forcedIds = myForcedIdDao.findAll(); assertEquals(2, forcedIds.size()); assertEquals(null, forcedIds.get(0).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, forcedIds.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, forcedIds.get(0).getPartitionId().getPartitionDate()); assertEquals(null, forcedIds.get(1).getPartitionId().getPartitionId()); - assertEquals(myPartitionDate, forcedIds.get(1).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, forcedIds.get(1).getPartitionId().getPartitionDate()); }); } @@ -656,11 +659,15 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { ourLog.info(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(output)); Long patientId = new IdType(output.getEntry().get(1).getResponse().getLocation()).getIdPartAsLong(); + assertPersistedPartitionIdMatches(patientId); + } + + private void assertPersistedPartitionIdMatches(Long patientId) { runInTransaction(() -> { // HFJ_RESOURCE ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); assertEquals(myPartitionId, resourceTable.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(resourceTable.getPartitionId().getPartitionDate(), myPartitionDate); }); } @@ -674,12 +681,7 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { patient.getMeta().addTag("http://system", "code", "display"); patient.setActive(true); Long patientId = myPatientDao.create(patient, mySrd).getId().getIdPartAsLong(); - runInTransaction(() -> { - // HFJ_RESOURCE - ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); - assertEquals(myPartitionId, resourceTable.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); - }); + assertPersistedPartitionIdMatches(patientId); // Update that resource addCreatePartition(myPartitionId); @@ -692,34 +694,34 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { // HFJ_RESOURCE ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); assertEquals(myPartitionId, resourceTable.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); // HFJ_RES_VER int version = 2; ResourceHistoryTable resVer = myResourceHistoryTableDao.findForIdAndVersionAndFetchProvenance(patientId, version); assertEquals(myPartitionId, resVer.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resVer.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resVer.getPartitionId().getPartitionDate()); // HFJ_HISTORY_TAG List historyTags = myResourceHistoryTagDao.findAll(); assertEquals(2, historyTags.size()); assertEquals(myPartitionId, historyTags.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, historyTags.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, historyTags.get(0).getPartitionId().getPartitionDate()); assertEquals(myPartitionId, historyTags.get(1).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, historyTags.get(1).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, historyTags.get(1).getPartitionId().getPartitionDate()); // HFJ_RES_VER_PROV assertNotNull(resVer.getProvenance()); assertNotNull(resVer.getPartitionId()); assertEquals(myPartitionId, resVer.getProvenance().getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resVer.getProvenance().getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resVer.getProvenance().getPartitionId().getPartitionDate()); // HFJ_SPIDX_STRING List strings = myResourceIndexedSearchParamStringDao.findAllForResourceId(patientId); ourLog.info("\n * {}", strings.stream().map(ResourceIndexedSearchParamString::toString).collect(Collectors.joining("\n * "))); assertEquals(9, strings.size()); assertEquals(myPartitionId, strings.get(0).getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, strings.get(0).getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, strings.get(0).getPartitionId().getPartitionDate()); }); @@ -742,7 +744,9 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { assertEquals(1, myResourceTableDao.count()); ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); assertEquals(myPartitionId, resourceTable.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); + LocalDate expected = myPartitionDate; + LocalDate actual = resourceTable.getPartitionId().getPartitionDate(); + assertLocalDateFromDbMatches(expected, actual); // HFJ_SPIDX_TOKEN ourLog.info("Tokens:\n * {}", myResourceIndexedSearchParamTokenDao.findAll().stream().map(t -> t.toString()).collect(Collectors.joining("\n * "))); @@ -763,7 +767,7 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { assertEquals(1, myResourceTableDao.count()); ResourceTable resourceTable = myResourceTableDao.findById(patientId).orElseThrow(IllegalArgumentException::new); assertEquals(myPartitionId, resourceTable.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resourceTable.getPartitionId().getPartitionDate()); // HFJ_SPIDX_TOKEN ourLog.info("Tokens:\n * {}", myResourceIndexedSearchParamTokenDao.findAll().stream().map(t -> t.toString()).collect(Collectors.joining("\n * "))); @@ -773,7 +777,7 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { int version = 2; ResourceHistoryTable resVer = myResourceHistoryTableDao.findForIdAndVersionAndFetchProvenance(patientId, version); assertEquals(myPartitionId, resVer.getPartitionId().getPartitionId().intValue()); - assertEquals(myPartitionDate, resVer.getPartitionId().getPartitionDate()); + assertLocalDateFromDbMatches(myPartitionDate, resVer.getPartitionId().getPartitionDate()); }); @@ -3147,5 +3151,17 @@ public class PartitioningSqlR4Test extends BasePartitioningR4Test { } } + /** + * H2 gets a bit tripped up by our changing the system TZ during test + * execution, so we can have an off by one error.. but as long as it's close + * this is definitely working + */ + public static void assertLocalDateFromDbMatches(LocalDate theExpected, LocalDate theActual) { + LocalDate expMinus1 = theExpected.minusDays(1); + LocalDate expMinus2 = theExpected.minusDays(2); + LocalDate expPlus1 = theExpected.plusDays(1); + assertThat(theActual, + anyOf(equalTo(theExpected), equalTo(expMinus1), equalTo(expMinus2), equalTo(expPlus1))); + } } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java index a8509fbc229..a790348c8e4 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/PersistObservationIndexedSearchParamLastNR4IT.java @@ -3,14 +3,14 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; -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.ObservationLastNIndexPersistSvc; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.search.lastn.ElasticsearchSvcImpl; import ca.uhn.fhir.jpa.search.lastn.json.CodeJson; import ca.uhn.fhir.jpa.search.lastn.json.ObservationJson; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.param.ReferenceAndListParam; import ca.uhn.fhir.rest.param.ReferenceOrListParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchCoordinatorSvcImplTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchCoordinatorSvcImplTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchCoordinatorSvcImplTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchCoordinatorSvcImplTest.java index 5f983a7ce1f..fefe2fb02d0 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchCoordinatorSvcImplTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchCoordinatorSvcImplTest.java @@ -10,6 +10,7 @@ import ca.uhn.fhir.jpa.entity.SearchTypeEnum; import ca.uhn.fhir.jpa.model.search.SearchStatusEnum; import ca.uhn.fhir.jpa.search.cache.DatabaseSearchCacheSvcImpl; import ca.uhn.fhir.jpa.search.cache.ISearchCacheSvc; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.apache.commons.lang3.time.DateUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParamExtractorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParamExtractorR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParamExtractorR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParamExtractorR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParameterMapTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParameterMapTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParameterMapTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchParameterMapTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchWithInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchWithInterceptorR4Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchWithInterceptorR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchWithInterceptorR4Test.java index 7921331d78a..17bfd6f506b 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchWithInterceptorR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SearchWithInterceptorR4Test.java @@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.util.SqlQueryList; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.api.server.RequestDetails; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SyntheaPerfTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SyntheaPerfTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SyntheaPerfTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SyntheaPerfTest.java index d62479993e4..2c0047bdced 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/SyntheaPerfTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/SyntheaPerfTest.java @@ -3,12 +3,12 @@ package ca.uhn.fhir.jpa.dao.r4; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao; -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.TestR4Config; import ca.uhn.fhir.jpa.model.entity.ResourceEncodingEnum; import ca.uhn.fhir.jpa.partition.SystemRequestDetails; import ca.uhn.fhir.jpa.search.reindex.BlockPolicy; +import ca.uhn.fhir.jpa.test.BaseJpaTest; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.util.StopWatch; import org.apache.commons.lang3.Validate; @@ -51,27 +51,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @DirtiesContext public class SyntheaPerfTest extends BaseJpaTest { - @BeforeAll - public static void beforeAll() { - System.setProperty("unlimited_db_connection", "true"); - System.setProperty("mass_ingestion_mode", "true"); - } - - @AfterAll - public static void afterAll() { - System.clearProperty("unlimited_db_connection"); - System.clearProperty("mass_ingestion_mode"); - } - - @AfterEach - public void afterEach() { - myFhirContext.getParserOptions().setAutoContainReferenceTargetsWithNoId(true); - } - - private static final Logger ourLog = LoggerFactory.getLogger(SyntheaPerfTest.class); - private static final FhirContext ourCtx = FhirContext.forR4Cached(); public static final String PATH_TO_SYNTHEA_OUTPUT = "../../synthea/output/fhir/"; public static final int CONCURRENCY = 4; + private static final Logger ourLog = LoggerFactory.getLogger(SyntheaPerfTest.class); + private static final FhirContext ourCtx = FhirContext.forR4Cached(); @Autowired private FhirContext myFhirContext; @Autowired @@ -79,6 +62,11 @@ public class SyntheaPerfTest extends BaseJpaTest { @Autowired private IFhirSystemDao mySystemDao; + @AfterEach + public void afterEach() { + myFhirContext.getParserOptions().setAutoContainReferenceTargetsWithNoId(true); + } + @Disabled @Test public void testLoadSynthea() throws Exception { @@ -95,7 +83,7 @@ public class SyntheaPerfTest extends BaseJpaTest { List files = Files .list(FileSystems.getDefault().getPath(PATH_TO_SYNTHEA_OUTPUT)) - .filter(t->t.toString().endsWith(".json")) + .filter(t -> t.toString().endsWith(".json")) .collect(Collectors.toList()); List meta = files.stream().filter(t -> t.toString().contains("hospital") || t.toString().contains("practitioner")).collect(Collectors.toList()); @@ -121,6 +109,17 @@ public class SyntheaPerfTest extends BaseJpaTest { return myTxManager; } + @BeforeAll + public static void beforeAll() { + System.setProperty("unlimited_db_connection", "true"); + System.setProperty("mass_ingestion_mode", "true"); + } + + @AfterAll + public static void afterAll() { + System.clearProperty("unlimited_db_connection"); + System.clearProperty("mass_ingestion_mode"); + } private class Uploader { @@ -217,5 +216,4 @@ public class SyntheaPerfTest extends BaseJpaTest { } - } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TestContextLoads.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TestContextLoads.java similarity index 88% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TestContextLoads.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TestContextLoads.java index fee3b3ec724..0dcd7a38f24 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TestContextLoads.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TestContextLoads.java @@ -1,5 +1,6 @@ package ca.uhn.fhir.jpa.dao.r4; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionDeleteR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionDeleteR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionDeleteR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionDeleteR4Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionHookTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionHookTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionHookTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/TransactionHookTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java index 4852c7a2701..c57c0ac52d8 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/BaseJpaR5Test.java @@ -14,11 +14,9 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoSubscription; 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.binary.provider.BinaryAccessProvider; import ca.uhn.fhir.jpa.binary.interceptor.BinaryStorageInterceptor; +import ca.uhn.fhir.jpa.binary.provider.BinaryAccessProvider; import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportJobSchedulingHelper; -import ca.uhn.fhir.jpa.config.TestR5Config; -import ca.uhn.fhir.jpa.dao.BaseJpaTest; import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc; import ca.uhn.fhir.jpa.dao.data.IForcedIdDao; import ca.uhn.fhir.jpa.dao.data.IResourceHistoryTableDao; @@ -44,7 +42,6 @@ import ca.uhn.fhir.jpa.dao.data.ITermConceptParentChildLinkDao; import ca.uhn.fhir.jpa.dao.data.ITermValueSetConceptDao; import ca.uhn.fhir.jpa.dao.data.ITermValueSetConceptDesignationDao; import ca.uhn.fhir.jpa.dao.data.ITermValueSetDao; -import ca.uhn.fhir.jpa.dao.dstu2.FhirResourceDaoDstu2SearchNoFtTest; import ca.uhn.fhir.jpa.entity.TermValueSet; import ca.uhn.fhir.jpa.entity.TermValueSetConcept; import ca.uhn.fhir.jpa.interceptor.PerformanceTracingLoggingInterceptor; @@ -62,6 +59,8 @@ import ca.uhn.fhir.jpa.term.TermDeferredStorageSvcImpl; import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc; import ca.uhn.fhir.jpa.term.api.ITermReadSvcR5; +import ca.uhn.fhir.jpa.test.BaseJpaTest; +import ca.uhn.fhir.jpa.test.config.TestR5Config; import ca.uhn.fhir.jpa.util.ResourceCountCache; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.parser.StrictErrorHandler; @@ -74,7 +73,6 @@ import ca.uhn.fhir.test.utilities.ITestDataBuilder; import ca.uhn.fhir.util.UrlUtil; import ca.uhn.fhir.validation.FhirValidator; import ca.uhn.fhir.validation.ValidationResult; -import org.apache.commons.io.IOUtils; import org.hl7.fhir.common.hapi.validation.validator.FhirInstanceValidator; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; @@ -145,8 +143,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityManager; import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.Optional; @@ -493,16 +489,6 @@ public abstract class BaseJpaR5Test extends BaseJpaTest implements ITestDataBuil return myTxManager; } - protected 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); - } - protected void validate(IBaseResource theResource) { FhirValidator validatorModule = myFhirCtx.newValidator(); FhirInstanceValidator instanceValidator = new FhirInstanceValidator(myValidationSupport); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5CodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5CodeSystemTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5CodeSystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5CodeSystemTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java similarity index 94% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java index f498f70b8ee..a140a1a97ed 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java @@ -1,8 +1,8 @@ package ca.uhn.fhir.jpa.dao.r5; -import ca.uhn.fhir.jpa.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.config.TestHibernateSearchAddInConfig; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.HasAndListParam; import ca.uhn.fhir.rest.param.HasOrListParam; @@ -19,7 +19,7 @@ import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertEquals; -@ContextConfiguration(classes= TestHibernateSearchAddInConfig.NoFT.class) +@ContextConfiguration(classes = TestHibernateSearchAddInConfig.NoFT.class) @SuppressWarnings({"Duplicates"}) public class FhirResourceDaoR5SearchNoFtTest extends BaseJpaR5Test { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoR5SearchNoFtTest.class); @@ -94,8 +94,8 @@ public class FhirResourceDaoR5SearchNoFtTest extends BaseJpaR5Test { role.getOrganization().setReference("Organization/ORG"); myPractitionerRoleDao.update(role); - runInTransaction(()->{ - ourLog.info("Links:\n * {}", myResourceLinkDao.findAll().stream().map(t->t.toString()).collect(Collectors.joining("\n * "))); + runInTransaction(() -> { + ourLog.info("Links:\n * {}", myResourceLinkDao.findAll().stream().map(t -> t.toString()).collect(Collectors.joining("\n * "))); }); SearchParameterMap params = SearchParameterMap.newSynchronous(); @@ -126,7 +126,7 @@ public class FhirResourceDaoR5SearchNoFtTest extends BaseJpaR5Test { IBundleProvider outcome = myPatientDao.search(new SearchParameterMap()); assertEquals(3, outcome.size().intValue()); - runInTransaction(()->{ + runInTransaction(() -> { ResourceTable table = myResourceTableDao.findById(id).orElseThrow(() -> new IllegalArgumentException()); table.setDeleted(new Date()); myResourceTableDao.save(table); @@ -134,7 +134,7 @@ public class FhirResourceDaoR5SearchNoFtTest extends BaseJpaR5Test { assertEquals(2, outcome.getResources(0, 3).size()); - runInTransaction(()->{ + runInTransaction(() -> { myResourceHistoryTableDao.deleteAll(); }); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetMultiVersionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetMultiVersionTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetMultiVersionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetMultiVersionTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/StorageInterceptorEventsR5Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/StorageInterceptorEventsR5Test.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r5/StorageInterceptorEventsR5Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r5/StorageInterceptorEventsR5Test.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/search/ExtendedLuceneResourceProjectionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/search/ExtendedLuceneResourceProjectionTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/search/ExtendedLuceneResourceProjectionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/search/ExtendedLuceneResourceProjectionTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceR4Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceR4Test.java index e0fe4c6d1e6..d094c5c2980 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceR4Test.java @@ -5,7 +5,7 @@ import ca.uhn.fhir.interceptor.api.Hook; import ca.uhn.fhir.interceptor.api.Pointcut; import ca.uhn.fhir.jpa.api.model.DeleteConflict; import ca.uhn.fhir.jpa.api.model.DeleteConflictList; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.api.server.storage.TransactionDetails; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/DeleteConflictServiceTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/DeleteExpungeJobTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/DeleteExpungeJobTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/DeleteExpungeJobTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/DeleteExpungeJobTest.java index 3931f4abb62..694515639e3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/DeleteExpungeJobTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/DeleteExpungeJobTest.java @@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.delete.job; import ca.uhn.fhir.jpa.batch.api.IBatchJobSubmitter; import ca.uhn.fhir.jpa.batch.config.BatchConstants; import ca.uhn.fhir.jpa.batch.job.MultiUrlJobParameterUtil; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.test.utilities.BatchJobHelper; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/MultiUrlJobParameterValidatorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/MultiUrlJobParameterValidatorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/MultiUrlJobParameterValidatorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/MultiUrlJobParameterValidatorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexJobTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexJobTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexJobTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexJobTest.java index 7a2a1bd0cbb..7e3bf0d7c61 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexJobTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexJobTest.java @@ -6,12 +6,10 @@ import ca.uhn.fhir.batch2.jobs.reindex.ReindexJobParameters; import ca.uhn.fhir.batch2.model.JobInstance; import ca.uhn.fhir.batch2.model.JobInstanceStartRequest; import ca.uhn.fhir.batch2.model.StatusEnum; -import ca.uhn.fhir.interceptor.api.HookParams; import ca.uhn.fhir.interceptor.api.IAnonymousInterceptor; -import ca.uhn.fhir.interceptor.api.IPointcut; import ca.uhn.fhir.interceptor.api.Pointcut; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r4.model.Observation; import org.junit.jupiter.api.AfterEach; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexTestHelper.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexTestHelper.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexTestHelper.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/job/ReindexTestHelper.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/provider/DeleteExpungeProviderTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/provider/DeleteExpungeProviderTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/delete/provider/DeleteExpungeProviderTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/delete/provider/DeleteExpungeProviderTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersionTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersionTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersionTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/entity/TermCodeSystemVersionTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServicesTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServicesTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServicesTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServicesTest.java index c9580777a88..ee9d73474cd 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServicesTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/graphql/DaoRegistryGraphQLStorageServicesTest.java @@ -3,9 +3,8 @@ package ca.uhn.fhir.jpa.graphql; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.config.DaoConfig; -import ca.uhn.fhir.jpa.config.TestR4Config; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; -import ca.uhn.fhir.rest.server.RestfulServer; +import ca.uhn.fhir.jpa.test.config.TestR4Config; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.Appointment; @@ -36,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static ca.uhn.fhir.rest.api.Constants.PARAM_COUNT; import static org.mockito.Mockito.when; @ContextConfiguration(classes = {TestR4Config.class}) diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/CascadingDeleteInterceptorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ForceOffsetSearchModeInterceptorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java index 14363d30a1a..cd7ed07ab34 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/OverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.jpa.interceptor; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.searchparam.SearchParameterMap; import ca.uhn.fhir.rest.api.server.IBundleProvider; import ca.uhn.fhir.rest.param.ReferenceParam; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java index 547896b56e0..4dbd2dfbf8d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java @@ -39,6 +39,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; +import static ca.uhn.fhir.jpa.dao.r4.PartitioningSqlR4Test.assertLocalDateFromDbMatches; import static org.apache.commons.lang3.StringUtils.countMatches; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.in; @@ -101,7 +102,7 @@ public class PartitioningInterceptorR4Test extends BaseJpaR4SystemTest { LocalDate expectedDate = LocalDate.of(2021, 2, 22); assertEquals(1, resources.size()); assertEquals(null, resources.get(0).getPartitionId().getPartitionId()); - assertEquals(expectedDate.getDayOfMonth(), resources.get(0).getPartitionId().getPartitionDate().getDayOfMonth()); + assertLocalDateFromDbMatches(expectedDate, resources.get(0).getPartitionId().getPartitionDate()); }); } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ResponseTerminologyTranslationInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ResponseTerminologyTranslationInterceptorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ResponseTerminologyTranslationInterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ResponseTerminologyTranslationInterceptorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/SearchPreferHandlingInterceptorJpaTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/SearchPreferHandlingInterceptorJpaTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/SearchPreferHandlingInterceptorJpaTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/SearchPreferHandlingInterceptorJpaTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadAllPartitions.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/ex/PartitionInterceptorReadPartitionsBasedOnScopes.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java index 575b72da0cd..c93f7e6368f 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorHttpR4Test.java @@ -1,7 +1,7 @@ package ca.uhn.fhir.jpa.interceptor.validation; import ca.uhn.fhir.context.FhirVersionEnum; -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.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.PreferReturnEnum; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorR4Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorR4Test.java index ae084849e35..05634376739 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/RepositoryValidatingInterceptorR4Test.java @@ -1,20 +1,17 @@ package ca.uhn.fhir.jpa.interceptor.validation; 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.rest.api.PatchTypeEnum; import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException; import ca.uhn.fhir.validation.ResultSeverityEnum; import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.CanonicalType; import org.hl7.fhir.r4.model.CodeType; -import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.IntegerType; import org.hl7.fhir.r4.model.Meta; import org.hl7.fhir.r4.model.Observation; import org.hl7.fhir.r4.model.OperationOutcome; -import org.hl7.fhir.r4.model.Organization; import org.hl7.fhir.r4.model.Parameters; import org.hl7.fhir.r4.model.Patient; import org.hl7.fhir.r4.model.PractitionerRole; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/ValidationMessageSuppressingInterceptorTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/ValidationMessageSuppressingInterceptorTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/ValidationMessageSuppressingInterceptorTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/interceptor/validation/ValidationMessageSuppressingInterceptorTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/HashTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/HashTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/HashTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/HashTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasksTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasksTest.java similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasksTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasksTest.java diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java index 71e7318217e..81a51d38ca5 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/IgInstallerDstu3Test.java @@ -3,7 +3,7 @@ package ca.uhn.fhir.jpa.packages; import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionDao; -import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.test.utilities.JettyUtil; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/JpaPackageCacheTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/JpaPackageCacheTest.java similarity index 99% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/JpaPackageCacheTest.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/JpaPackageCacheTest.java index cd6d6d1f531..a6c9a0f8d92 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/JpaPackageCacheTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/JpaPackageCacheTest.java @@ -4,7 +4,7 @@ import ca.uhn.fhir.i18n.Msg; import ca.uhn.fhir.interceptor.api.IInterceptorService; import ca.uhn.fhir.jpa.dao.data.INpmPackageDao; import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionDao; -import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; +import ca.uhn.fhir.jpa.test.BaseJpaR4Test; import ca.uhn.fhir.jpa.interceptor.PatientIdPartitionInterceptor; import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.searchparam.extractor.ISearchParamExtractor; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmDstu3Test.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmDstu3Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmDstu3Test.java index d1b013b0e4f..821372b559c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmDstu3Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmDstu3Test.java @@ -1,11 +1,12 @@ package ca.uhn.fhir.jpa.packages; -import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; +import ca.uhn.fhir.jpa.test.BaseJpaDstu3Test; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.ValidationModeEnum; import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException; import ca.uhn.fhir.test.utilities.JettyUtil; import ca.uhn.fhir.test.utilities.ProxyUtil; +import ca.uhn.fhir.util.ClasspathUtil; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -70,7 +71,7 @@ public class NpmDstu3Test extends BaseJpaDstu3Test { @Test public void installDstu3Package() throws Exception { - byte[] bytes = loadClasspathBytes("/packages/basisprofil.de.tar.gz"); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/basisprofil.de.tar.gz"); myResponses.put("/basisprofil.de/0.2.40", bytes); PackageInstallationSpec spec = new PackageInstallationSpec().setName("basisprofil.de").setVersion("0.2.40").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmR4Test.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmR4Test.java similarity index 93% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmR4Test.java rename to hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmR4Test.java index f0f149822cd..b792d6fcccc 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/packages/NpmR4Test.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/packages/NpmR4Test.java @@ -9,7 +9,7 @@ import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; 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.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.model.entity.NpmPackageEntity; import ca.uhn.fhir.jpa.model.entity.NpmPackageVersionEntity; @@ -22,11 +22,11 @@ import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.UriParam; import ca.uhn.fhir.rest.server.RestfulServer; -import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.interceptor.partition.RequestTenantPartitionInterceptor; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; import ca.uhn.fhir.test.utilities.JettyUtil; import ca.uhn.fhir.test.utilities.ProxyUtil; +import ca.uhn.fhir.util.ClasspathUtil; import ca.uhn.fhir.util.JsonUtil; import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.server.Server; @@ -168,7 +168,7 @@ public class NpmR4Test extends BaseJpaR4Test { @Test public void testCacheDstu3Package() throws Exception { - byte[] bytes = loadClasspathBytes("/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz"); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/nictiz.fhir.nl.stu3.questionnaires-1.0.2.tgz"); myFakeNpmServlet.myResponses.put("/nictiz.fhir.nl.stu3.questionnaires/1.0.2", bytes); PackageInstallationSpec spec = new PackageInstallationSpec().setName("nictiz.fhir.nl.stu3.questionnaires").setVersion("1.0.2").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_ONLY); @@ -207,7 +207,7 @@ public class NpmR4Test extends BaseJpaR4Test { public void testInstallR4Package() 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); PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL); @@ -277,7 +277,7 @@ public class NpmR4Test extends BaseJpaR4Test { myDaoConfig.setAllowExternalReferences(true); myInterceptorService.registerInterceptor(myBinaryStorageInterceptor); - 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); PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.12.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL); @@ -349,7 +349,7 @@ public class NpmR4Test extends BaseJpaR4Test { myDaoConfig.setAllowExternalReferences(true); // Load a copy of hl7.fhir.uv.shorthand-0.12.0, but with id set to 1 instead of "shorthand-code-system" - byte[] bytes = loadClasspathBytes("/packages/hl7.fhir.uv.shorthand-0.13.0.tgz"); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.13.0.tgz"); myFakeNpmServlet.myResponses.put("/hl7.fhir.uv.shorthand/0.13.0", bytes); PackageInstallationSpec spec = new PackageInstallationSpec().setName("hl7.fhir.uv.shorthand").setVersion("0.13.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL); @@ -373,7 +373,7 @@ public class NpmR4Test extends BaseJpaR4Test { public void testInstallR4Package_NonConformanceResources() throws Exception { myDaoConfig.setAllowExternalReferences(true); - byte[] bytes = loadClasspathBytes("/packages/test-organizations-package.tgz"); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-organizations-package.tgz"); myFakeNpmServlet.myResponses.put("/test-organizations/1.0.0", bytes); List resourceList = new ArrayList<>(); @@ -410,7 +410,7 @@ public class NpmR4Test extends BaseJpaR4Test { myInterceptorService.registerInterceptor(myRequestTenantPartitionInterceptor); myDaoConfig.setAllowExternalReferences(true); - byte[] bytes = loadClasspathBytes("/packages/test-organizations-package.tgz"); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-organizations-package.tgz"); myFakeNpmServlet.myResponses.put("/test-organizations/1.0.0", bytes); List resourceList = new ArrayList<>(); @@ -446,15 +446,15 @@ public class NpmR4Test extends BaseJpaR4Test { } @Test - public void testInstallR4Package_NoIdentifierNoUrl() throws Exception { + public void testInstallR4Package_NoIdentifierNoUrl() { myDaoConfig.setAllowExternalReferences(true); - byte[] bytes = loadClasspathBytes("/packages/test-missing-identifier-package.tgz"); - myFakeNpmServlet.myResponses.put("/test-organizations/1.0.0", bytes); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-missing-identifier-package.tgz"); + myFakeNpmServlet.myResponses.put("/test-missing-identifier-package/1.0.0", bytes); List resourceList = new ArrayList<>(); resourceList.add("Organization"); - PackageInstallationSpec spec = new PackageInstallationSpec().setName("test-organizations").setVersion("1.0.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL); + PackageInstallationSpec spec = new PackageInstallationSpec().setName("test-missing-identifier-package").setVersion("1.0.0").setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL); spec.setInstallResourceTypes(resourceList); try { PackageInstallOutcomeJson outcome = myPackageInstallerSvc.install(spec); @@ -464,13 +464,15 @@ public class NpmR4Test extends BaseJpaR4Test { } } - // Reproduces https://github.com/hapifhir/hapi-fhir/issues/2332 + /** + * Reproduces https://github.com/hapifhir/hapi-fhir/issues/2332 + */ @Test public void testInstallR4Package_AutoCreatePlaceholder() throws Exception { myDaoConfig.setAllowExternalReferences(true); myDaoConfig.setAutoCreatePlaceholderReferenceTargets(true); - byte[] bytes = loadClasspathBytes("/packages/test-auto-create-placeholder.tgz"); + byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/test-auto-create-placeholder.tgz"); myFakeNpmServlet.myResponses.put("/test-ig/1.0.0", bytes); List 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 + + + + +