From a3b9369451ccd859a12983797088a7ed85ccc4d0 Mon Sep 17 00:00:00 2001
From: Nick Allen <nick@nickallen.org>
Date: Tue, 18 Jul 2017 12:39:06 -0400
Subject: [PATCH 1/2] METRON-1048 Intermittent Test Failure for
 SimpleHBaseEnrichmentWriterLoggingTest

---
 .../metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java
index 3949162a69..c84c3bd915 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java
@@ -41,6 +41,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.powermock.api.mockito.PowerMockito.*;
 
@@ -80,7 +81,7 @@ public void shouldWarnOnMissingConfig() {
   @Test
   public void shouldWarnOnMissedConfigConversion() {
     getHbaseTableConfig().getAndConvert(Collections.emptyMap(), String.class);
-    verify(logger).warn("No object of type '{}' found in config", String.class);
+    verify(logger, atLeastOnce()).warn("No object of type '{}' found in config", String.class);
   }
 
   @Test

From b4d0a9965b03ef39987f6dc3f56e0a172c77b08a Mon Sep 17 00:00:00 2001
From: Nick Allen <nick@nickallen.org>
Date: Tue, 18 Jul 2017 14:14:42 -0400
Subject: [PATCH 2/2] Same issue with other test cases

---
 .../writers/SimpleHBaseEnrichmentWriterLoggingTest.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java
index c84c3bd915..9603b76a76 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/writers/SimpleHBaseEnrichmentWriterLoggingTest.java
@@ -41,7 +41,6 @@
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.powermock.api.mockito.PowerMockito.*;
 
@@ -75,7 +74,7 @@ public void setUp() {
   public void shouldWarnOnMissingConfig() {
     SimpleHbaseEnrichmentWriter.Configurations config = getHbaseTableConfig();
     config.get(Collections.emptyMap());
-    verify(logger).warn("No config object found for key: '{}'", config.getKey());
+    verify(logger, atLeastOnce()).warn("No config object found for key: '{}'", config.getKey());
   }
 
   @Test
@@ -99,14 +98,14 @@ public void shouldDebugTransformedMessage() {
     keyTransformer.transform(message);
 
     // Proof the result has been captured
-    verify(logger).debug("Transformed message: '{}'", value);
+    verify(logger, atLeastOnce()).debug("Transformed message: '{}'", value);
   }
 
   @Test
   public void shouldDebugSensorConfig() {
     String sensorName = "someSensor";
     hbaseEnrichmentWriter.configure(sensorName, getMockWriterConfiguration());
-    verify(logger).debug("Sensor: '{}': {Provider: '{}', Converter: '{}'}",
+    verify(logger, atLeastOnce()).debug("Sensor: '{}': {Provider: '{}', Converter: '{}'}",
         sensorName, MockTableProvider.class.getName(), EnrichmentConverter.class.getName());
   }
 
@@ -116,7 +115,7 @@ public void shouldDebugFetchedHBaseTable() throws IOException {
     String tableName = "someTable";
     hbaseEnrichmentWriter.configure(sensorName, getMockWriterConfiguration());
     hbaseEnrichmentWriter.getTable(tableName, COLUMN_FAMILY);
-    verify(logger).debug("Fetching table '{}', column family: '{}'", tableName, COLUMN_FAMILY);
+    verify(logger, atLeastOnce()).debug("Fetching table '{}', column family: '{}'", tableName, COLUMN_FAMILY);
   }
 
   @Test