fix tests in jpo-ode-svcs

CDOT-CV · Jun 30, 2023 · 30897f2 · 30897f2
1 parent 00ba4d6
commit 30897f2
Show file tree

Hide file tree

Showing 17 changed files with 207 additions and 179 deletions.
diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/SerializableMessageProducerPoolTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/SerializableMessageProducerPoolTest.java
@@ -24,8 +24,8 @@
 import java.util.Set;
 
 import org.apache.kafka.clients.producer.Producer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 
 import mockit.Expectations;
@@ -44,7 +44,7 @@ public class SerializableMessageProducerPoolTest {
     @Injectable
     OdeProperties mockOdeProperties;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         new Expectations() {
             {

diff --git a/...e-svcs/src/test/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisherTest.java b/...e-svcs/src/test/java/us/dot/its/jpo/ode/coder/stream/LogFileToAsn1CodecPublisherTest.java
@@ -16,6 +16,7 @@
 package us.dot.its.jpo.ode.coder.stream;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -24,7 +25,7 @@
 import java.util.List;
 
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import mockit.Expectations;
 import mockit.Injectable;
@@ -94,38 +95,42 @@ public void testPublishEOF(@Mocked LogFileParser mockLogFileParser) throws Excep
       assertTrue(dataList.isEmpty());
    }
 
-   @Test(expected = IllegalArgumentException.class)
+   @Test
    public void testPublishThrowsIllegalArgumentException() throws Exception {
-      // If the filename does not follow expected filename pattern,
-      // IllegalArgumentException should be thrown
-      testLogFileToAsn1CodecPublisher.publish(new BufferedInputStream(new ByteArrayInputStream(new byte[0])),
-            "fileName", ImporterFileType.LEAR_LOG_FILE);
-      fail("Expected an IllegalArgumentException to be thrown");
+      assertThrows(IllegalArgumentException.class, () -> {
+         // If the filename does not follow expected filename pattern,
+         // IllegalArgumentException should be thrown
+         testLogFileToAsn1CodecPublisher.publish(new BufferedInputStream(new ByteArrayInputStream(new byte[0])),
+               "fileName", ImporterFileType.LEAR_LOG_FILE);
+         fail("Expected an IllegalArgumentException to be thrown");
+      });
    }
 
-   @Test(expected = LogFileToAsn1CodecPublisherException.class)
+   @Test
    public void testPublishThrowsLogFileToAsn1CodecPublisherException(@Mocked LogFileParser mockLogFileParser)
          throws Exception {
-      new Expectations() {
-         {
-            LogFileParser.factory(anyString);
-            result = mockLogFileParser;
-
-            /*
-             * If the embedded parser fails to parse a log file header, it may throw an
-             * exception
-             * which is then caught by the parser and re-thrown as
-             * LogFileToAsn1CodecPublisherException.
-             * This mocked object will simulate that eventuality.
-             */
-            mockLogFileParser.parseFile((BufferedInputStream) any, anyString);
-            result = new LogFileToAsn1CodecPublisherException(anyString, (Exception) any);
-         }
-      };
-
-      testLogFileToAsn1CodecPublisher.publish(new BufferedInputStream(new ByteArrayInputStream(new byte[0])),
-            "fileName", ImporterFileType.LEAR_LOG_FILE);
-      fail("Expected an LogFileToAsn1CodecPublisherException to be thrown");
+      assertThrows(LogFileToAsn1CodecPublisherException.class, () -> {
+         new Expectations() {
+            {
+               LogFileParser.factory(anyString);
+               result = mockLogFileParser;
+
+               /*
+               * If the embedded parser fails to parse a log file header, it may throw an
+               * exception
+               * which is then caught by the parser and re-thrown as
+               * LogFileToAsn1CodecPublisherException.
+               * This mocked object will simulate that eventuality.
+               */
+               mockLogFileParser.parseFile((BufferedInputStream) any, anyString);
+               result = new LogFileToAsn1CodecPublisherException(anyString, (Exception) any);
+            }
+         };
+
+         testLogFileToAsn1CodecPublisher.publish(new BufferedInputStream(new ByteArrayInputStream(new byte[0])),
+               "fileName", ImporterFileType.LEAR_LOG_FILE);
+         fail("Expected an LogFileToAsn1CodecPublisherException to be thrown");
+      });
    }
 
    @Test

diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/dds/DdsDepositRequestManagerTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/dds/DdsDepositRequestManagerTest.java
@@ -24,8 +24,8 @@
 
 import javax.websocket.Session;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 
 import mockit.Expectations;
@@ -48,7 +48,7 @@ public class DdsDepositRequestManagerTest {
     @Mocked OdeProperties mockOdeProperties;
     @Mocked Logger mockLogger;
 
-    @Before
+    @BeforeEach
     public void setup() {
         new Expectations() {
             {

diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/ImporterDirectoryWatcherTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/ImporterDirectoryWatcherTest.java
@@ -21,8 +21,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import mockit.Capturing;
 import mockit.Expectations;
@@ -60,7 +59,7 @@ public class ImporterDirectoryWatcherTest {
    @Mocked
    ScheduledExecutorService mockScheduledExecutorService;
 
-   @Before
+   // @BeforeEach
    public void testConstructor() throws IOException {
       new Expectations() {
          {
@@ -74,14 +73,21 @@ public void testConstructor() throws IOException {
    }
 
    @Test
-   public void testRun() throws InterruptedException {
+   public void testRun() throws InterruptedException, IOException {
       new Expectations() {
          {
+            OdeFileUtils.createDirectoryRecursively((Path) any);
+            times = 3;
+
+            Executors.newScheduledThreadPool(1);
+            result = mockScheduledExecutorService;
+
             mockScheduledExecutorService.scheduleWithFixedDelay((Runnable) any, anyLong, anyLong, TimeUnit.SECONDS);
 
             mockScheduledExecutorService.awaitTermination(anyLong, TimeUnit.SECONDS);
          }
       };
+      testImporterDirectoryWatcher = new ImporterDirectoryWatcher(injectableOdeProperties, backupDir, failureDir, backupDir, injectableImporterFileType, timePeriod);
 
       testImporterDirectoryWatcher.run();
    }

diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/ImporterDirectoryWatcherTestOld.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/ImporterDirectoryWatcherTestOld.java
@@ -16,17 +16,21 @@
 package us.dot.its.jpo.ode.importer;
 
 import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchEvent.Kind;
+import java.time.Duration;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
 
-import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import mockit.Capturing;
 import mockit.Expectations;
@@ -35,7 +39,7 @@
 import us.dot.its.jpo.ode.OdeProperties;
 import us.dot.its.jpo.ode.importer.ImporterDirectoryWatcher.ImporterFileType;
 
-@Ignore
+@Disabled
 public class ImporterDirectoryWatcherTestOld {
 
    ImporterDirectoryWatcher testImporterDirectoryWatcher;
@@ -63,20 +67,22 @@ public class ImporterDirectoryWatcherTestOld {
    @Capturing
    ImporterProcessor capturingImporterProcessor;
 
-   @Before
+   @BeforeEach
    public void createTestObject() {
-      try {
-         new Expectations() {
-            {
-               OdeFileUtils.createDirectoryRecursively((Path) any);
-               times = 3;
-            }
-         };
-      } catch (IOException e) {
-         fail("Unexpected exception in expectations block: " + e);
+      if (testImporterDirectoryWatcher == null) {
+         try {
+            new Expectations() {
+               {
+                  OdeFileUtils.createDirectoryRecursively((Path) any);
+                  times = 3;
+               }
+            };
+         } catch (IOException e) {
+            fail("Unexpected exception in expectations block: " + e);
+         }
+         testImporterDirectoryWatcher = new ImporterDirectoryWatcher(injectableOdeProperties, mockDir, backupDir, failureDir, ImporterFileType.LEAR_LOG_FILE, timePeriod);
+         testImporterDirectoryWatcher.setWatching(false);
       }
-      testImporterDirectoryWatcher = new ImporterDirectoryWatcher(injectableOdeProperties, mockDir, backupDir, failureDir, ImporterFileType.LEAR_LOG_FILE, timePeriod);
-      testImporterDirectoryWatcher.setWatching(false);
    }
 
    @Test
@@ -94,34 +100,37 @@ public void testConstructorOdeUtilsException() {
       new ImporterDirectoryWatcher(injectableOdeProperties, mockDir, backupDir, failureDir, ImporterFileType.LEAR_LOG_FILE, timePeriod);
    }
 
-   @Test(timeout = 4000)
+   @Test
    public void runShouldCatchException() {
-      try {
-         new Expectations() {
-            {
-               mockDir.register((WatchService) any, (Kind<?>) any);
-               result = null;
-            }
-         };
-      } catch (IOException e) {
-         fail("Unexpected exception in expectations block: " + e);
-      }
-      testImporterDirectoryWatcher.run();
+      assertTimeout(Duration.ofMillis(4000), () -> {
+         try {
+            new Expectations() {
+               {
+                  mockDir.register((WatchService) any, (Kind<?>) any);
+                  result = null;
+               }
+            };
+         } catch (IOException e) {
+            fail("Unexpected exception in expectations block: " + e);
+         }
+         testImporterDirectoryWatcher.run();
+      });
    }
 
-   @Test(timeout = 4000)
+   @Test
+   @Timeout(4)
    public void shouldRunNoProblems() {
-      try {
-         new Expectations() {
-            {
-               mockDir.register((WatchService) any, (Kind<?>) any);
-               result = mockWatchKey;
-            }
-         };
-      } catch (IOException e) {
-         fail("Unexpected exception in expectations block: " + e);
-      }
-      testImporterDirectoryWatcher.run();
+         try {
+            new Expectations() {
+               {
+                  mockDir.register((WatchService) any, (Kind<?>) any);
+                  result = mockWatchKey;
+               }
+            };
+         } catch (IOException e) {
+            fail("Unexpected exception in expectations block: " + e);
+         }
+         testImporterDirectoryWatcher.run();
    }
 
 }
diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/ImporterProcessorTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/ImporterProcessorTest.java
@@ -26,8 +26,8 @@
 import java.nio.file.Path;
 import java.util.Iterator;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import mockit.Capturing;
 import mockit.Expectations;
@@ -68,7 +68,7 @@ public class ImporterProcessorTest {
    Path injectableFailureDir;
 
 
-   @Test @Ignore
+   @Test @Disabled
    public void processExistingFilesShouldCatchExceptionFailedToCreateStream() {
 
       try {
@@ -85,7 +85,7 @@ public void processExistingFilesShouldCatchExceptionFailedToCreateStream() {
       testImporterProcessor.processDirectory(injectableDir, injectableBackupDir, injectableFailureDir);
    }
 
-   @Test @Ignore
+   @Test @Disabled
    public void processExistingFilesShouldProcessOneFile(@Mocked DirectoryStream<Path> mockDirectoryStream,
          @Mocked Iterator<Path> mockIterator) {
 
@@ -109,7 +109,7 @@ public void processExistingFilesShouldProcessOneFile(@Mocked DirectoryStream<Pat
       testImporterProcessor.processDirectory(injectableDir, injectableBackupDir, injectableFailureDir);
    }
 
-   @Test @Ignore
+   @Test @Disabled
    public void processAndBackupFileFileShouldCatchExceptionStream() {
 
       try {

diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/parser/LogFileParserTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/importer/parser/LogFileParserTest.java
@@ -2,13 +2,14 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import us.dot.its.jpo.ode.importer.parser.FileParser.FileParserException;
 import us.dot.its.jpo.ode.importer.parser.FileParser.ParserStatus;
@@ -73,10 +74,12 @@ public void testFactory_driverAlert() {
     assertEquals(recordType, parser.getRecordType());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testFactoryThrowsException() {
-    LogFileParser.factory("invalidFileName");
-    fail("Expected IllegalArgumentException");
+    assertThrows(IllegalArgumentException.class, () -> {
+      LogFileParser.factory("invalidFileName");
+      fail("Expected IllegalArgumentException");
+    });
   }
 
   @Test