complete tests

Author: jeromevdl

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/LoggingUtilsTest.java

@@ -31,7 +31,7 @@ void setUp() {
     }
 
     @Test
-    void shouldSetCustomKeyOnThreadContext() {
+    void shouldSetCustomKeyInLoggingContext() {
         LoggingUtils.appendKey("org/slf4j/test", "value");
 
         assertThat(MDC.getCopyOfContextMap())
@@ -40,7 +40,7 @@ void shouldSetCustomKeyOnThreadContext() {
     }
 
     @Test
-    void shouldSetCustomKeyAsMapOnThreadContext() {
+    void shouldSetCustomKeyAsMapInLoggingContext() {
         Map<String, String> customKeys = new HashMap<>();
         customKeys.put("org/slf4j/test", "value");
         customKeys.put("test1", "value1");
@@ -54,7 +54,7 @@ void shouldSetCustomKeyAsMapOnThreadContext() {
     }
 
     @Test
-    void shouldRemoveCustomKeyOnThreadContext() {
+    void shouldRemoveCustomKeyInLoggingContext() {
         LoggingUtils.appendKey("org/slf4j/test", "value");
 
         assertThat(MDC.getCopyOfContextMap())
@@ -68,7 +68,7 @@ void shouldRemoveCustomKeyOnThreadContext() {
     }
 
     @Test
-    void shouldRemoveCustomKeysOnThreadContext() {
+    void shouldRemoveCustomKeysInLoggingContext() {
         Map<String, String> customKeys = new HashMap<>();
         customKeys.put("org/slf4j/test", "value");
         customKeys.put("test1", "value1");
@@ -85,4 +85,13 @@ void shouldRemoveCustomKeysOnThreadContext() {
         assertThat(MDC.getCopyOfContextMap())
                 .isEmpty();
     }
+
+    @Test
+    void shouldAddCorrelationIdToLoggingContext() {
+        LoggingUtils.setCorrelationId("correlationID_12345");
+
+        assertThat(MDC.getCopyOfContextMap())
+                .hasSize(1)
+                .containsEntry("correlation_id", "correlationID_12345");
+    }
 }

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java

@@ -192,10 +192,19 @@ void shouldLogDebugWhenSamplingEnvVarEqualsOne() {
 
     @Test
     @SetEnvironmentVariable(key = "POWERTOOLS_LOGGER_SAMPLE_RATE", value = "42")
+    void shouldNotLogDebugWhenSamplingEnvVarIsTooBig() {
+        requestHandler.handleRequest(new Object(), context);
+        File logFile = new File("target/logfile.json");
+        assertThat(contentOf(logFile)).doesNotContain("Test debug event");
+    }
+
+    @Test
+    @SetEnvironmentVariable(key = "POWERTOOLS_LOGGER_SAMPLE_RATE", value = "NotANumber")
     void shouldNotLogDebugWhenSamplingEnvVarIsInvalid() {
         requestHandler.handleRequest(new Object(), context);
         File logFile = new File("target/logfile.json");
         assertThat(contentOf(logFile)).doesNotContain("Test debug event");
+        assertThat(contentOf(logFile)).contains("Skipping sampling rate on environment variable configuration because of invalid value");
     }
 
     @Test