Skip to content

Fix test inclusion for rX/narrative #2466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotasek merged 3 commits into from
Jun 2, 2026
+26 −30
Merged

Fix test inclusion for rX/narrative #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c69bae
Rename file for inclusion in test suite
dotasek Jun 1, 2026
4a7579e
Unrelated cleanup
dotasek Jun 1, 2026
478be8a
Use test cases SNAPSHOT
dotasek Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 24 additions & 27 deletions org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/OpenApiGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.hl7.fhir.r5.test;

import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;

Expand All @@ -10,14 +8,13 @@
import org.hl7.fhir.r5.model.CapabilityStatement;
import org.hl7.fhir.r5.openapi.OpenApiGenerator;
import org.hl7.fhir.r5.openapi.Writer;
import org.hl7.fhir.r5.test.utils.CompareUtilities;
import org.hl7.fhir.r5.test.utils.TestingUtilities;
import org.hl7.fhir.utilities.filesystem.ManagedFileAccess;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

public class OpenApiGeneratorTest {
class OpenApiGeneratorTest {

@Test
void testBase1() {
Expand All @@ -29,28 +26,28 @@ void testBase1() {
}

@Test
void testBase2() {
assertDoesNotThrow(() -> {
InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-base2.json");
String dfn = TestingUtilities.tempFile("openapi", "swagger-base2.json");
run(sfn, dfn);
});
}

@Test
void testExtendedOperations() {
assertDoesNotThrow(() -> {
InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-r5-extended.json");
String dfn = TestingUtilities.tempFile("openapi", "swagger-extended.json");
run(sfn, dfn);
});
}

public void run(InputStream sfn, String dfn) throws IOException, FHIRFormatError, FileNotFoundException {
CapabilityStatement cs = (CapabilityStatement) new JsonParser().parse(sfn);
Writer oa = new Writer(ManagedFileAccess.outStream(dfn));
OpenApiGenerator gen = new OpenApiGenerator(TestingUtilities.getSharedWorkerContext(), cs, oa);
gen.generate("test-lic", "http://spdx.org/licenses/test-lic.html");
void testBase2() {
assertDoesNotThrow(() -> {
InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-base2.json");
String dfn = TestingUtilities.tempFile("openapi", "swagger-base2.json");
run(sfn, dfn);
});
}
@Test
void testExtendedOperations() {
assertDoesNotThrow(() -> {
InputStream sfn = TestingUtilities.loadTestResourceStream("r5", "openapi", "cs-r5-extended.json");
String dfn = TestingUtilities.tempFile("openapi", "swagger-extended.json");
run(sfn, dfn);
});
}
public void run(InputStream sfn, String dfn) throws IOException, FHIRFormatError {
CapabilityStatement cs = (CapabilityStatement) new JsonParser().parse(sfn);
Writer oa = new Writer(ManagedFileAccess.outStream(dfn));
OpenApiGenerator gen = new OpenApiGenerator(TestingUtilities.getSharedWorkerContext(), cs, oa);
gen.generate("test-lic", "http://spdx.org/licenses/test-lic.html");
oa.commit();
}
}
}
3 changes: 1 addition & 2 deletions ...tive/tests/NarrativeGenerationTestsX.java → ...tive/tests/NarrativeGenerationXTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.hl7.fhir.r5.test.utils.CompareUtilities;
import org.hl7.fhir.r5.test.utils.TestPackageLoader;
import org.hl7.fhir.r5.test.utils.TestingUtilities;
import org.hl7.fhir.r5.utils.structuremap.StructureMapUtilities;
import org.hl7.fhir.utilities.FileUtilities;
import org.hl7.fhir.utilities.TerminologyServiceOptions;
import org.hl7.fhir.utilities.Utilities;
Expand Down Expand Up @@ -56,7 +55,7 @@
import java.util.Map;
import java.util.stream.Stream;

public class NarrativeGenerationTestsX {
public class NarrativeGenerationXTests {

public static class TestProfileKnowledgeProvider implements ProfileKnowledgeProvider {

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<guava_version>32.0.1-jre</guava_version>
<gson_version>2.13.1</gson_version>
<hapi_fhir_version>8.4.0</hapi_fhir_version>
<validator_test_case_version>1.7.62</validator_test_case_version>
<validator_test_case_version>1.7.63-SNAPSHOT</validator_test_case_version>
<jackson_version>2.21.3</jackson_version>
<jackson_annotations_version>2.21</jackson_annotations_version>
<junit_jupiter_version>5.14.0</junit_jupiter_version>
Expand Down
Loading