[15323] Remove es.hapi.fhir, change to ch.elexis.core.hapi.fhir (test)

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/AllergyIntoleranceTest.java

@@ -20,9 +20,8 @@ import org.junit.Test;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.findings.IAllergyIntolerance;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
-
 
 public class AllergyIntoleranceTest {
 	

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/AppointmentTest.java

@@ -25,8 +25,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class AppointmentTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/CORSTest.java

@@ -16,7 +16,7 @@ import ca.uhn.fhir.rest.client.api.IHttpRequest;
 import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.client.method.HttpGetClientInvocation;
 import ca.uhn.fhir.rest.client.method.MethodUtil;
-import info.elexis.server.hapi.fhir.FhirUtil;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 
 public class CORSTest {
 	

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/ClaimTest.java

@@ -28,10 +28,10 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ch.elexis.core.findings.codes.CodingSystem;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.IBilled;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 @Ignore
 public class ClaimTest {

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/CodesySystemTest.java

@@ -18,7 +18,7 @@ import org.junit.Test;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.findings.codes.CodingSystem;
-import info.elexis.server.hapi.fhir.FhirUtil;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 
 public class CodesySystemTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/ConditionTest.java

@@ -23,9 +23,9 @@ import org.junit.Test;
 
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class ConditionTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/CoverageTest.java

@@ -28,10 +28,10 @@ import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.findings.codes.CodingSystem;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.ICoverage;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class CoverageTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/EncounterTest.java

@@ -33,9 +33,9 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.findings.IObservation.ObservationCategory;
 import ch.elexis.core.findings.IdentifierSystem;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class EncounterTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/FamilyMemberHistoryTest.java

@@ -20,8 +20,8 @@ import org.junit.Test;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.findings.IFamilyMemberHistory;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class FamilyMemberHistoryTest {
 	

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/MedicationRequestTest.java

@@ -22,9 +22,9 @@ import org.junit.Test;
 
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.prescription.EntryType;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class MedicationRequestTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/MedicationTest.java

@@ -18,11 +18,11 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.test.TestEntities;
 import ch.elexis.core.types.ArticleTyp;
 import es.fhir.rest.core.coding.MedicamentCoding;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class MedicationTest {
 	

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/ObservationTest.java

@@ -40,10 +40,10 @@ import ch.elexis.core.findings.ObservationComponent;
 import ch.elexis.core.findings.codes.CodingSystem;
 import ch.elexis.core.findings.util.commands.UpdateFindingTextCommand;
 import ch.elexis.core.findings.util.model.TransientCoding;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.ILabResult;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class ObservationTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/OrganizationTest.java

@@ -18,9 +18,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class OrganizationTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/PatientTest.java

@@ -36,11 +36,11 @@ import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.gclient.IReadExecutable;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
 import ch.elexis.core.constants.XidConstants;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.IPatient;
 import ch.elexis.core.test.TestEntities;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class PatientTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/PractitionerRoleTest.java

@@ -31,11 +31,11 @@ import org.junit.Test;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.constants.XidConstants;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.IUser;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.core.connector.elexis.services.UserService;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class PractitionerRoleTest {
 	

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/ProcedureRequestTest.java

@@ -34,10 +34,10 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ch.elexis.core.findings.IObservation.ObservationCategory;
 import ch.elexis.core.findings.IdentifierSystem;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 import ch.elexis.core.model.IEncounter;
 import ch.elexis.core.test.initializer.TestDatabaseInitializer;
 import info.elexis.server.fhir.rest.core.test.AllTests;
-import info.elexis.server.hapi.fhir.FhirUtil;
 
 public class ProcedureRequestTest {
 

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/ScheduleTest.java

@@ -13,7 +13,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import info.elexis.server.hapi.fhir.FhirUtil;
+import ch.elexis.core.hapi.fhir.FhirUtil;
 
 public class ScheduleTest {