Migrate to Junit 5

ibi-group · Aug 27, 2024 · 83a4caf · 83a4caf
1 parent 70a379c
commit 83a4caf
Show file tree

Hide file tree

Showing 77 changed files with 374 additions and 399 deletions.
diff --git a/onebusaway-gtfs-hibernate/pom.xml b/onebusaway-gtfs-hibernate/pom.xml
@@ -41,11 +41,6 @@
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

diff --git a/onebusaway-gtfs-hibernate/src/test/java/org/onebusaway/gtfs/impl/GtfsMappingTest.java b/onebusaway-gtfs-hibernate/src/test/java/org/onebusaway/gtfs/impl/GtfsMappingTest.java
@@ -15,17 +15,17 @@
  */
 package org.onebusaway.gtfs.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertSame;
 
 import java.io.IOException;
 import java.io.StringReader;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.csv_entities.exceptions.CsvEntityIOException;
 import org.onebusaway.gtfs.model.Agency;
 import org.onebusaway.gtfs.model.AgencyAndId;
@@ -43,7 +43,7 @@ public class GtfsMappingTest {
 
   private static GtfsReader _reader;
 
-  @Before
+  @BeforeEach
   public void setup() throws IOException {
 
     Configuration config = new Configuration();
@@ -57,7 +57,7 @@ public void setup() throws IOException {
     _reader.setEntityStore(_dao);
   }
 
-  @After
+  @AfterEach
   public void teardown() {
     if (_dao != null)
       _dao.close();

diff --git a/...te/src/test/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalDaoImplCaltrainTest.java b/...te/src/test/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalDaoImplCaltrainTest.java
@@ -16,11 +16,11 @@
  */
 package org.onebusaway.gtfs.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertFalse;
+import static  org.junit.jupiter.api.Assertions.assertNotNull;
+import static  org.junit.jupiter.api.Assertions.assertNull;
+import static  org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,9 +30,9 @@
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.model.Agency;
 import org.onebusaway.gtfs.model.AgencyAndId;
 import org.onebusaway.gtfs.model.Route;
@@ -53,7 +53,7 @@ public class HibernateGtfsRelationalDaoImplCaltrainTest {
 
   private static HibernateGtfsRelationalDaoImpl _dao;
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() throws IOException {
 
     Configuration config = new Configuration();
@@ -70,7 +70,7 @@ public static void setup() throws IOException {
     reader.run();
   }
 
-  @AfterClass
+  @AfterAll
   public static void teardown() {
     _sessionFactory.close();
   }

diff --git a/...-hibernate/src/test/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalDaoImplTest.java b/...-hibernate/src/test/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalDaoImplTest.java
@@ -15,8 +15,8 @@
  */
 package org.onebusaway.gtfs.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -25,9 +25,9 @@
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.model.AgencyAndId;
 import org.onebusaway.gtfs.model.Stop;
 
@@ -37,7 +37,7 @@ public class HibernateGtfsRelationalDaoImplTest {
 
   private static HibernateGtfsRelationalDaoImpl _dao;
 
-  @Before
+  @BeforeEach
   public void setup() throws IOException {
 
     Configuration config = new Configuration();
@@ -48,7 +48,7 @@ public void setup() throws IOException {
     _dao.open();
   }
 
-  @After
+  @AfterEach
   public void teardown() {
     if (_dao != null)
       _dao.close();

diff --git a/...hibernate/src/test/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalImplBartTest.java b/...hibernate/src/test/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalImplBartTest.java
@@ -16,18 +16,18 @@
  */
 package org.onebusaway.gtfs.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.model.AgencyAndId;
 import org.onebusaway.gtfs.model.Frequency;
 import org.onebusaway.gtfs.model.ServiceCalendar;
@@ -44,7 +44,7 @@ public class HibernateGtfsRelationalImplBartTest {
 
   private static HibernateGtfsRelationalDaoImpl _dao;
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() throws IOException {
 
     Configuration config = new Configuration();
@@ -61,7 +61,7 @@ public static void setup() throws IOException {
     reader.run();
   }
 
-  @AfterClass
+  @AfterAll
   public static void teardown() {
     _sessionFactory.close();
   }

diff --git a/...saway-gtfs-hibernate/src/test/java/org/onebusaway/gtfs/impl/LongRouteDescriptionTest.java b/...saway-gtfs-hibernate/src/test/java/org/onebusaway/gtfs/impl/LongRouteDescriptionTest.java
@@ -15,17 +15,17 @@
  */
 package org.onebusaway.gtfs.impl;
 
-import static org.junit.Assert.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.model.Agency;
 import org.onebusaway.gtfs.model.AgencyAndId;
 import org.onebusaway.gtfs.model.Route;
@@ -39,7 +39,7 @@ public class LongRouteDescriptionTest {
 
   private static HibernateGtfsRelationalDaoImpl _dao;
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() throws IOException {
 
     Configuration config = new Configuration();
@@ -62,7 +62,7 @@ public static void setup() throws IOException {
     reader.run();
   }
 
-  @AfterClass
+  @AfterAll
   public static void teardown() {
     _sessionFactory.close();
   }

diff --git a/onebusaway-gtfs-hibernate/src/test/java/org/onebusaway/gtfs/impl/VehicleTest.java b/onebusaway-gtfs-hibernate/src/test/java/org/onebusaway/gtfs/impl/VehicleTest.java
@@ -17,17 +17,17 @@
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.model.*;
 import org.onebusaway.gtfs.serialization.GtfsReader;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
 
 public class VehicleTest {
     private static SessionFactory _sessionFactory;
@@ -36,7 +36,7 @@ public class VehicleTest {
 
     private static HibernateGtfsRelationalDaoImpl _dao;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() throws IOException {
 
         Configuration config = new Configuration();
@@ -59,7 +59,7 @@ public static void setup() throws IOException {
         reader.run();
     }
 
-    @AfterClass
+    @AfterAll
     public static void teardown() {
         _sessionFactory.close();
     }

diff --git a/onebusaway-gtfs-merge/pom.xml b/onebusaway-gtfs-merge/pom.xml
@@ -32,11 +32,6 @@
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/onebusaway-gtfs-merge/src/test/java/org/onebusaway/gtfs_merge/GtfsMergerTest.java b/onebusaway-gtfs-merge/src/test/java/org/onebusaway/gtfs_merge/GtfsMergerTest.java
@@ -15,18 +15,18 @@
  */
 package org.onebusaway.gtfs_merge;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static  org.junit.jupiter.api.Assertions.assertEquals;
+import static  org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.impl.GtfsRelationalDaoImpl;
 import org.onebusaway.gtfs.model.*;
 import org.onebusaway.gtfs.serialization.GtfsReader;
@@ -56,7 +56,7 @@ public class GtfsMergerTest {
 
   private GtfsMerger _merger;
 
-  @Before
+  @BeforeEach
   public void before() throws IOException {
     _oldGtfs = MockGtfs.create();
     _newGtfs = MockGtfs.create();
@@ -65,7 +65,7 @@ public void before() throws IOException {
     _merger = new GtfsMerger();
   }
 
-  @After
+  @AfterEach
   public void after() {
 
   }
@@ -224,7 +224,7 @@ public void testAgencyPreference() throws IOException {
         pugetStopFound = true;
       }
     }
-    assertTrue("expect a puget stop", pugetStopFound);
+    assertTrue(pugetStopFound, "expect a puget stop");
   }
 
   @Test
@@ -352,7 +352,7 @@ public void testRenameStrategy() throws IOException {
 
     assertTrue("b-sid0".matches("[a-j]-.*"));
 
-    assertTrue("expect a puget stop", pugetStopFound);
+    assertTrue(pugetStopFound, "expect a puget stop");
   }
 
 // tests stop, location, and location group
@@ -454,10 +454,11 @@ public void testStopTimeProxies() throws IOException {
       boolean hasST = st.getStop()!=null;
       boolean hasLoc = st.getLocation()!=null;
       boolean hasLocGroup = st.getLocationGroup()!=null;
-      assertTrue("multiple ids found for stop: "+st.getStop()+
+      assertTrue( !(hasST & hasLoc | hasST && hasLocGroup | hasLoc & hasLocGroup),
+                      "multiple ids found for stop: "+st.getStop()+
                       ", location_id: "+st.getLocation()+
-                      ", location_id: "+st.getLocationGroup(),
-              !(hasST & hasLoc | hasST && hasLocGroup | hasLoc & hasLocGroup));
+                      ", location_id: "+st.getLocationGroup()
+              );
     }
   }
 

diff --git a/onebusaway-gtfs-merge/src/test/java/org/onebusaway/gtfs_merge/MergeExpectedFilesTest.java b/onebusaway-gtfs-merge/src/test/java/org/onebusaway/gtfs_merge/MergeExpectedFilesTest.java
@@ -15,9 +15,9 @@
  */
 package org.onebusaway.gtfs_merge;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onebusaway.gtfs.impl.FileSupport;
 import org.onebusaway.gtfs.impl.ZipHandler;
 
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertTrue;
+import static  org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test appending metadata inputs as part of merge.
@@ -40,12 +40,12 @@ public class MergeExpectedFilesTest {
 
   private FileSupport _support = new FileSupport();
 
-  @Before
+  @BeforeEach
   public void before() throws IOException {
     _merger = new GtfsMerger();
   }
 
-  @After
+  @AfterEach
   public void after() {
     _support.cleanup();
   }
@@ -68,8 +68,8 @@ public void testDirectoryMerge() throws Exception {
     String modLocation = gtfsDirectory.getAbsolutePath() + File.separator + "modifications.txt";
     File expectedFile = new File(modLocation);
     // verify modifications.txt is there!!!!
-    assertTrue("expected modifications.txt to be present!", expectedFile.exists());
-    assertTrue("expected modifications.txt to be a file!", expectedFile.isFile());
+    assertTrue(expectedFile.exists(), "expected modifications.txt to be present!");
+    assertTrue(expectedFile.isFile(), "expected modifications.txt to be a file!");
     StringBuffer sb = new StringBuffer();
     BufferedReader br = new BufferedReader(new FileReader(expectedFile));
     sb.append(br.lines().collect(Collectors.joining(System.lineSeparator())));