rename test files with resource pre-fix

cqframework · Nov 8, 2024 · 59d1f2c · 59d1f2c
1 parent 8d3d6e6
commit 59d1f2c
Show file tree

Hide file tree

Showing 58 changed files with 15 additions and 12 deletions.
diff --git a/...ir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureEvaluatedResourcesTest.java b/...ir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureEvaluatedResourcesTest.java
@@ -25,7 +25,7 @@ public class MeasureEvaluatedResourcesTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureEvaluatedResourcesTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...r-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureImprovementNotationTest.java b/...r-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureImprovementNotationTest.java
@@ -26,7 +26,7 @@ public class MeasureImprovementNotationTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureImprovementNotationTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeIndividualTest.java b/...-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeIndividualTest.java
@@ -29,7 +29,7 @@ public class MeasureReportTypeIndividualTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureReportTypeIndividualTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...hir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeInvalidTest.java b/...hir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeInvalidTest.java
@@ -23,7 +23,7 @@ class MeasureReportTypeInvalidTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureReportTypeInvalidTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSubjectListTest.java b/...cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSubjectListTest.java
@@ -32,7 +32,8 @@ public class MeasureReportTypeSubjectListTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(
+                    getResourcePath(MeasureReportTypeSubjectListTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...hir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSummaryTest.java b/...hir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureReportTypeSummaryTest.java
@@ -29,7 +29,7 @@ public class MeasureReportTypeSummaryTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureReportTypeSummaryTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureSDETest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureSDETest.java
@@ -20,7 +20,7 @@ public class MeasureSDETest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureSDETest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...hir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCohortTest.java b/...hir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCohortTest.java
@@ -29,7 +29,7 @@ public class MeasureScoringTypeCohortTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureScoringTypeCohortTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCompositeTest.java b/...-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeCompositeTest.java
@@ -29,7 +29,7 @@ public class MeasureScoringTypeCompositeTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureScoringTypeCompositeTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...est/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeContinuousVariableTest.java b/...est/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeContinuousVariableTest.java
@@ -29,7 +29,8 @@ public class MeasureScoringTypeContinuousVariableTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureScoringTypeContinuousVariableTest.class) + "/" + CLASS_PATH + "/"
+                    + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeProportionTest.java b/...cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeProportionTest.java
@@ -30,7 +30,8 @@ public class MeasureScoringTypeProportionTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(
+                    getResourcePath(MeasureScoringTypeProportionTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeRatioTest.java b/...fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/r4/MeasureScoringTypeRatioTest.java
@@ -29,7 +29,7 @@ public class MeasureScoringTypeRatioTest {
     private static final String CLASS_PATH = "org/opencds/cqf/fhir/cr/measure/r4";
     private static final Repository repository = new IgRepository(
             FhirContext.forR4Cached(),
-            Paths.get(getResourcePath(MeasureStratifierTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
+            Paths.get(getResourcePath(MeasureScoringTypeRatioTest.class) + "/" + CLASS_PATH + "/" + "MeasureTest"));
     protected Given given = Measure.given().repository(repository);
     private static final TestDataGenerator testDataGenerator = new TestDataGenerator(repository);
 

diff --git a/...Test/resources/library/LibrarySimple.json → ...ources/library/Library-LibrarySimple.json b/...Test/resources/library/LibrarySimple.json → ...ources/library/Library-LibrarySimple.json
diff --git a/.../measure/CohortBooleanAllPopulations.json → .../Measure-CohortBooleanAllPopulations.json b/.../measure/CohortBooleanAllPopulations.json → .../Measure-CohortBooleanAllPopulations.json
diff --git a/.../CohortBooleanExtraInvalidPopulation.json → ...-CohortBooleanExtraInvalidPopulation.json b/.../CohortBooleanExtraInvalidPopulation.json → ...-CohortBooleanExtraInvalidPopulation.json
diff --git a/...measure/CohortBooleanGroupScoringDef.json → ...Measure-CohortBooleanGroupScoringDef.json b/...measure/CohortBooleanGroupScoringDef.json → ...Measure-CohortBooleanGroupScoringDef.json
diff --git a/...e/CohortBooleanMissingReqdPopulation.json → ...e-CohortBooleanMissingReqdPopulation.json b/...e/CohortBooleanMissingReqdPopulation.json → ...e-CohortBooleanMissingReqdPopulation.json
diff --git a/...sources/measure/CohortBooleanSDEList.json → ...measure/Measure-CohortBooleanSDEList.json b/...sources/measure/CohortBooleanSDEList.json → ...measure/Measure-CohortBooleanSDEList.json
diff --git a/...measure/CohortBooleanSDEMissingUsage.json → ...Measure-CohortBooleanSDEMissingUsage.json b/...measure/CohortBooleanSDEMissingUsage.json → ...Measure-CohortBooleanSDEMissingUsage.json
diff --git a/.../measure/CohortBooleanSDESingleValue.json → .../Measure-CohortBooleanSDESingleValue.json b/.../measure/CohortBooleanSDESingleValue.json → .../Measure-CohortBooleanSDESingleValue.json
diff --git a/...urces/measure/CohortBooleanStratCode.json → ...asure/Measure-CohortBooleanStratCode.json b/...urces/measure/CohortBooleanStratCode.json → ...asure/Measure-CohortBooleanStratCode.json
diff --git a/.../measure/CohortBooleanStratComponent.json → .../Measure-CohortBooleanStratComponent.json b/.../measure/CohortBooleanStratComponent.json → .../Measure-CohortBooleanStratComponent.json
diff --git a/...sure/CohortBooleanStratDifferentType.json → ...sure-CohortBooleanStratDifferentType.json b/...sure/CohortBooleanStratDifferentType.json → ...sure-CohortBooleanStratDifferentType.json
diff --git a/...rces/measure/CohortBooleanStratMulti.json → ...sure/Measure-CohortBooleanStratMulti.json b/...rces/measure/CohortBooleanStratMulti.json → ...sure/Measure-CohortBooleanStratMulti.json
diff --git a/...urces/measure/CohortBooleanStratNoId.json → ...asure/Measure-CohortBooleanStratNoId.json b/...urces/measure/CohortBooleanStratNoId.json → ...asure/Measure-CohortBooleanStratNoId.json
diff --git a/...rces/measure/CohortBooleanStratValue.json → ...sure/Measure-CohortBooleanStratValue.json b/...rces/measure/CohortBooleanStratValue.json → ...sure/Measure-CohortBooleanStratValue.json
diff --git a/...measure/CohortResourceAllPopulations.json → ...Measure-CohortResourceAllPopulations.json b/...measure/CohortResourceAllPopulations.json → ...Measure-CohortResourceAllPopulations.json
diff --git a/...asure/CompositeBooleanAllPopulations.json → ...asure-CompositeBooleanAllPopulations.json b/...asure/CompositeBooleanAllPopulations.json → ...asure-CompositeBooleanAllPopulations.json
diff --git a/...tinuousVariableBooleanAllPopulations.json → ...tinuousVariableBooleanAllPopulations.json b/...tinuousVariableBooleanAllPopulations.json → ...tinuousVariableBooleanAllPopulations.json
diff --git a/...ariableBooleanExtraInvalidPopulation.json → ...ariableBooleanExtraInvalidPopulation.json b/...ariableBooleanExtraInvalidPopulation.json → ...ariableBooleanExtraInvalidPopulation.json
diff --git a/...inuousVariableBooleanGroupScoringDef.json → ...inuousVariableBooleanGroupScoringDef.json b/...inuousVariableBooleanGroupScoringDef.json → ...inuousVariableBooleanGroupScoringDef.json
diff --git a/...VariableBooleanMissingReqdPopulation.json → ...VariableBooleanMissingReqdPopulation.json b/...VariableBooleanMissingReqdPopulation.json → ...VariableBooleanMissingReqdPopulation.json
diff --git a/...inuousVariableResourceAllPopulations.json → ...inuousVariableResourceAllPopulations.json b/...inuousVariableResourceAllPopulations.json → ...inuousVariableResourceAllPopulations.json
diff --git a/...sure/ProportionBooleanAllPopulations.json → ...sure-ProportionBooleanAllPopulations.json b/...sure/ProportionBooleanAllPopulations.json → ...sure-ProportionBooleanAllPopulations.json
diff --git a/...portionBooleanExtraInvalidPopulation.json → ...portionBooleanExtraInvalidPopulation.json b/...portionBooleanExtraInvalidPopulation.json → ...portionBooleanExtraInvalidPopulation.json
diff --git a/...ure/ProportionBooleanGroupScoringDef.json → ...ure-ProportionBooleanGroupScoringDef.json b/...ure/ProportionBooleanGroupScoringDef.json → ...ure-ProportionBooleanGroupScoringDef.json
diff --git a/...leanImprovementNotationGroupDecrease.json → ...leanImprovementNotationGroupDecrease.json b/...leanImprovementNotationGroupDecrease.json → ...leanImprovementNotationGroupDecrease.json
diff --git a/...leanImprovementNotationGroupIncrease.json → ...leanImprovementNotationGroupIncrease.json b/...leanImprovementNotationGroupIncrease.json → ...leanImprovementNotationGroupIncrease.json
diff --git a/...anImprovementNotationMeasureAndGroup.json → ...anImprovementNotationMeasureAndGroup.json b/...anImprovementNotationMeasureAndGroup.json → ...anImprovementNotationMeasureAndGroup.json
diff --git a/...anImprovementNotationMeasureDecrease.json → ...anImprovementNotationMeasureDecrease.json b/...anImprovementNotationMeasureDecrease.json → ...anImprovementNotationMeasureDecrease.json
diff --git a/...anImprovementNotationMeasureIncrease.json → ...anImprovementNotationMeasureIncrease.json b/...anImprovementNotationMeasureIncrease.json → ...anImprovementNotationMeasureIncrease.json
diff --git a/...eanImprovementNotationMeasureInvalid.json → ...eanImprovementNotationMeasureInvalid.json b/...eanImprovementNotationMeasureInvalid.json → ...eanImprovementNotationMeasureInvalid.json
diff --git a/...ortionBooleanImprovementNotationNone.json → ...ortionBooleanImprovementNotationNone.json b/...ortionBooleanImprovementNotationNone.json → ...ortionBooleanImprovementNotationNone.json
diff --git a/...oportionBooleanMissingReqdPopulation.json → ...oportionBooleanMissingReqdPopulation.json b/...oportionBooleanMissingReqdPopulation.json → ...oportionBooleanMissingReqdPopulation.json
diff --git a/...BooleanMultiGroupImprovementNotation.json → ...BooleanMultiGroupImprovementNotation.json b/...BooleanMultiGroupImprovementNotation.json → ...BooleanMultiGroupImprovementNotation.json
diff --git a/...ure/ProportionResourceAllPopulations.json → ...ure-ProportionResourceAllPopulations.json b/...ure/ProportionResourceAllPopulations.json → ...ure-ProportionResourceAllPopulations.json
diff --git a/...s/measure/RatioBooleanAllPopulations.json → ...e/Measure-RatioBooleanAllPopulations.json b/...s/measure/RatioBooleanAllPopulations.json → ...e/Measure-RatioBooleanAllPopulations.json
diff --git a/...e/RatioBooleanExtraInvalidPopulation.json → ...e-RatioBooleanExtraInvalidPopulation.json b/...e/RatioBooleanExtraInvalidPopulation.json → ...e-RatioBooleanExtraInvalidPopulation.json
diff --git a/.../measure/RatioBooleanGroupScoringDef.json → .../Measure-RatioBooleanGroupScoringDef.json b/.../measure/RatioBooleanGroupScoringDef.json → .../Measure-RatioBooleanGroupScoringDef.json
diff --git a/...re/RatioBooleanMissingReqdPopulation.json → ...re-RatioBooleanMissingReqdPopulation.json b/...re/RatioBooleanMissingReqdPopulation.json → ...re-RatioBooleanMissingReqdPopulation.json
diff --git a/...urces/measure/RatioBooleanStratValue.json → ...asure/Measure-RatioBooleanStratValue.json b/...urces/measure/RatioBooleanStratValue.json → ...asure/Measure-RatioBooleanStratValue.json
diff --git a/.../measure/RatioResourceAllPopulations.json → .../Measure-RatioResourceAllPopulations.json b/.../measure/RatioResourceAllPopulations.json → .../Measure-RatioResourceAllPopulations.json
diff --git a/...sure/RatioResourceStratDifferentType.json → ...sure-RatioResourceStratDifferentType.json b/...sure/RatioResourceStratDifferentType.json → ...sure-RatioResourceStratDifferentType.json
diff --git a/...rces/measure/RatioResourceStratValue.json → ...sure/Measure-RatioResourceStratValue.json b/...rces/measure/RatioResourceStratValue.json → ...sure/Measure-RatioResourceStratValue.json
diff --git a/...ureTest/tests/group/group-patients-1.json → ...t/tests/group/Group-group-patients-1.json b/...ureTest/tests/group/group-patients-1.json → ...t/tests/group/Group-group-patients-1.json
diff --git a/...st/tests/group/group-practitioners-1.json → ...ts/group/Group-group-practitioners-1.json b/...st/tests/group/group-practitioners-1.json → ...ts/group/Group-group-practitioners-1.json
diff --git a/...st/tests/organization/organization-1.json → ...nization/Organization-organization-1.json b/...st/tests/organization/organization-1.json → ...nization/Organization-organization-1.json
diff --git a/...st/tests/practitioner/practitioner-1.json → ...titioner/Practitioner-practitioner-1.json b/...st/tests/practitioner/practitioner-1.json → ...titioner/Practitioner-practitioner-1.json