clean up

CMSgov · Mar 11, 2024 · e62c933 · e62c933
1 parent 982beb2
commit e62c933
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/optout/src/main/java/gov/cms/ab2d/optout/OptOutConstants.java b/optout/src/main/java/gov/cms/ab2d/optout/OptOutConstants.java
@@ -4,9 +4,6 @@
 
 public class OptOutConstants {
     public static final String ENDPOINT = "https://s3.amazonaws.com";
-    public static final String TEST_ENDPOINT = "http://127.0.0.1:8001";
-    public static final String TEST_FILE_NAME = "optOutDummy.txt";
-    public static final String TEST_BFD_BUCKET_NAME = "bfd-test-eft";
     public static final Region S3_REGION = Region.US_EAST_1;
     public static final String HEADER_RESP = "HDR_BENEDATARSP";
     public static final String TRAILER_RESP = "TLR_BENEDATARSP";

diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutConstantsTest.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutConstantsTest.java
@@ -0,0 +1,11 @@
+package gov.cms.ab2d.optout;
+
+public class OptOutConstantsTest {
+    public static final String TEST_ENDPOINT = "http://127.0.0.1:8001";
+    public static final String TEST_FILE_NAME = "optOutDummy.txt";
+    public static final String TEST_BUCKET_PATH = "bfdeft01/ab2d";
+    public static final String TEST_BFD_BUCKET_NAME = "bfd-test-eft";
+
+    private OptOutConstantsTest() {
+    }
+}
diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutHandlerTest.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutHandlerTest.java
@@ -21,6 +21,7 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 
+import static gov.cms.ab2d.optout.OptOutConstantsTest.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
@@ -51,8 +52,8 @@ void getBucketAndFileNamesTest() throws IOException, ParseException {
 
         var notification = S3EventNotification.parseJson(s3EventMessage.toString()).getRecords().get(0);
 
-        assertEquals("bfdeft01/ab2d/in/optOutDummy.txt", handler.getFileName(notification));
-        assertEquals("bfd-test-eft", handler.getBucketName(notification));
+        assertEquals(TEST_BUCKET_PATH + "/in/" + TEST_FILE_NAME, handler.getFileName(notification));
+        assertEquals(TEST_BFD_BUCKET_NAME, handler.getBucketName(notification));
     }
 
     @Test

diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutProcessorTest.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutProcessorTest.java
@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.IOException;
@@ -22,6 +21,7 @@
 import java.util.Date;
 
 import static gov.cms.ab2d.optout.OptOutConstants.*;
+import static gov.cms.ab2d.optout.OptOutConstantsTest.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 

diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutS3Test.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutS3Test.java
@@ -12,7 +12,9 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import static gov.cms.ab2d.optout.OptOutConstants.*;
+import static gov.cms.ab2d.optout.OptOutConstants.CONF_FILE_FORMAT;
+import static gov.cms.ab2d.optout.OptOutConstants.CONF_FILE_NAME;
+import static gov.cms.ab2d.optout.OptOutConstantsTest.*;
 import static gov.cms.ab2d.optout.S3MockAPIExtension.S3_CLIENT;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -60,10 +62,9 @@ void deleteFileFromS3Test() {
 
     @Test
     void getOutFileName() {
-        var subFolders = "bfdeft01/ab2d";
-        OPT_OUT_S3 = new OptOutS3(S3_CLIENT, subFolders + "/in/" + TEST_FILE_NAME, TEST_BFD_BUCKET_NAME, mock(LambdaLogger.class));
+        OPT_OUT_S3 = new OptOutS3(S3_CLIENT, TEST_BUCKET_PATH + "/in/" + TEST_FILE_NAME, TEST_BFD_BUCKET_NAME, mock(LambdaLogger.class));
         var outFileName = OPT_OUT_S3.getOutFileName();
-        Assertions.assertTrue(outFileName.startsWith(subFolders + "/out/" + CONF_FILE_NAME));
+        Assertions.assertTrue(outFileName.startsWith(TEST_BUCKET_PATH + "/out/" + CONF_FILE_NAME));
         Assertions.assertTrue(outFileName.endsWith(CONF_FILE_FORMAT));
     }
 }
diff --git a/optout/src/test/java/gov/cms/ab2d/optout/S3MockAPIExtension.java b/optout/src/test/java/gov/cms/ab2d/optout/S3MockAPIExtension.java
@@ -5,11 +5,13 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
 import software.amazon.awssdk.services.s3.model.*;
 
 import java.net.URI;
 
-import static gov.cms.ab2d.optout.OptOutConstants.*;
+import static gov.cms.ab2d.optout.OptOutConstants.S3_REGION;
+import static gov.cms.ab2d.optout.OptOutConstantsTest.*;
 import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL;
 
 public class S3MockAPIExtension implements BeforeAllCallback, ExtensionContext.Store.CloseableResource {
@@ -25,9 +27,10 @@ public void beforeAll(ExtensionContext context) throws Exception {
 
             API.start();
 
-            S3_CLIENT = S3Client.builder()
-                    .region(S3_REGION)
-                    .endpointOverride(new URI(TEST_ENDPOINT))
+            S3ClientBuilder builder = S3Client.builder();
+            builder.region(S3_REGION);
+            builder.endpointOverride(new URI(TEST_ENDPOINT));
+            S3_CLIENT = builder
                     .build();
 
             createBucket();