From 29efbc9e57bf4bbb67dccd930641cfa540dd4691 Mon Sep 17 00:00:00 2001
From: Peter Orova <llemec@gmail.com>
Date: Mon, 10 Aug 2020 14:43:02 +0200
Subject: [PATCH 1/2] checkstyle fix

---
 hadoop-hdds/common/pom.xml                    |  5 ++
 .../ozone/audit/TestOzoneAuditLogger.java     | 62 +++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 1f0b3e61f73a..2b2fff3918b7 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -183,6 +183,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdds-interface-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
index 55ba6ab72fa7..ec403ba578a5 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
@@ -25,13 +25,20 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.apache.hadoop.ozone.audit.AuditEventStatus.FAILURE;
 import static org.apache.hadoop.ozone.audit.AuditEventStatus.SUCCESS;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import org.hamcrest.Matcher;
+import org.hamcrest.collection.IsIterableContainingInOrder;
+
 
 /**
  * Test Ozone Audit Logger.
@@ -143,7 +150,35 @@ public void notLogReadEvents() throws IOException {
     verifyNoLog();
   }
 
-  private void verifyLog(String expected) throws IOException {
+  /**
+   * Test to verify if multiline entries can be checked.
+   */
+
+  @Test
+  public void messageIncludesMultilineException() throws IOException {
+    String exceptionMessage = "Dummy exception message";
+    TestException testException = new TestException(exceptionMessage);
+    AuditMessage exceptionAuditMessage =
+        new AuditMessage.Builder()
+            .setUser(USER)
+            .atIp(IP_ADDRESS)
+            .forOperation(DummyAction.CREATE_VOLUME)
+            .withParams(PARAMS)
+            .withResult(FAILURE)
+            .withException(testException).build();
+    AUDIT.logWriteFailure(exceptionAuditMessage);
+    verifyLog(
+        "ERROR | OMAudit | user=john | "
+            + "ip=192.168.0.1 | op=CREATE_VOLUME "
+            + "{key1=value1, key2=value2} | ret=FAILURE",
+        "org.apache.hadoop.ozone.audit."
+            + "TestOzoneAuditLogger$TestException: Dummy exception message",
+        "at org.apache.hadoop.ozone.audit.TestOzoneAuditLogger"
+            + ".messageIncludesMultilineException"
+            + "(TestOzoneAuditLogger.java:160) [test-classes/:?]");
+  }
+
+  private void verifyLog(String... expectedStrings) throws IOException {
     File file = new File("audit.log");
     List<String> lines = FileUtils.readLines(file, (String)null);
     final int retry = 5;
@@ -158,11 +193,11 @@ private void verifyLog(String expected) throws IOException {
       }
       i++;
     }
-
-    // When log entry is expected, the log file will contain one line and
-    // that must be equal to the expected string
-    assertTrue(lines.size() != 0);
-    assertTrue(expected.equalsIgnoreCase(lines.get(0)));
+    //check if every expected string can be found in the log entry
+    assertThat(
+        lines.subList(0, expectedStrings.length),
+        containsInOrder(expectedStrings)
+    );
     //empty the file
     lines.clear();
     FileUtils.writeLines(file, lines, false);
@@ -174,4 +209,19 @@ private void verifyNoLog() throws IOException {
     // When no log entry is expected, the log file must be empty
     assertEquals(0, lines.size());
   }
+
+  private class TestException extends Exception{
+    TestException(String message) {
+      super(message);
+    }
+  }
+
+  private Matcher<Iterable<? extends String>> containsInOrder(
+      String[] expectedStrings) {
+    return IsIterableContainingInOrder.contains(
+        Arrays.stream(expectedStrings)
+            .map(str -> containsString(str))
+            .collect(Collectors.toList())
+    );
+  }
 }

From 4f32464052a55416140758f138c6e9d9e6e1a98b Mon Sep 17 00:00:00 2001
From: Peter Orova <llemec@gmail.com>
Date: Tue, 11 Aug 2020 07:15:14 +0200
Subject: [PATCH 2/2] removed line number from test as suggested in review

---
 .../org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
index ec403ba578a5..30cdc62c5dc3 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/audit/TestOzoneAuditLogger.java
@@ -175,7 +175,7 @@ public void messageIncludesMultilineException() throws IOException {
             + "TestOzoneAuditLogger$TestException: Dummy exception message",
         "at org.apache.hadoop.ozone.audit.TestOzoneAuditLogger"
             + ".messageIncludesMultilineException"
-            + "(TestOzoneAuditLogger.java:160) [test-classes/:?]");
+            + "(TestOzoneAuditLogger.java");
   }
 
   private void verifyLog(String... expectedStrings) throws IOException {