Skip to content

Commit

Permalink
Default performance year and performance year validation to 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
@saquino0827
saquino0827 committed Oct 2, 2023
1 parent f463c6f commit f89c03c
Show file tree
Hide file tree
Showing 24 changed files with 170 additions and 170 deletions.
2 changes: 1 addition & 1 deletion converter/src/test/java/gov/cms/qpp/acceptance/PcfRoundTripTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Positive Testing Scenarios to check PCF for valid top level attributes and validations
* Ensures:
* - valid apm entity
* - Sample file with valid test tin/npi and measurement sets for 2021 go through without issue.
* - Sample file with valid test tin/npi and measurement sets for 2023 go through without issue.
*/
public class PcfRoundTripTest {
private static JsonWrapper wrapper = new JsonWrapper();
Expand Down
12 changes: 6 additions & 6 deletions converter/src/test/java/gov/cms/qpp/acceptance/ReportingParametersActRoundTripTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,46 +33,46 @@ void testQualityMeasuresContainsPerformanceStart() {
String performanceStart = JsonHelper.readJsonAtJsonPath(json,
"$.measurementSets[0].performanceStart", new TypeRef<String>() { });

assertThat(performanceStart).isEqualTo("2022-01-01");
assertThat(performanceStart).isEqualTo("2023-01-01");
}

@Test
void testQualityMeasuresContainsPerformanceEnd() {
String performanceStart = JsonHelper.readJsonAtJsonPath(json,
"$.measurementSets[0].performanceEnd", new TypeRef<String>() { });

assertThat(performanceStart).isEqualTo("2022-12-31");
assertThat(performanceStart).isEqualTo("2023-12-31");
}

@Test
void testAciSectionContainsPerformanceStart() {
String performanceStart = JsonHelper.readJsonAtJsonPath(json,
"$.measurementSets[1].performanceStart", new TypeRef<String>() { });

assertThat(performanceStart).isEqualTo("2022-02-01");
assertThat(performanceStart).isEqualTo("2023-02-01");
}

@Test
void testAciSectionContainsPerformanceEnd() {
String performanceStart = JsonHelper.readJsonAtJsonPath(json,
"$.measurementSets[1].performanceEnd", new TypeRef<String>() { });

assertThat(performanceStart).isEqualTo("2022-05-31");
assertThat(performanceStart).isEqualTo("2023-05-31");
}

@Test
void testIaContainsPerformanceStart() {
String performanceStart = JsonHelper.readJsonAtJsonPath(json,
"$.measurementSets[2].performanceStart", new TypeRef<String>() { });

assertThat(performanceStart).isEqualTo("2022-01-01");
assertThat(performanceStart).isEqualTo("2023-01-01");
}

@Test
void testIaContainsPerformanceEnd() {
String performanceStart = JsonHelper.readJsonAtJsonPath(json,
"$.measurementSets[2].performanceEnd", new TypeRef<String>() { });

assertThat(performanceStart).isEqualTo("2022-04-30");
assertThat(performanceStart).isEqualTo("2023-04-30");
}
}
12 changes: 6 additions & 6 deletions converter/src/test/java/gov/cms/qpp/acceptance/XpathJsonPathComparisonTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ void compareTopLevelAttributeEntityId() throws XmlException {
@Test
void compareAciMeasurePerformanceEnd() throws XmlException {
String jsonPath = "measurementSets[1].performanceEnd";
helper.executeAttributeTest(jsonPath, "value", "20220531");
helper.executeAttributeTest(jsonPath, "value", "20230531");
}

@Test
void compareAciMeasurePerformanceStart() throws XmlException {
String jsonPath = "measurementSets[1].performanceStart";
helper.executeAttributeTest(jsonPath, "value", "20220201");
helper.executeAttributeTest(jsonPath, "value", "20230201");
}

@Test
Expand All @@ -88,13 +88,13 @@ void compareAciMeasurePerformedMeasureIdAciPea1Denominator() throws XmlException
@Test
void compareIaMeasurePerformanceEnd() throws XmlException {
String jsonPath = "measurementSets[2].performanceEnd";
helper.executeAttributeTest(jsonPath, "value", "20220430");
helper.executeAttributeTest(jsonPath, "value", "20230430");
}

@Test
void compareIaMeasurePerformanceStart() throws XmlException {
String jsonPath = "measurementSets[2].performanceStart";
helper.executeAttributeTest(jsonPath, "value", "20220101");
helper.executeAttributeTest(jsonPath, "value", "20230101");
}

@Test
Expand All @@ -113,13 +113,13 @@ void compareIaMeasurePerformedMeasureIdIaEpa1() throws XmlException {
@Test
void compareQualityMeasurePerformanceEnd() throws XmlException {
String jsonPath = "measurementSets[0].performanceEnd";
helper.executeAttributeTest(jsonPath, "value", "20221231");
helper.executeAttributeTest(jsonPath, "value", "20231231");
}

@Test
void compareQualityMeasurePerformanceStart() throws XmlException {
String jsonPath = "measurementSets[0].performanceStart";
helper.executeAttributeTest(jsonPath, "value", "20220101");
helper.executeAttributeTest(jsonPath, "value", "20230101");
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions ...ter/src/test/java/gov/cms/qpp/conversion/validate/PcfPerformancePeriodValidationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ void setup() {
measureSection.setParent(clinicalDocument);

node = new Node(TemplateId.REPORTING_PARAMETERS_ACT);
node.putValue(ReportingParametersActDecoder.PERFORMANCE_YEAR, "2022");
node.putValue(ReportingParametersActDecoder.PERFORMANCE_START, "20220101");
node.putValue(ReportingParametersActDecoder.PERFORMANCE_END, "20221231");
node.putValue(ReportingParametersActDecoder.PERFORMANCE_YEAR, "2023");
node.putValue(ReportingParametersActDecoder.PERFORMANCE_START, "20230101");
node.putValue(ReportingParametersActDecoder.PERFORMANCE_END, "20231231");
node.setParent(measureSection);
}

Expand Down
16 changes: 8 additions & 8 deletions ...src/test/resources/pcf/acceptance2022/success/PCF-12d-CMS122v10UpperCaseUUID_06202022.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
<documentationOf typeCode="DOC">
<serviceEvent classCode="PCPR">
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1376679399" root="2.16.840.1.113883.4.6"/>
Expand All @@ -129,8 +129,8 @@
</performer>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1245229541" root="2.16.840.1.113883.4.6"/>
Expand Down Expand Up @@ -165,8 +165,8 @@
codeSystem="2.16.840.1.113883.6.96"
displayName="Observation Parameters"/>
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
</act>
</entry>
Expand Down
16 changes: 8 additions & 8 deletions ...src/test/resources/pcf/acceptance2022/success/PCF-12e-CMS165v10UpperCaseUUID_06202022.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
<documentationOf typeCode="DOC">
<serviceEvent classCode="PCPR">
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1376679399" root="2.16.840.1.113883.4.6"/>
Expand All @@ -129,8 +129,8 @@
</performer>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1245229541" root="2.16.840.1.113883.4.6"/>
Expand Down Expand Up @@ -165,8 +165,8 @@
codeSystem="2.16.840.1.113883.6.96"
displayName="Observation Parameters"/>
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
</act>
</entry>
Expand Down
16 changes: 8 additions & 8 deletions ...src/test/resources/pcf/acceptance2022/success/PCF-12f-CMS130v10UpperCaseUUID_06202022.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
<documentationOf typeCode="DOC">
<serviceEvent classCode="PCPR">
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1376679399" root="2.16.840.1.113883.4.6"/>
Expand All @@ -129,8 +129,8 @@
</performer>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1245229541" root="2.16.840.1.113883.4.6"/>
Expand Down Expand Up @@ -165,8 +165,8 @@
codeSystem="2.16.840.1.113883.6.96"
displayName="Observation Parameters"/>
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
</act>
</entry>
Expand Down
16 changes: 8 additions & 8 deletions ...src/test/resources/pcf/acceptance2022/success/PCF-12g-CMS165v10LowerCaseUUID_06202022.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
<documentationOf typeCode="DOC">
<serviceEvent classCode="PCPR">
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1376679399" root="2.16.840.1.113883.4.6"/>
Expand All @@ -129,8 +129,8 @@
</performer>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1245229541" root="2.16.840.1.113883.4.6"/>
Expand Down Expand Up @@ -165,8 +165,8 @@
codeSystem="2.16.840.1.113883.6.96"
displayName="Observation Parameters"/>
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
</act>
</entry>
Expand Down
16 changes: 8 additions & 8 deletions ...erter/src/test/resources/pcf/acceptance2022/success/PCF-16a-CMS122ValidNA-PR_06202022.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
<documentationOf typeCode="DOC">
<serviceEvent classCode="PCPR">
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1376679399" root="2.16.840.1.113883.4.6"/>
Expand All @@ -129,8 +129,8 @@
</performer>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1245229541" root="2.16.840.1.113883.4.6"/>
Expand Down Expand Up @@ -165,8 +165,8 @@
codeSystem="2.16.840.1.113883.6.96"
displayName="Observation Parameters"/>
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
</act>
</entry>
Expand Down
16 changes: 8 additions & 8 deletions ...erter/src/test/resources/pcf/acceptance2022/success/PCF-16b-CMS130ValidNA-PR_06202022.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
<documentationOf typeCode="DOC">
<serviceEvent classCode="PCPR">
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1376679399" root="2.16.840.1.113883.4.6"/>
Expand All @@ -129,8 +129,8 @@
</performer>
<performer typeCode="PRF">
<time>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</time>
<assignedEntity>
<id extension="1245229541" root="2.16.840.1.113883.4.6"/>
Expand Down Expand Up @@ -165,8 +165,8 @@
codeSystem="2.16.840.1.113883.6.96"
displayName="Observation Parameters"/>
<effectiveTime>
<low value="20220101"/>
<high value="20221231"/>
<low value="20230101"/>
<high value="20231231"/>
</effectiveTime>
</act>
</entry>
Expand Down
Loading

0 comments on commit f89c03c

Please sign in to comment.