From f41250569005b939ba66e441970bd5108613be7e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 5 Jan 2023 14:36:58 -0600
Subject: [PATCH] consolidate error tests

---
 .../nbr/examples/ScriptExampleTests.java      | 28 ++++++++++++-------
 .../{activityerror.js => activity_error.js}   |  8 +++---
 ...ityiniterror.js => activity_init_error.js} |  6 ++--
 3 files changed, 25 insertions(+), 17 deletions(-)
 rename nbr-examples/src/test/resources/scripts/examples/{activityerror.js => activity_error.js} (82%)
 rename nbr-examples/src/test/resources/scripts/examples/{activityiniterror.js => activity_init_error.js} (85%)

diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java
index 90040094f..54c2b72f0 100644
--- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java
+++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java
@@ -234,15 +234,6 @@ public class ScriptExampleTests {
             "shutdown hooks should not run in the same IO context as the main scenario"
         );
     }
-
-    @Test
-    public void testExceptionPropagationFromActivityInit() {
-        ExecutionMetricsResult scenarioResult = runScenario("activityiniterror");
-        assertThat(scenarioResult.getException()).isNotNull();
-        assertThat(scenarioResult.getException().getMessage()).contains("Unable to convert end cycle from invalid");
-        assertThat(scenarioResult.getException()).isNotNull();
-    }
-
     @Test
     public void testReportedCoDelayBursty() {
         ExecutionMetricsResult scenarioResult = runScenario("cocycledelay_bursty");
@@ -272,11 +263,28 @@ public class ScriptExampleTests {
     }
 
     @Test
-    public void testExitLogic() {
+    public void testErrorPropagationFromAdapterOperation() {
         ExecutionMetricsResult scenarioResult = runScenario(
             "basicdiag",
             "type", "diag", "cyclerate", "5", "erroroncycle", "10", "cycles", "2000"
         );
     }
 
+
+    @Test
+    public void testErrorPropagationFromMotorThread() {
+        ExecutionMetricsResult scenarioResult = runScenario("activity_error");
+        assertThat(scenarioResult.getException()).isNotNull();
+        assertThat(scenarioResult.getException().getMessage()).contains("For input string: \"unparsable\"");
+    }
+
+    @Test
+    public void testErrorPropagationFromActivityInitialization() {
+        ExecutionMetricsResult scenarioResult = runScenario("activity_init_error");
+        assertThat(scenarioResult.getException()).isNotNull();
+        assertThat(scenarioResult.getException().getMessage()).contains("Unable to convert end cycle from invalid");
+        assertThat(scenarioResult.getException()).isNotNull();
+    }
+
+
 }
diff --git a/nbr-examples/src/test/resources/scripts/examples/activityerror.js b/nbr-examples/src/test/resources/scripts/examples/activity_error.js
similarity index 82%
rename from nbr-examples/src/test/resources/scripts/examples/activityerror.js
rename to nbr-examples/src/test/resources/scripts/examples/activity_error.js
index 4e0050a11..f156ba439 100644
--- a/nbr-examples/src/test/resources/scripts/examples/activityerror.js
+++ b/nbr-examples/src/test/resources/scripts/examples/activity_error.js
@@ -15,7 +15,7 @@
  */
 
 activitydef1 = {
-    "alias" : "erroring_activity",
+    "alias" : "activity_error",
     "driver" : "diag",
     "cycles" : "0..1500000",
     "threads" : "1",
@@ -25,9 +25,9 @@ activitydef1 = {
     }
 };
 
-print('starting activity erroring_activity');
+print('starting activity activity_error');
 scenario.start(activitydef1);
 scenario.waitMillis(2000);
-activities.erroring_activity.threads="unparsable";
-scenario.awaitActivity("erroring_activity");
+activities.activity_error.threads="unparsable";
+scenario.awaitActivity("activity_error");
 print("awaited activity");
diff --git a/nbr-examples/src/test/resources/scripts/examples/activityiniterror.js b/nbr-examples/src/test/resources/scripts/examples/activity_init_error.js
similarity index 85%
rename from nbr-examples/src/test/resources/scripts/examples/activityiniterror.js
rename to nbr-examples/src/test/resources/scripts/examples/activity_init_error.js
index 3c95579b2..eb94db38d 100644
--- a/nbr-examples/src/test/resources/scripts/examples/activityiniterror.js
+++ b/nbr-examples/src/test/resources/scripts/examples/activity_init_error.js
@@ -15,7 +15,7 @@
  */
 
 activitydef1 = {
-    "alias" : "erroring_activity_init",
+    "alias" : "activity_init_error",
     "driver" : "diag",
     "cycles" : "invalid",
     "threads" : "1",
@@ -24,8 +24,8 @@ activitydef1 = {
     "op" : "noop"
 };
 
-print('starting activity erroring_activity_init');
+print('starting activity activity_init_error');
 scenario.start(activitydef1);
 scenario.waitMillis(2000);
-scenario.awaitActivity("erroring_activity_init");
+scenario.awaitActivity("activity_init_error");
 print("awaited activity");