Merge pull request #5 from MeasureAuthoringTool/MAT-6179-6180

MAT-6179 & 6180 remove 'v' from file names
MeasureAuthoringTool · Dec 27, 2023 · 850a929 · 850a929
2 parents 07b51e8 + 35998ac
commit 850a929
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/gov/cms/madie/services/PackagingService.java b/src/main/java/gov/cms/madie/services/PackagingService.java
@@ -31,7 +31,7 @@ public byte[] createMeasurePackage(Measure measure, String accessToken) {
     String cqlDir = "cql/";
     Map<String, byte[]> entries = new HashMap<>();
     for (TranslatedLibrary translatedLibrary : translatedLibraries) {
-      String entryName = translatedLibrary.getName() + "-v" + translatedLibrary.getVersion();
+      String entryName = translatedLibrary.getName() + "-" + translatedLibrary.getVersion();
       entries.put(resourcesDir + entryName + ".json", translatedLibrary.getElmJson().getBytes());
       entries.put(resourcesDir + entryName + ".xml", translatedLibrary.getElmXml().getBytes());
       entries.put(cqlDir + entryName + ".cql", translatedLibrary.getCql().getBytes());

diff --git a/src/test/java/gov/cms/madie/services/PackagingServiceTest.java b/src/test/java/gov/cms/madie/services/PackagingServiceTest.java
@@ -18,7 +18,6 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
@@ -63,7 +62,11 @@ void testCreateMeasurePackage() {
     when(translationServiceClient.getTranslatedLibraries(measure.getCql(), TOKEN))
         .thenReturn(List.of(library1, library2));
     byte[] packageContents = packagingService.createMeasurePackage(measure, TOKEN);
-    assertNotNull(packageContents);
+    String packageString = new String(packageContents);
+    String library1FileName = library1.getName() + "-" + library1.getVersion();
+    assertThat(packageString, containsString(library1FileName + ".cql"));
+    assertThat(packageString, containsString(library1FileName + ".xml"));
+    assertThat(packageString, containsString(library1FileName + ".json"));
   }
 
   @Test