[incubator-hop] branch master updated: HOP-2146 Using JUnit Rule TemporaryFolder to avoid file system dependency (#363)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new d966ed1  HOP-2146 Using JUnit Rule TemporaryFolder to avoid file 
system dependency (#363)
d966ed1 is described below

commit d966ed12e54745facadc520c6fc4ec02f119c081
Author: Mahendran Mookkiah <mahendran.mookk...@gmail.com>
AuthorDate: Sat Nov 7 15:49:43 2020 -0500

    HOP-2146 Using JUnit Rule TemporaryFolder to avoid file system dependency 
(#363)
    
    * Using JUnit Rule TemporaryFolder to avoid file system dependency
    
    Signed-off-by: Mahendran Mookkiah <mahendran.mookk...@gmail.com>
    
    * HOP-2146 Using JUnit Rule TemporaryFolder to avoid file system dependency
    
    Signed-off-by: Mahendran Mookkiah <mahendran.mookk...@gmail.com>
    
    * HOP-2146 Using JUnit Rule TemporaryFolder to avoid file system dependency
    
    Signed-off-by: Mahendran Mookkiah <mahendran.mookk...@gmail.com>
---
 .../hop/history/local/LocalAuditManager.java       |  4 +++
 .../org/apache/hop/history/AuditManagerTest.java   | 32 +++++++++++-----------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git 
a/engine/src/main/java/org/apache/hop/history/local/LocalAuditManager.java 
b/engine/src/main/java/org/apache/hop/history/local/LocalAuditManager.java
index 2f481c4..a958144 100644
--- a/engine/src/main/java/org/apache/hop/history/local/LocalAuditManager.java
+++ b/engine/src/main/java/org/apache/hop/history/local/LocalAuditManager.java
@@ -56,6 +56,10 @@ public class LocalAuditManager implements IAuditManager {
     public LocalAuditManager() {
         this.rootFolder = Const.HOP_AUDIT_FOLDER;
     }
+    
+    public LocalAuditManager(String rootFolder) {
+      this.rootFolder = rootFolder;
+    }
 
     @Override
     public void storeEvent(AuditEvent event) throws HopException {
diff --git a/engine/src/test/java/org/apache/hop/history/AuditManagerTest.java 
b/engine/src/test/java/org/apache/hop/history/AuditManagerTest.java
index 44b1489..a6ebba8 100644
--- a/engine/src/test/java/org/apache/hop/history/AuditManagerTest.java
+++ b/engine/src/test/java/org/apache/hop/history/AuditManagerTest.java
@@ -21,25 +21,25 @@
  
******************************************************************************/
 package org.apache.hop.history;
 
-import org.apache.hop.core.exception.HopException;
-import org.apache.hop.history.local.LocalAuditManager;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.Mockito;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import org.apache.hop.core.exception.HopException;
+import org.apache.hop.history.local.LocalAuditManager;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.mockito.Mockito;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-@Ignore
 public class AuditManagerTest {
+  
+    @Rule
+    public TemporaryFolder testFolder = new TemporaryFolder();
 
     @Test
     public void testSingleton() {
@@ -50,7 +50,7 @@ public class AuditManagerTest {
 
     @Test
     public void testHasAnActiveAuditManager() {
-        assertNotNull(AuditManager.getActive());
+      assertNotNull(AuditManager.getActive());
     }
 
     @Test
@@ -95,7 +95,7 @@ public class AuditManagerTest {
 
     @Test
     public void testFindAllEventsWithDefaultAuditManager() throws HopException 
{
-        AuditManager.getInstance().setActiveAuditManager(new 
LocalAuditManager());
+        AuditManager.getInstance().setActiveAuditManager(new 
LocalAuditManager(testFolder.getRoot().getAbsolutePath()));
         String group = "testFindAllEventsWithDefaultAuditManager";
         AuditManager.clearEvents();
         AuditManager.registerEvent(group, "type1", "name1", "operation1");
@@ -112,7 +112,7 @@ public class AuditManagerTest {
 
     @Test
     public void testFindUniqueEventsWithDefaultAuditManager() throws 
HopException {
-        AuditManager.getInstance().setActiveAuditManager(new 
LocalAuditManager());
+        AuditManager.getInstance().setActiveAuditManager(new 
LocalAuditManager(testFolder.getRoot().getAbsolutePath()));
         String group = "testFindUniqueEventsWithDefaultAuditManager";
         AuditManager.clearEvents();
         AuditManager.registerEvent(group, "type1", "name1", "operation1");
@@ -143,7 +143,7 @@ public class AuditManagerTest {
 
     @Test
     public void testClearEvents() throws HopException {
-        AuditManager.getInstance().setActiveAuditManager(new 
LocalAuditManager());
+        AuditManager.getInstance().setActiveAuditManager(new 
LocalAuditManager(testFolder.getRoot().getAbsolutePath()));
         String group = "testClearEvents";
         AuditManager.registerEvent(group, "type1", "name1", "operation1");
         AuditManager.registerEvent(group, "type1", "name1", "operation1");