refactoring complete and integration passing

nb/pom.xml

@@ -96,14 +96,14 @@
         <!--        </dependency>-->
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core-java8</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
 

nb/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,2 +1,3 @@
-io.nosqlbench.virtdata.processors.FunctionDocInfoProcessor
-io.nosqlbench.virtdata.processors.ServiceProcessor
+io.nosqlbench.virtdata.api.processors.FunctionDocInfoProcessor
+
+io.nosqlbench.nb.api.processors.ServiceProcessor

nb/src/test/java/io/nosqlbench/cli/testing/ExitStatusIntegrationTests.java

@@ -17,13 +17,12 @@
 
 package io.nosqlbench.cli.testing;
 
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test
 public class ExitStatusIntegrationTests {
 
     private final static String JARNAME = "target/nb.jar";

nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java

@@ -21,8 +21,9 @@ import io.nosqlbench.engine.core.ScenarioLogger;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
 import org.assertj.core.data.Offset;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -36,7 +37,6 @@ import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class AsyncScriptIntegrationTests {
 
     public static ScenarioResult runScenario(String scriptname, String... params) {
@@ -63,7 +63,7 @@ public class AsyncScriptIntegrationTests {
     }
 
     @BeforeClass
-    public void logit() {
+    public static void logit() {
         System.out.println("Running ASYNC version of Script Integration Tests.");
     }
 
@@ -245,7 +245,8 @@ public class AsyncScriptIntegrationTests {
     }
 
 
-    @Test(enabled=false)
+    @Test
+    @Ignore
     public void testCycleRateChangeOldMetrics() {
         ScenarioResult scenarioResult = runScenario("cycle_rate_change_deprecated");
         String ioLog = scenarioResult.getIOLog();

nb/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java

@@ -20,13 +20,12 @@ package io.nosqlbench.engine.core.script;
 import com.codahale.metrics.Histogram;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.metrics.ActivityMetrics;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test
 public class MetricsIntegrationTest {
 
     @Test

nb/src/test/java/io/nosqlbench/engine/core/script/MetricsMapperIntegrationTest.java

@@ -15,7 +15,7 @@
 
 package io.nosqlbench.engine.core.script;
 
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

nb/src/test/java/io/nosqlbench/engine/core/script/ScriptIntegrationTests.java

@@ -21,8 +21,8 @@ import io.nosqlbench.engine.core.ScenarioLogger;
 import io.nosqlbench.engine.core.ScenarioResult;
 import io.nosqlbench.engine.core.ScenariosResults;
 import org.assertj.core.data.Offset;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,7 +31,6 @@ import java.util.regex.Pattern;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Test(singleThreaded = true)
 public class ScriptIntegrationTests {
 
     public static ScenarioResult runScenario(String scriptname, String... params) {
@@ -59,7 +58,7 @@ public class ScriptIntegrationTests {
 
 
     @BeforeClass
-    public void logit() {
+    public static void logit() {
         System.out.println("Running SYNC version of Script Integration Tests.");
     }
 
@@ -261,4 +260,4 @@ public class ScriptIntegrationTests {
 //        );
 //    }
 
-}
+}

nb/src/test/java/io/nosqlbench/engine/core/script/SpeedCheckIntegrationTests.java

@@ -15,22 +15,24 @@
 package io.nosqlbench.engine.core.script;
 
 import io.nosqlbench.engine.core.ScenarioResult;
-import org.testng.annotations.Test;
+import org.junit.Ignore;
+import org.junit.Test;
 
 
 /**
  * These is here for experimentation on microbench scripts without requiring
  * them to be included in builds
  */
-@Test
 public class SpeedCheckIntegrationTests {
 
-    @Test(enabled = false)
+    @Test
+    @Ignore
     public void testSpeedSanity() {
         ScenarioResult scenarioResult = ScriptIntegrationTests.runScenario("speedcheck");
     }
 
-    @Test(enabled = false)
+    @Test
+    @Ignore
     public void testThreadSpeeds() {
         ScenarioResult scenarioResult = ScriptIntegrationTests.runScenario("threadspeeds");
     }