Convert unit tests into JUnit4 format (#306)

* Convert tests into JUnit4 format

* remove unused import

---------

Co-authored-by: Brian Kroth <bpkroth@users.noreply.github.com>

Author: ahitrin

src/test/java/com/oltpbenchmark/api/AbstractTestBenchmarkModule.java

@@ -17,6 +17,11 @@
 
 package com.oltpbenchmark.api;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.oltpbenchmark.catalog.AbstractCatalog;
 import com.oltpbenchmark.catalog.Table;
 import com.oltpbenchmark.types.DatabaseType;
@@ -29,6 +34,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.junit.Test;
 
 public abstract class AbstractTestBenchmarkModule<T extends BenchmarkModule> extends AbstractTestCase<T> {
 
@@ -45,6 +51,7 @@ public List<String> ignorableTables() {
     /**
      * testGetDatabaseDDLPath
      */
+    @Test
     public void testGetDatabaseDDLPath() throws Exception {
         String ddlPath = this.benchmark.getDatabaseDDLPath(this.workConf.getDatabaseType());
         assertNotNull(ddlPath);
@@ -56,6 +63,7 @@ public void testGetDatabaseDDLPath() throws Exception {
     /**
      * testCreateDatabase
      */
+    @Test
     public void testCreateDatabase() throws Exception {
         this.benchmark.createDatabase();
 
@@ -74,6 +82,7 @@ public void testCreateDatabase() throws Exception {
     /**
      * testGetTransactionType
      */
+    @Test
     public void testGetTransactionType() {
         int id = 1;
         for (Class<? extends Procedure> procClass : procedures()) {
@@ -89,6 +98,7 @@ public void testGetTransactionType() {
     /**
      * testGetSQLDialectPath
      */
+    @Test
     public void testGetSQLDialectPath() throws Exception {
         for (DatabaseType dbType : DatabaseType.values()) {
             String xmlFilePath = this.benchmark.getStatementDialects().getSQLDialectPath(dbType);
@@ -104,6 +114,7 @@ public void testGetSQLDialectPath() throws Exception {
     /**
      * testLoadSQLDialect
      */
+    @Test
     public void testLoadSQLDialect() throws Exception {
         for (DatabaseType dbType : DatabaseType.values()) {
             this.workConf.setDatabaseType(dbType);
@@ -128,6 +139,7 @@ public void testLoadSQLDialect() throws Exception {
     /**
      * testDumpSQLDialect
      */
+    @Test
     public void testDumpSQLDialect() throws Exception {
         for (DatabaseType dbType : DatabaseType.values()) {
             this.workConf.setDatabaseType(dbType);
@@ -157,6 +169,7 @@ public void testDumpSQLDialect() throws Exception {
     /**
      * testSetSQLDialect
      */
+    @Test
     public void testSetSQLDialect() throws Exception {
         for (DatabaseType dbType : DatabaseType.values()) {
             this.workConf.setDatabaseType(dbType);

src/test/java/com/oltpbenchmark/api/AbstractTestCase.java

@@ -16,15 +16,21 @@
 
 package com.oltpbenchmark.api;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import com.oltpbenchmark.WorkloadConfiguration;
 import com.oltpbenchmark.catalog.AbstractCatalog;
 import com.oltpbenchmark.types.DatabaseType;
 import com.oltpbenchmark.util.ClassUtil;
-import junit.framework.TestCase;
 import org.hsqldb.Database;
 import org.hsqldb.persist.HsqlProperties;
 import org.hsqldb.server.Server;
 import org.hsqldb.server.ServerConstants;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,7 +40,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public abstract class AbstractTestCase<T extends BenchmarkModule> extends TestCase {
+public abstract class AbstractTestCase<T extends BenchmarkModule> {
 
     protected final Logger LOG = LoggerFactory.getLogger(getClass());
 
@@ -83,14 +89,17 @@ public AbstractTestCase(boolean createDatabase, boolean loadDatabase, String ddl
 
     public abstract List<String> ignorableTables();
 
-    @Override
-    protected final void setUp() throws Exception {
+    @Rule
+    public TestName name = new TestName();
+
+    @Before
+    public final void setUp() throws Exception {
         HsqlProperties props = new HsqlProperties();
         //props.setProperty("server.remote_open", true);
 
         int port = portCounter.incrementAndGet();
 
-        LOG.info("starting HSQLDB server for test [{}] on port [{}]", this.getName(), port);
+        LOG.info("starting HSQLDB server for test [{}] on port [{}]", name.getMethodName(), port);
 
         server = new Server();
         server.setProperties(props);
@@ -174,8 +183,8 @@ protected void postCreateDatabaseSetup() throws IOException {
     }
 
 
-    @Override
-    protected final void tearDown() throws Exception {
+    @After
+    public final void tearDown() throws Exception {
 
         if (this.conn != null) {
             this.conn.close();

src/test/java/com/oltpbenchmark/api/AbstractTestLoader.java

@@ -17,9 +17,14 @@
 
 package com.oltpbenchmark.api;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.oltpbenchmark.catalog.Table;
 import com.oltpbenchmark.util.Histogram;
 import com.oltpbenchmark.util.SQLUtil;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +49,7 @@ public List<String> ignorableTables() {
     /**
      * testLoad
      */
+    @Test
     public void testLoad() throws Exception {
 
         this.benchmark.loadDatabase();

src/test/java/com/oltpbenchmark/api/AbstractTestWorker.java

@@ -17,12 +17,17 @@
 
 package com.oltpbenchmark.api;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
 import com.oltpbenchmark.api.Procedure.UserAbortException;
 import org.apache.commons.lang3.time.StopWatch;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 
 public abstract class AbstractTestWorker<T extends BenchmarkModule> extends AbstractTestCase<T> {
 
@@ -49,6 +54,7 @@ protected void postCreateDatabaseSetup() throws IOException {
     /**
      * testGetProcedure
      */
+    @Test
     public void testGetProcedure() {
         // Make sure that we can get a Procedure handle for each TransactionType
         Worker<?> w = workers.get(0);
@@ -64,6 +70,7 @@ public void testGetProcedure() {
     /**
      * testExecuteWork
      */
+    @Test
     public void testExecuteWork() throws Exception {
 
         Worker<?> w = workers.get(0);

src/test/java/com/oltpbenchmark/api/TestDDLOverride.java

@@ -1,5 +1,10 @@
 package com.oltpbenchmark.api;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.oltpbenchmark.catalog.Table;
 import com.oltpbenchmark.util.SQLUtil;
 
@@ -8,6 +13,7 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.Test;
 
 public class TestDDLOverride extends AbstractTestCase<MockBenchmark> {
 
@@ -30,6 +36,7 @@ public List<String> ignorableTables() {
         return null;
     }
 
+    @Test
     public void testCreateWithDdlOverride() throws Exception {
         this.benchmark.createDatabase();
 

src/test/java/com/oltpbenchmark/api/TestProcedure.java

@@ -16,22 +16,27 @@
 
 package com.oltpbenchmark.api;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import com.oltpbenchmark.benchmarks.tatp.procedures.DeleteCallForwarding;
 import com.oltpbenchmark.types.DatabaseType;
-import junit.framework.TestCase;
 
 import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
 
-public class TestProcedure extends TestCase {
+public class TestProcedure {
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
 
     }
 
     /**
      * testGetProcedureName
      */
+    @Test
     public void testGetProcedureName() throws Exception {
         DeleteCallForwarding proc = new DeleteCallForwarding();
         assertEquals(DeleteCallForwarding.class.getSimpleName(), proc.getProcedureName());
@@ -40,6 +45,7 @@ public void testGetProcedureName() throws Exception {
     /**
      * testGetStatements
      */
+    @Test
     public void testGetStatements() throws Exception {
         Map<String, SQLStmt> stmts = Procedure.getStatements(new DeleteCallForwarding());
         assertNotNull(stmts);
@@ -50,6 +56,7 @@ public void testGetStatements() throws Exception {
     /**
      * testGetStatementsConstructor
      */
+    @Test
     public void testGetStatementsConstructor() throws Exception {
         Procedure proc = new DeleteCallForwarding();
         proc.initialize(DatabaseType.POSTGRES);

src/test/java/com/oltpbenchmark/api/TestSQLStmt.java

@@ -17,13 +17,17 @@
 
 package com.oltpbenchmark.api;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
-public class TestSQLStmt extends TestCase {
+import org.junit.Test;
+
+public class TestSQLStmt {
 
     /**
      * testSubstitution
      */
+    @Test
     public void testSubstitution() throws Exception {
         int ctr = 25;
         SQLStmt stmt = new SQLStmt(
@@ -38,6 +42,7 @@ public void testSubstitution() throws Exception {
     /**
      * testSetSQL
      */
+    @Test
     public void testSetSQL() throws Exception {
         int expected = 99;
         SQLStmt stmt = new SQLStmt("SELECT * FROM tweets", expected);

src/test/java/com/oltpbenchmark/benchmarks/auctionmark/TestAuctionMarkBenchmark.java

@@ -17,6 +17,9 @@
 
 package com.oltpbenchmark.benchmarks.auctionmark;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.oltpbenchmark.api.AbstractTestBenchmarkModule;
 import com.oltpbenchmark.api.Procedure;
 import com.oltpbenchmark.api.TransactionType;
@@ -26,6 +29,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import org.junit.Test;
 
 public class TestAuctionMarkBenchmark extends AbstractTestBenchmarkModule<AuctionMarkBenchmark> {
 
@@ -58,6 +62,7 @@ protected void postCreateDatabaseSetup() throws IOException {
     /**
      * testCategoryParser
      */
+    @Test
     public void testCategoryParser() throws Exception {
         CategoryParser categoryParser = new CategoryParser();
         assertNotNull(categoryParser.getCategoryMap());
@@ -67,6 +72,7 @@ public void testCategoryParser() throws Exception {
     /**
      * testSupplementalClasses
      */
+    @Test
     public void testSupplementalClasses() throws Exception {
         // Check to make sure that we have something...
         Map<TransactionType, Procedure> procs = this.benchmark.getProcedures();

src/test/java/com/oltpbenchmark/benchmarks/auctionmark/TestAuctionMarkLoader.java

@@ -16,6 +16,11 @@
 
 package com.oltpbenchmark.benchmarks.auctionmark;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import com.oltpbenchmark.api.AbstractTestLoader;
 import com.oltpbenchmark.api.Procedure;
 import com.oltpbenchmark.api.Worker;
@@ -27,6 +32,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import org.junit.Test;
 
 public class TestAuctionMarkLoader extends AbstractTestLoader<AuctionMarkBenchmark> {
 
@@ -43,6 +49,7 @@ public Class<AuctionMarkBenchmark> benchmarkClass() {
     /**
      * testSaveLoadProfile
      */
+    @Test
     public void testSaveLoadProfile() throws Exception {
         AuctionMarkProfile.clearCachedProfile();
         AuctionMarkLoader loader = (AuctionMarkLoader) super.testLoadWithReturn();
@@ -58,7 +65,7 @@ public void testSaveLoadProfile() throws Exception {
         AuctionMarkWorker worker = (AuctionMarkWorker) workers.get(0);
         copy.loadProfile(worker);
 
-        assertEquals(orig.scale_factor, copy.scale_factor);
+        assertEquals(orig.scale_factor, copy.scale_factor, 0.001f);
         assertEquals(orig.getLoaderStartTime().toString(), copy.getLoaderStartTime().toString());
         assertEquals(orig.getLoaderStopTime().toString(), copy.getLoaderStopTime().toString());
         assertEquals(orig.users_per_itemCount, copy.users_per_itemCount);
@@ -67,6 +74,7 @@ public void testSaveLoadProfile() throws Exception {
     /**
      * testLoadProfilePerClient
      */
+    @Test
     public void testLoadProfilePerClient() throws Exception {
         // We don't have to reload our cached profile here
         // We just want to make sure that each client's profile contains a unique