wip: adding unit tests for session setup file

Author: bpkroth

src/main/java/com/oltpbenchmark/WorkloadConfiguration.java

@@ -19,7 +19,6 @@
 import com.oltpbenchmark.types.DatabaseType;
 import com.oltpbenchmark.util.FileUtil;
 import com.oltpbenchmark.util.ThreadUtil;
-
 import java.io.FileNotFoundException;
 import java.sql.Connection;
 import java.util.ArrayList;
@@ -141,7 +140,7 @@ private String checkPath(String path, String name) throws FileNotFoundException
     }
   }
 
-  public void setSessionSetupFile(String sessionSetupFile) throws FileNotFoundException{
+  public void setSessionSetupFile(String sessionSetupFile) throws FileNotFoundException {
     this.sessionSetupFile = checkPath(sessionSetupFile, "sessionsetupfile");
   }
 

src/main/resources/benchmarks/noop/ddl-generic.sql

@@ -1,4 +1,7 @@
 DROP TABLE IF EXISTS FAKE;
 CREATE TABLE FAKE (
     ID INT PRIMARY KEY
+);
+CREATE TABLE FAKE2 (
+    ID INT
 );

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

@@ -68,6 +68,7 @@ public abstract class AbstractTestCase<T extends BenchmarkModule> {
   protected final boolean createDatabase;
   protected final boolean loadDatabase;
   protected final String ddlOverridePath;
+  protected final String sessionSetupFile;
 
   private static final AtomicInteger portCounter = new AtomicInteger(9001);
   private static final int MAX_PORT_NUMBER = 65535;
@@ -77,13 +78,27 @@ public AbstractTestCase(boolean createDatabase, boolean loadDatabase) {
     this.createDatabase = createDatabase;
     this.loadDatabase = loadDatabase;
     this.ddlOverridePath = null;
+    this.sessionSetupFile = null;
   }
 
   public AbstractTestCase(boolean createDatabase, boolean loadDatabase, String ddlOverridePath) {
     this.benchmark = null;
     this.createDatabase = createDatabase;
     this.loadDatabase = loadDatabase;
     this.ddlOverridePath = ddlOverridePath;
+    this.sessionSetupFile = ddlOverridePath;
+  }
+
+  public AbstractTestCase(
+      boolean createDatabase,
+      boolean loadDatabase,
+      String ddlOverridePath,
+      String sessionSetupFile) {
+    this.benchmark = null;
+    this.createDatabase = createDatabase;
+    this.loadDatabase = loadDatabase;
+    this.ddlOverridePath = ddlOverridePath;
+    this.sessionSetupFile = sessionSetupFile;
   }
 
   public abstract List<Class<? extends Procedure>> procedures();
@@ -127,6 +142,7 @@ public final void setUp() throws Exception {
     this.workConf.setBenchmarkName(
         BenchmarkModule.convertBenchmarkClassToBenchmarkName(benchmarkClass()));
     this.workConf.setDDLPath(this.ddlOverridePath);
+    this.workConf.setSessionSetupFile(this.sessionSetupFile);
 
     customWorkloadConfiguration(this.workConf);
 

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

@@ -17,7 +17,6 @@
 package com.oltpbenchmark.api;
 
 import static org.junit.Assert.*;
-import static org.junit.Assert.fail;
 
 import com.oltpbenchmark.catalog.Table;
 import com.oltpbenchmark.util.Histogram;
@@ -53,6 +52,8 @@ public void testLoad() throws Exception {
     validateLoad();
   }
 
+  // TODO: add another version of this test that uses external files (#600).
+
   /** testLoad with after load script */
   @Test
   public void testLoadWithAfterLoad() throws Exception {

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

@@ -67,12 +67,14 @@ public void testGetProcedure() {
     }
   }
 
-  /** testExecuteWork */
+  /* testExecuteWork
+   * Similar to Worker.run()
+   */
   @Test
   public void testExecuteWork() throws Exception {
-
     Worker<?> w = workers.get(0);
     assertNotNull(w);
+    w.setupSession();
     w.initialize();
     assertFalse(this.conn.isReadOnly());
     for (TransactionType txnType : this.workConf.getTransTypes()) {

src/test/java/com/oltpbenchmark/benchmarks/noop/TestNoOpLoader.java

@@ -34,6 +34,6 @@ public Class<NoOpBenchmark> benchmarkClass() {
 
   @Override
   public List<String> ignorableTables() {
-    return List.of("FAKE");
+    return List.of("FAKE", "FAKE2");
   }
 }

src/test/java/com/oltpbenchmark/benchmarks/noop/TestNoOpWorker.java

@@ -16,9 +16,21 @@
 
 package com.oltpbenchmark.benchmarks.noop;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import com.oltpbenchmark.api.AbstractTestWorker;
+import com.oltpbenchmark.api.BenchmarkModule;
 import com.oltpbenchmark.api.Procedure;
+import com.oltpbenchmark.api.Worker;
+import com.oltpbenchmark.catalog.Table;
+import com.oltpbenchmark.util.SQLUtil;
+import java.sql.ResultSet;
+import java.sql.Statement;
 import java.util.List;
+import org.junit.Test;
 
 public class TestNoOpWorker extends AbstractTestWorker<NoOpBenchmark> {
 
@@ -31,4 +43,36 @@ public List<Class<? extends Procedure>> procedures() {
   public Class<NoOpBenchmark> benchmarkClass() {
     return NoOpBenchmark.class;
   }
+
+  // TODO: Do the same for another test, but this time with a sessionSetupFile
+  // specified that inserts rows as a dummy operation we can check for.
+
+  @Test
+  public void testNoSessionSetupFile() throws Exception {
+    // Check that there is no session setup file assigned to the worker's config
+    assertNull("Session setup file should be null", this.workConf.getSessionSetupFile());
+
+    List<Worker<? extends BenchmarkModule>> workers = this.benchmark.makeWorkers();
+    Worker<?> worker = workers.get(0);
+    assertNull(
+        "Session setup file should be null",
+        worker.getWorkloadConfiguration().getSessionSetupFile());
+
+    // Make sure there are no rows in the table
+    this.testExecuteWork();
+
+    Table catalog_tbl = this.catalog.getTable("FAKE2");
+    String sql = SQLUtil.getCountSQL(this.workConf.getDatabaseType(), catalog_tbl);
+    try (Statement stmt = conn.createStatement();
+        ResultSet result = stmt.executeQuery(sql); ) {
+
+      assertNotNull(result);
+
+      boolean adv = result.next();
+      assertTrue(sql, adv);
+
+      int count = result.getInt(1);
+      assertEquals(0, count);
+    }
+  }
 }