Updated test cases

CDCgov · Apr 22, 2024 · 4527b4f · 4527b4f
1 parent 517ce25
commit 4527b4f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 29 deletions.
diff --git a/data-ingestion-service/src/main/java/gov/cdc/dataingestion/share/helper/TimeStampHelper.java b/data-ingestion-service/src/main/java/gov/cdc/dataingestion/share/helper/TimeStampHelper.java
@@ -37,11 +37,12 @@ public static Timestamp getCurrentTimeStamp() {
     public static Instant getInstantNow() {
         return Instant.now();
     }
+    @SuppressWarnings("java:S2696")
     @Value("${app.timezone}")
     public void setEnvTimeZone(String envTimeZone){
         timeZone=envTimeZone;
     }
     public String getEnvTimeZone(){
         return timeZone;
     }
-}
+}
diff --git a/...gestion-service/src/test/java/gov/cdc/dataingestion/share/helper/TimeStampHelperTest.java b/...gestion-service/src/test/java/gov/cdc/dataingestion/share/helper/TimeStampHelperTest.java
@@ -1,6 +1,8 @@
 package gov.cdc.dataingestion.share.helper;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -10,36 +12,15 @@
 
 class TimeStampHelperTest {
 
-    @Test
-    void testGetCurrentTimeStampWithEnvTimeZone() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
-        //TimeStampHelper
+    @ParameterizedTest
+    @ValueSource(strings = {"UTC", ""})
+    @NullSource
+    void testGetCurrentTimeStampWithEnvTimeZone(String timeStamp) throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Constructor<TimeStampHelper> pcc = TimeStampHelper.class.getDeclaredConstructor();
         pcc.setAccessible(true);
         TimeStampHelper privateConstructorInstance = pcc.newInstance();
-        privateConstructorInstance.setEnvTimeZone("UTC");
-        assertEquals("UTC", privateConstructorInstance.getEnvTimeZone());
-        assertNotNull(TimeStampHelper.getCurrentTimeStamp());
-    }
-
-    @Test
-    void testGetCurrentTimeStampWithEmptyEnvTimeZone() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
-        //TimeStampHelper
-        Constructor<TimeStampHelper> pcc = TimeStampHelper.class.getDeclaredConstructor();
-        pcc.setAccessible(true);
-        TimeStampHelper privateConstructorInstance = pcc.newInstance();
-        privateConstructorInstance.setEnvTimeZone("");
-        assertEquals("", privateConstructorInstance.getEnvTimeZone());
-        assertNotNull(TimeStampHelper.getCurrentTimeStamp());
-    }
-
-    @Test
-    void testGetCurrentTimeStampWithNullEnvTimeZone() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
-        //TimeStampHelper
-        Constructor<TimeStampHelper> pcc = TimeStampHelper.class.getDeclaredConstructor();
-        pcc.setAccessible(true);
-        TimeStampHelper privateConstructorInstance = pcc.newInstance();
-        privateConstructorInstance.setEnvTimeZone(null);
-        assertEquals(null, privateConstructorInstance.getEnvTimeZone());
+        privateConstructorInstance.setEnvTimeZone(timeStamp);
+        assertEquals(timeStamp, privateConstructorInstance.getEnvTimeZone());
         assertNotNull(TimeStampHelper.getCurrentTimeStamp());
     }
 }