Merge branch 'develop' into MAT-7947

MeasureAuthoringTool · Dec 4, 2024 · 765e9d8 · 765e9d8
2 parents ca74104 + c218203
commit 765e9d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.11</version>
+    <version>3.4.0</version>
     <relativePath></relativePath>
     <!-- lookup parent from repository -->
   </parent>
@@ -69,22 +69,18 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>${junit-jupiter.version}</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>${junit-jupiter.version}</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>${junit-jupiter.version}</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${junit-jupiter.version}</version>
     </dependency>
     <!-- END: needed to fix mismatched versions coming from above
 			mongock -->
@@ -147,7 +143,7 @@
     <dependency>
       <groupId>ca.uhn.hapi.fhir</groupId>
       <artifactId>hapi-fhir-structures-r4</artifactId>
-      <version>6.4.0</version>
+      <version>7.6.0</version>
       <exclusions>
         <exclusion>
           <artifactId>okhttp</artifactId>

diff --git a/src/test/java/cms/gov/madie/measure/config/AssignTestCaseSequentialIdTest.java b/src/test/java/cms/gov/madie/measure/config/AssignTestCaseSequentialIdTest.java
@@ -47,12 +47,13 @@ class AssignTestCaseSequentialIdTest {
 
   @BeforeEach
   public void setup() {
-    tc5 = TestCase.builder().id("TC5").name("TC%").createdAt(Instant.now()).build();
-    tc1 = TestCase.builder().id("TC1").name("TC1").createdAt(Instant.now()).build();
-    tc4 = TestCase.builder().id("TC4").name("TC4").createdAt(Instant.now()).build();
-    tc3 = TestCase.builder().id("TC3").name("TC3").createdAt(Instant.now()).build();
-    tc6 = TestCase.builder().id("TC6").name("TC6").createdAt(Instant.now()).build();
-    tc2 = TestCase.builder().id("TC2").name("TC2").createdAt(Instant.now()).build();
+    Instant now = Instant.now();
+    tc5 = TestCase.builder().id("TC5").name("TC%").createdAt(now.plusSeconds(1)).build();
+    tc1 = TestCase.builder().id("TC1").name("TC1").createdAt(now.plusSeconds(2)).build();
+    tc4 = TestCase.builder().id("TC4").name("TC4").createdAt(now.plusSeconds(3)).build();
+    tc3 = TestCase.builder().id("TC3").name("TC3").createdAt(now.plusSeconds(4)).build();
+    tc6 = TestCase.builder().id("TC6").name("TC6").createdAt(now.plusSeconds(5)).build();
+    tc2 = TestCase.builder().id("TC2").name("TC2").createdAt(now.plusSeconds(6)).build();
 
     measure1 =
         Measure.builder()