Skip to content

Commit 8a7f1c1

Browse files
col-paniccol-panic
committed
[27053] Rename tests
1 parent b808c26 commit 8a7f1c1

11 files changed

+22
-15
lines changed

‎tests/es.fhir.rest.core.test/AllFhirRestTests.launch‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@
191191
<setEntry value="org.glassfish.hk2.utils@default:default"/>
192192
<setEntry value="org.glassfish.jersey.containers.jersey-container-servlet-core@default:default"/>
193193
<setEntry value="org.glassfish.jersey.containers.jersey-container-servlet@default:default"/>
194-
<setEntry value="org.glassfish.jersey.core.jersey-client*3.1.99.SNAPSHOT@2:true"/>
195-
<setEntry value="org.glassfish.jersey.core.jersey-common*3.1.99.SNAPSHOT@2:true"/>
194+
<setEntry value="org.glassfish.jersey.core.jersey-client@2:true"/>
195+
<setEntry value="org.glassfish.jersey.core.jersey-common@2:true"/>
196196
<setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
197197
<setEntry value="org.glassfish.jersey.ext.jersey-proxy-client@default:default"/>
198198
<setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/>
@@ -234,9 +234,11 @@
234234
<setEntry value="slf4j.osgi@default:default"/>
235235
</setAttribute>
236236
<setAttribute key="selected_workspace_bundles">
237+
<setEntry value="at.medevit.atc_codes.test@default:default"/>
237238
<setEntry value="at.medevit.atc_codes@default:default"/>
238239
<setEntry value="at.medevit.ch.artikelstamm.model@default:default"/>
239240
<setEntry value="at.medevit.ch.artikelstamm@default:default"/>
241+
<setEntry value="ch.elexis.core.ee.openapi@default:default"/>
240242
<setEntry value="ch.elexis.core.findings.fhir.model@default:default"/>
241243
<setEntry value="ch.elexis.core.findings.util@default:default"/>
242244
<setEntry value="ch.elexis.core.findings@default:default"/>
@@ -272,6 +274,7 @@
272274
<setEntry value="info.elexis.server.fhir.rest.core@3:true"/>
273275
<setEntry value="info.elexis.server.findings.fhir.jpa.service@default:default"/>
274276
<setEntry value="io.curity.oauth.filter.testcert@default:false"/>
277+
<setEntry value="org.apache.felix.gogo.shell.contribution@default:default"/>
275278
</setAttribute>
276279
<booleanAttribute key="show_selected_only" value="false"/>
277280
<booleanAttribute key="tracing" value="false"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
@RunWith(Suite.class)
88
@SuiteClasses({ AllergyIntoleranceTest.class, PersonResourceProviderTest.class, PatientResourceProviderTest.class,
9-
OrganizationResourceProviderTest.class, AppointmentResourceTest.class, CoverageTest.class, ScheduleResourceTest.class,
10-
PractitionerRoleTest.class, ConditionTest.class, ObservationTest.class, FamilyMemberHistoryTest.class,
11-
EncounterTest.class, ServiceRequestTest.class, MedicationRequestTest.class, ClaimTest.class,
12-
DocumentReferenceTest.class, SubscriptionResourceTest.class, PlainResourceProviderTest.class,
9+
OrganizationResourceProviderTest.class, AppointmentResourceProviderTest.class, CoverageTest.class, ScheduleResourceProviderTest.class,
10+
PractitionerRoleTest.class, ConditionResourceProviderTest.class, ObservationResourceProviderTest.class, FamilyMemberHistoryTest.class,
11+
EncounterResourceProviderTest.class, ServiceRequestTest.class, MedicationRequestResourceProviderTest.class, ClaimTest.class,
12+
DocumentReferenceResourceProviderTest.class, SubscriptionResourceTest.class, PlainResourceProviderTest.class,
1313
ImmunizationTest.class, TaskResourceTest.class, CareTeamTest.class, MedicationTest.class })
1414
public class AllResourceTests {
1515

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/AppointmentResourceTest.java renamed to tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/AppointmentResourceProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import info.elexis.server.fhir.rest.core.test.AllTests;
3434
import info.elexis.server.fhir.rest.core.test.FhirUtil;
3535

36-
public class AppointmentResourceTest {
36+
public class AppointmentResourceProviderTest {
3737

3838
private static IGenericClient client;
3939

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import info.elexis.server.fhir.rest.core.test.AllTests;
3939
import info.elexis.server.fhir.rest.core.test.FhirUtil;
4040

41-
public class ConditionTest {
41+
public class ConditionResourceProviderTest {
4242

4343
private static IGenericClient client;
4444

tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/DocumentReferenceTest.java renamed to tests/es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/DocumentReferenceResourceProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import info.elexis.server.fhir.rest.core.test.AllTests;
5656
import info.elexis.server.fhir.rest.core.test.FhirUtil;
5757

58-
public class DocumentReferenceTest {
58+
public class DocumentReferenceResourceProviderTest {
5959

6060
private static IGenericClient client;
6161

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import info.elexis.server.fhir.rest.core.test.AllTests;
3939
import info.elexis.server.fhir.rest.core.test.FhirUtil;
4040

41-
public class EncounterTest {
41+
public class EncounterResourceProviderTest {
4242

4343
private static IGenericClient client;
4444

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import info.elexis.server.fhir.rest.core.test.AllTests;
4949
import info.elexis.server.fhir.rest.core.test.FhirUtil;
5050

51-
public class MedicationRequestTest {
51+
public class MedicationRequestResourceProviderTest {
5252

5353
private static IGenericClient client;
5454

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import info.elexis.server.fhir.rest.core.test.AllTests;
4646
import info.elexis.server.fhir.rest.core.test.FhirUtil;
4747

48-
public class ObservationTest {
48+
public class ObservationResourceProviderTest {
4949

5050
private static IGenericClient client;
5151

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
import ca.uhn.fhir.rest.client.api.IGenericClient;
3838
import ca.uhn.fhir.rest.gclient.IReadExecutable;
3939
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
40-
import ch.elexis.core.constants.XidConstants;
4140
import ch.elexis.core.fhir.FhirChConstants;
4241
import ch.elexis.core.model.IPatient;
4342
import ch.elexis.core.test.TestEntities;
4443
import ch.elexis.core.test.initializer.TestDatabaseInitializer;
44+
import ch.elexis.core.time.TimeUtil;
4545
import info.elexis.server.fhir.rest.core.test.AllTests;
4646
import info.elexis.server.fhir.rest.core.test.FhirUtil;
4747

@@ -184,7 +184,7 @@ public void getPatientProperties() {
184184
assertEquals("Test", name.getGivenAsSingleString());
185185
Date dob = readPatient.getBirthDate();
186186
assertNotNull(dob);
187-
assertEquals(LocalDate.of(1990, Month.JANUARY, 1), AllTests.getLocalDateTime(dob).toLocalDate());
187+
assertEquals(LocalDate.of(1990, Month.JANUARY, 1), TimeUtil.toLocalDateTime(dob).toLocalDate());
188188
assertEquals(AdministrativeGender.FEMALE, readPatient.getGender());
189189
List<ContactPoint> telcoms = readPatient.getTelecom();
190190
assertNotNull(telcoms);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public static void setupClass() throws IOException, SQLException {
5050
assertNotNull(client);
5151
}
5252

53+
/**
54+
* Dieser Test geht davon aus, dass ein Mandant über dessen Benutzer die Rolle
55+
* doctor hat. Das ist hier irrelevant, der Test ist falsch
56+
*/
5357
@Test
5458
public void getPractitionerRole() {
5559
// search by role

0 commit comments

Comments
 (0)