Merge pull request #38 from newrelic/add-test-for-logback-custom-args

Add test for logback custom args

Author: jasonjkeller

logback/src/test/java/com/newrelic/logging/logback/NewRelicLogbackTests.java

@@ -76,7 +76,6 @@ void shouldAppendCallerDataToJsonCorrectly() throws Throwable {
         thenTheCallerDataIsInTheMessage();
     }
 
-
     @Test
     @Timeout(3)
     void shouldAppendErrorDataCorrectly() throws Throwable {
@@ -88,6 +87,17 @@ void shouldAppendErrorDataCorrectly() throws Throwable {
         thenTheExceptionDataIsInTheMessage();
     }
 
+    @Test
+    @Timeout(3)
+    void shouldAppendCustomArgsToJsonCorrectly() throws Throwable {
+        givenMockAgentData();
+        givenARedirectedAppender();
+        givenALoggingEventWithCustomArgs();
+        whenTheEventIsAppended();
+        thenJsonLayoutWasUsed();
+        thenTheCustomArgsAreInTheMessage();
+    }
+
     private void givenMockAgentData() {
         Agent mockAgent = Mockito.mock(Agent.class);
         Mockito.when(mockAgent.getLinkingMetadata()).thenReturn(ImmutableMap.of("some.key", "some.value"));
@@ -114,6 +124,16 @@ private void givenALoggingEventWithCallerData() {
         event.setCallerData(new StackTraceElement[] { new Exception().getStackTrace()[0] });
     }
 
+    private void givenALoggingEventWithCustomArgs() {
+        givenALoggingEvent();
+        CustomArgument customArgument1 = new CustomArgument("customKey1", "customValue1");
+        CustomArgument customArgument2 = new CustomArgument("customKey2", "customValue2");
+        Object[] customArgs = new Object[2];
+        customArgs[0] = customArgument1;
+        customArgs[1] = customArgument2;
+        event.setArgumentArray(customArgs);
+    }
+
     private void givenARedirectedAppender() {
         NewRelicEncoder encoder = new NewRelicEncoder();
         encoder.start();
@@ -172,6 +192,13 @@ private void thenTheExceptionDataIsInTheMessage() throws Throwable {
         );
     }
 
+    private void thenTheCustomArgsAreInTheMessage() throws Throwable {
+        LogAsserts.assertFieldValues(
+                getOutput(),
+                ImmutableMap.of("customKey1", "customValue1", "customKey2", "customValue2")
+        );
+    }
+
     private String getOutput() throws IOException {
         if (output == null) {
             output = bufferedReader.readLine() + "\n";