diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9eb08d3a..e9a988274 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: maven: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: distribution: 'temurin' @@ -31,11 +31,12 @@ jobs: MAVEN_USERNAME: ${{ vars.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - name: Publish test report - uses: mikepenz/action-junit-report@v3 + uses: mikepenz/action-junit-report@v4 if: success() || failure() # always run even if the previous step fails with: report_paths: "**/target/surefire-reports/TEST-*.xml" + job_name: "Build" - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml index 2f903bf2f..df7f80c1f 100644 --- a/.github/workflows/check-pr.yaml +++ b/.github/workflows/check-pr.yaml @@ -1,6 +1,8 @@ name: Check PR -on: pull_request - +on: + pull_request: + types: [opened, reopened, synchronize] + permissions: checks: write @@ -11,11 +13,11 @@ concurrency: jobs: maven: strategy: - matrix: - os: [ubuntu-latest, windows-latest] + matrix: + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: distribution: 'temurin' @@ -26,12 +28,13 @@ jobs: - name: Tests and additional checks run: ./mvnw --batch-mode --no-transfer-progress -T 4 verify -Ppackage - name: Publish test report - uses: mikepenz/action-junit-report@v3 - if: success() || failure() # always run even if the previous step fails + uses: mikepenz/action-junit-report@v4 + if: (success() || failure()) && matrix.os == 'ubuntu-latest' with: report_paths: "**/target/surefire-reports/TEST-*.xml" + job_name: "Check PR" - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 if: matrix.os == 'ubuntu-latest' env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 000000000..8488a4fce --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,10 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \ No newline at end of file diff --git a/codecov.yaml b/codecov.yaml index dc23e5c48..4bda553ab 100644 --- a/codecov.yaml +++ b/codecov.yaml @@ -10,7 +10,7 @@ coverage: patch: default: # basic - target: 80 + target: 80% threshold: 0% base: auto # advanced diff --git a/config/checkstyle.xml b/config/checkstyle.xml new file mode 100644 index 000000000..985f50060 --- /dev/null +++ b/config/checkstyle.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ce8678749..11d396761 100644 --- a/pom.xml +++ b/pom.xml @@ -5,18 +5,21 @@ org.opencds.cqf tooling-parent - 3.2.0-SNAPSHOT + 3.2.0 pom UTF-8 UTF-8 - 3.6.0 - 6.10.2 - 6.1.2.2 + 11 + 3.8.0 + 7.0.0 2.1.5.RELEASE 2.0.5 + 11.0.20 + 2.24.1 + 10.12.7 CQF Tooling @@ -113,6 +116,14 @@ pom import + + ca.uhn.hapi.fhir + hapi-fhir-bom + ${hapi.version} + pom + import + + info.cqframework engine @@ -198,13 +209,11 @@ jakarta.xml.bind jakarta.xml.bind-api - 4.0.1 jakarta.activation jakarta.activation-api - 2.1.2 @@ -229,11 +238,6 @@ FastInfoset 1.2.18 - - com.fasterxml.jackson.core - jackson-core - 2.15.2 - org.slf4j @@ -268,6 +272,36 @@ package + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + true + config/checkstyle.xml + + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + + + validate + + check + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + com.diffplug.spotless spotless-maven-plugin @@ -280,10 +314,31 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + true + true + + -XDcompilePolicy=simple + + -Xplugin:ErrorProne -XepDisableAllWarnings -Xep:DoubleBraceInitialization:OFF + + + + com.google.errorprone + error_prone_core + ${error-prone.version} + + + + org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 @@ -299,23 +354,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 11 - 11 - 11 - true - false - true - - -Xlint:all,-processing - -Werror - - - org.apache.maven.plugins maven-jar-plugin @@ -418,7 +456,7 @@ maven-surefire-plugin 3.0.0-M5 - -Xmx4096m + -Xmx1024M @@ -426,7 +464,7 @@ maven-failsafe-plugin 3.0.0-M5 - -Xmx4096m + -Xmx1024M ${project.build.outputDirectory} @@ -441,22 +479,22 @@ - + + org.apache.maven.plugins - maven-source-plugin + maven-compiler-plugin org.apache.maven.plugins - maven-javadoc-plugin + maven-surefire-plugin org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M5 @@ -478,6 +516,20 @@ org.jacoco jacoco-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1024M ${argLine} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + -Xmx1024M ${argLine} + + @@ -509,6 +561,20 @@ org.sonatype.plugins nexus-staging-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1024M ${argLine} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + -Xmx1024M ${argLine} + + diff --git a/tooling-cli/pom.xml b/tooling-cli/pom.xml index be8a8666d..89fb2e32e 100644 --- a/tooling-cli/pom.xml +++ b/tooling-cli/pom.xml @@ -6,11 +6,11 @@ org.opencds.cqf tooling-parent - 3.2.0-SNAPSHOT + 3.2.0 tooling-cli - 3.2.0-SNAPSHOT + 3.2.0 jar CQF Tooling CLI @@ -19,7 +19,7 @@ org.opencds.cqf tooling - 3.2.0-SNAPSHOT + 3.2.0 diff --git a/tooling-ui/pom.xml b/tooling-ui/pom.xml index 98d50b5e0..aa032787f 100644 --- a/tooling-ui/pom.xml +++ b/tooling-ui/pom.xml @@ -6,11 +6,11 @@ org.opencds.cqf tooling-parent - 3.2.0-SNAPSHOT + 3.2.0 tooling-ui - 3.2.0-SNAPSHOT + 3.2.0 jar CQF Tooling UI @@ -19,7 +19,7 @@ org.opencds.cqf tooling - 3.2.0-SNAPSHOT + 3.2.0 org.openjfx diff --git a/tooling/pom.xml b/tooling/pom.xml index 7943113d1..4d499e50b 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -6,11 +6,11 @@ org.opencds.cqf tooling-parent - 3.2.0-SNAPSHOT + 3.2.0 tooling - 3.2.0-SNAPSHOT + 3.2.0 jar @@ -75,27 +75,6 @@ 1.5.0 - - - ca.uhn.hapi.fhir - org.hl7.fhir.dstu3 - ${core.version} - - - ca.uhn.hapi.fhir - org.hl7.fhir.r4 - ${core.version} - - - ca.uhn.hapi.fhir - org.hl7.fhir.r5 - ${core.version} - - - ca.uhn.hapi.fhir - org.hl7.fhir.convertors - ${core.version} - xpp3 @@ -103,65 +82,47 @@ 1.1.4c runtime - - ca.uhn.hapi.fhir - org.hl7.fhir.validation - ${core.version} - - - xpp3 - xpp3 - - - - - ca.uhn.hapi.fhir - org.hl7.fhir.utilities - ${core.version} - ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - ${hapi.version} ca.uhn.hapi.fhir hapi-fhir-structures-r4 - ${hapi.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-r4 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - ${hapi.version} ca.uhn.hapi.fhir hapi-fhir-base - ${hapi.version} ca.uhn.hapi.fhir hapi-fhir-validation - ${hapi.version} + ca.uhn.hapi.fhir - hapi-fhir-validation-resources-r4 - ${hapi.version} + hapi-fhir-converter ca.uhn.hapi.fhir - hapi-fhir-converter + hapi-fhir-caching-caffeine ${hapi.version} ca.uhn.hapi.fhir hapi-fhir-client - ${hapi.version} @@ -209,27 +170,11 @@ thymeleaf 3.0.14.RELEASE - - com.fasterxml.jackson.core - jackson-databind - 2.13.4.2 - - - com.github.ben-manes.caffeine - caffeine - 2.9.1 - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - 2.14.2 - compile - - jakarta.xml.bind jakarta.xml.bind-api + 4.0.1 @@ -252,6 +197,13 @@ org.eclipse.persistence.moxy + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + 2.16.1 + + org.slf4j slf4j-api @@ -353,7 +305,7 @@ org.wiremock wiremock - 3.0.3 + 3.4.2 test @@ -383,5 +335,66 @@ + + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-security + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-io + ${jetty.version} + + + org.eclipse.jetty.http2 + http2-server + ${jetty.version} + + + org.eclipse.jetty.http2 + http2-common + ${jetty.version} + + + org.eclipse.jetty.http2 + http2-hpack + ${jetty.version} + + + + \ No newline at end of file diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/ExampleBuilder.java b/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/ExampleBuilder.java index b26bdac93..1275f7b82 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/ExampleBuilder.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/ExampleBuilder.java @@ -548,6 +548,9 @@ else if (value instanceof String) { return null; } + // See https://errorprone.info/bugpattern/FromTemporalAccessor + // Some conversions of LocalDate, LocalDateTime, and Instant to Instant are not supported + @SuppressWarnings("FromTemporalAccessor") private Instant toInstant(Object value) { if (value instanceof Instant) { return (Instant)value; diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementBindingVisitor.java b/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementBindingVisitor.java index 6edcdd547..047abeac4 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementBindingVisitor.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementBindingVisitor.java @@ -71,7 +71,7 @@ private void getBindings(String sdName, List eds, String sdUR sdbo.setSdURL(sdURL); sdbo.setSdVersion(sdVersion); sdbo.setBindingStrength(ed.getBinding().getStrength().toString().toLowerCase()); - if(ed.hasMin() && ed.hasMin()){ + if(ed.hasMin()){ String edCardinality = ed.getMin() + "..." + ed.getMax(); sdbo.setCardinality(edCardinality); } diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementVisitor.java b/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementVisitor.java index 270d317e1..194de7b5f 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementVisitor.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/StructureDefinitionElementVisitor.java @@ -70,7 +70,7 @@ private void getElements(String sdName, List eds, String sdUR sdeo.setSdName(sdName); sdeo.setSdURL(sdURL); sdeo.setSdVersion(sdVersion); - if (ed.hasMin() && ed.hasMin()) { + if (ed.hasMin()) { String edCardinality = ed.getMin() + "..." + ed.getMax(); sdeo.setCardinality(edCardinality); } diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/cql_generation/builder/VmrToModelElmBuilder.java b/tooling/src/main/java/org/opencds/cqf/tooling/cql_generation/builder/VmrToModelElmBuilder.java index a235b0721..d2159fd6b 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/cql_generation/builder/VmrToModelElmBuilder.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/cql_generation/builder/VmrToModelElmBuilder.java @@ -583,9 +583,7 @@ public Retrieve resolveRetrieve(LibraryBuilder libraryBuilder, String resource, break; default: - // ERROR: - // WARNING: - libraryBuilder.recordParsingException(new CqlSemanticException(String.format("Unknown code comparator % in retrieve", codeComparator), + libraryBuilder.recordParsingException(new CqlSemanticException(String.format("Unknown code comparator %s in retrieve", codeComparator), useStrictRetrieveTyping ? CqlCompilerException.ErrorSeverity.Error : CqlCompilerException.ErrorSeverity.Warning)); } @@ -847,7 +845,7 @@ public BigDecimal parseDecimal(String value) { BigDecimal result = (BigDecimal)decimalFormat.parse(value); return result; } catch (ParseException e) { - throw new IllegalArgumentException(String.format("Could not parse number literal: %s", value, e)); + throw new IllegalArgumentException(String.format("Could not parse number literal: %s", value), e); } } diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/processor/IGTestProcessor.java b/tooling/src/main/java/org/opencds/cqf/tooling/processor/IGTestProcessor.java index 5c5ca7cd6..e3399de56 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/processor/IGTestProcessor.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/processor/IGTestProcessor.java @@ -96,8 +96,7 @@ private IBaseResource getServerMetadata(String testServerUri) { return result; } catch (Exception ex) { - LogUtils.putException(String.format("Error retrieving metadata from: 's%'.", path), ex); - //TODO: Error/Message handling + LogUtils.putException(String.format("Error retrieving metadata from: '%s'.", path), ex); return null; } } @@ -151,8 +150,7 @@ private CqfmSoftwareSystem getCqfRulerSoftwareSystem(String testServerUri) { } } catch (Exception ex) { - LogUtils.putException(String.format("Error retrieving CapabilityStatement from: 's%'.", testServerUri), ex); - //TODO: Error/Message handling + LogUtils.putException(String.format("Error retrieving CapabilityStatement from: '%s'.", testServerUri), ex); return null; } diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/quick/QuickPageGenerator.java b/tooling/src/main/java/org/opencds/cqf/tooling/quick/QuickPageGenerator.java index 1cb1f476f..8fb9a5521 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/quick/QuickPageGenerator.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/quick/QuickPageGenerator.java @@ -484,7 +484,7 @@ private String mapToCqlType(String type) { case "Coding": return "Code"; case "CodeableConcept": return "Concept"; case "Period": return String.format("Interval<DateTime>", atlas.getCqlIntervalUrl(), atlas.getCqlDateTimeAndTimeUrl()); - case "Range": return String.format("Interval<Quantity>", atlas.getCqlIntervalUrl(), atlas.getCqlQuantityUrl()); + case "Range": return String.format("Interval<Quantity>", atlas.getCqlIntervalUrl(), atlas.getCqlQuantityUrl()); default: return type; } } diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/terminology/SpreadsheetHelper.java b/tooling/src/main/java/org/opencds/cqf/tooling/terminology/SpreadsheetHelper.java index 67a7a9b99..7c0066fa9 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/terminology/SpreadsheetHelper.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/terminology/SpreadsheetHelper.java @@ -84,13 +84,13 @@ public static String protectedString(String rawValue, boolean replace) { } result = result.trim(); if(replace) { - result.replaceAll("\\p{Cntrl}", "?"); - result.replaceAll("\\p{C}", "?"); + result = result.replaceAll("\\p{Cntrl}", "?"); + result = result.replaceAll("\\p{C}", "?"); result = SpreadsheetHelper.cleanseString(result); } else{ - result.replaceAll("\\p{Cntrl}", ""); - result.replaceAll("\\p{C}", ""); + result = result.replaceAll("\\p{Cntrl}", ""); + result = result.replaceAll("\\p{C}", ""); result = SpreadsheetHelper.cleanseStringNoReplacement(result); } return result; diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/terminology/VSACValueSetGenerator.java b/tooling/src/main/java/org/opencds/cqf/tooling/terminology/VSACValueSetGenerator.java index 27e154323..ea2130c3b 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/terminology/VSACValueSetGenerator.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/terminology/VSACValueSetGenerator.java @@ -160,7 +160,7 @@ public void resolveMetaData(ValueSet vs, Workbook workbook) { String id = getSecondStringInRow(metaSheet, metaOidRow); //id isn't required by FHIR, but like system and code, we're requiring it. if (id == null || id.equals("")) { - throw new IllegalArgumentException(String.format("No id value found for ValueSet: %d", vs.getTitle() == null || vs.getTitle().equals("") ? "untitled" : vs.getTitle())); + throw new IllegalArgumentException(String.format("No id value found for ValueSet: %s", vs.getTitle() == null || vs.getTitle().equals("") ? "untitled" : vs.getTitle())); } vs.setId(id); diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/utilities/R4FHIRUtils.java b/tooling/src/main/java/org/opencds/cqf/tooling/utilities/R4FHIRUtils.java index 6204f7930..dd55afdc6 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/utilities/R4FHIRUtils.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/utilities/R4FHIRUtils.java @@ -123,8 +123,8 @@ public static CompiledLibrary resolveLibrary(String localLibraryName, CompiledLi } public static CompiledLibrary resolveLibrary(LibraryManager libraryManager, VersionedIdentifier libraryIdentifier) { - if (libraryManager.getCompiledLibraries().containsKey(libraryIdentifier.getId())) { - return libraryManager.getCompiledLibraries().get(libraryIdentifier.getId()); + if (libraryManager.getCompiledLibraries().containsKey(libraryIdentifier)) { + return libraryManager.getCompiledLibraries().get(libraryIdentifier); } throw new IllegalArgumentException(String.format("Could not resolve reference to translated library %s", libraryIdentifier.getId())); diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/utilities/STU3FHIRUtils.java b/tooling/src/main/java/org/opencds/cqf/tooling/utilities/STU3FHIRUtils.java index 7f7dedf46..673cbe319 100644 --- a/tooling/src/main/java/org/opencds/cqf/tooling/utilities/STU3FHIRUtils.java +++ b/tooling/src/main/java/org/opencds/cqf/tooling/utilities/STU3FHIRUtils.java @@ -115,8 +115,8 @@ public static CompiledLibrary resolveLibrary(String localLibraryName, CompiledLi } public static CompiledLibrary resolveLibrary(LibraryManager libraryManager, VersionedIdentifier libraryIdentifier) { - if (libraryManager.getCompiledLibraries().containsKey(libraryIdentifier.getId())) { - return libraryManager.getCompiledLibraries().get(libraryIdentifier.getId()); + if (libraryManager.getCompiledLibraries().containsKey(libraryIdentifier)) { + return libraryManager.getCompiledLibraries().get(libraryIdentifier); } throw new IllegalArgumentException(String.format("Could not resolve reference to translated library %s", libraryIdentifier.getId())); diff --git a/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToResourcesTest.java b/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToResourcesTest.java index 83e11b888..e5e9de042 100644 --- a/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToResourcesTest.java +++ b/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToResourcesTest.java @@ -20,7 +20,7 @@ public void testExecute_BundleDecomposition() { String relativeJsonPath = "src/main/resources/libraryevaluationtest-bundle.json"; String jsonFilePath = projectPath + File.separator + relativeJsonPath; - String relativePath = "tooling-cli/bundleResourcesResults"; + String relativePath = "target/test-output/bundleResourcesResults"; String[] args = new String[4]; args[0] = "-BundleToResources"; diff --git a/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToTransactionOperationTest.java b/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToTransactionOperationTest.java index 30a923aed..3703a54ff 100644 --- a/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToTransactionOperationTest.java +++ b/tooling/src/test/java/org/opencds/cqf/tooling/operation/BundleToTransactionOperationTest.java @@ -1,14 +1,11 @@ package org.opencds.cqf.tooling.operation; -import junit.framework.TestCase; import org.testng.Assert; import org.testng.annotations.Test; import java.io.File; -import java.util.HashSet; -import java.util.Set; -public class BundleToTransactionOperationTest extends TestCase { +public class BundleToTransactionOperationTest { private final BundleToTransactionOperation bundleToTransactionOperation = new BundleToTransactionOperation(); private final String PATH_ARGUMENT = "-p="; private final String OUTPUT_PATH_ARGUMENT = "-op="; @@ -21,7 +18,7 @@ public void testExecute_BundleDecomposition() { String relativeJsonPath = "src/main/resources/libraryevaluationtest-bundle.json"; String jsonFilePath = projectPath + File.separator + relativeJsonPath; - String relativePath = "tooling-cli/bundleTransactionResults"; + String relativePath = "target/test-output/bundleTransactionResults"; String[] args = new String[4]; args[0] = "-MakeTransaction"; diff --git a/tooling/src/test/java/org/opencds/cqf/tooling/qdm/QdmToQiCoreTest.java b/tooling/src/test/java/org/opencds/cqf/tooling/qdm/QdmToQiCoreTest.java index e5dab5caf..fe4a05d9a 100644 --- a/tooling/src/test/java/org/opencds/cqf/tooling/qdm/QdmToQiCoreTest.java +++ b/tooling/src/test/java/org/opencds/cqf/tooling/qdm/QdmToQiCoreTest.java @@ -9,10 +9,10 @@ public class QdmToQiCoreTest { private final QdmToQiCore qdmToQiCore = new QdmToQiCore(); - @Test + @Test(enabled = false, description = "Hangs in CI because it makes external network requests") public void testExecute_HtmlFilesCreated() { String projectPath = System.getProperty("user.dir"); - String relativePath = "tooling-cli/results"; + String relativePath = "target/test-output/results"; String[] args = new String[2]; args[0] = "-QdmToQiCore";