Merge pull request #474 from inspector-cochise/junit-dep-remove

Remove old junit4 usage.
This commit is contained in:
Kevin Dougan SmileCDR
2023-01-10 08:18:51 -05:00
committed by GitHub

View File

@@ -15,7 +15,6 @@ import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.dstu3.model.*;
import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,6 +34,8 @@ import java.util.concurrent.TimeUnit;
import static ca.uhn.fhir.util.TestUtil.waitForSize; import static ca.uhn.fhir.util.TestUtil.waitForSize;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties =
@@ -112,11 +113,11 @@ public class ExampleServerDstu3IT implements IServerSupport {
.execute(); .execute();
List<Parameters.ParametersParameterComponent> response = outParams.getParameter(); List<Parameters.ParametersParameterComponent> response = outParams.getParameter();
Assert.assertFalse(response.isEmpty()); assertFalse(response.isEmpty());
Parameters.ParametersParameterComponent component = response.get(0); Parameters.ParametersParameterComponent component = response.get(0);
Assert.assertTrue(component.getResource() instanceof MeasureReport); assertTrue(component.getResource() instanceof MeasureReport);
MeasureReport report = (MeasureReport) component.getResource(); MeasureReport report = (MeasureReport) component.getResource();
Assert.assertEquals("Measure/"+measureId, report.getMeasure()); assertEquals("Measure/"+measureId, report.getMeasure());
} }
private int loadDataFromDirectory(String theDirectoryName) throws IOException { private int loadDataFromDirectory(String theDirectoryName) throws IOException {