consolidate error tests

This commit is contained in:
Jonathan Shook 2023-01-05 14:36:58 -06:00
parent fb8e27d339
commit f412505690
3 changed files with 25 additions and 17 deletions

View File

@ -234,15 +234,6 @@ public class ScriptExampleTests {
"shutdown hooks should not run in the same IO context as the main scenario" "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 @Test
public void testReportedCoDelayBursty() { public void testReportedCoDelayBursty() {
ExecutionMetricsResult scenarioResult = runScenario("cocycledelay_bursty"); ExecutionMetricsResult scenarioResult = runScenario("cocycledelay_bursty");
@ -272,11 +263,28 @@ public class ScriptExampleTests {
} }
@Test @Test
public void testExitLogic() { public void testErrorPropagationFromAdapterOperation() {
ExecutionMetricsResult scenarioResult = runScenario( ExecutionMetricsResult scenarioResult = runScenario(
"basicdiag", "basicdiag",
"type", "diag", "cyclerate", "5", "erroroncycle", "10", "cycles", "2000" "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();
}
} }

View File

@ -15,7 +15,7 @@
*/ */
activitydef1 = { activitydef1 = {
"alias" : "erroring_activity", "alias" : "activity_error",
"driver" : "diag", "driver" : "diag",
"cycles" : "0..1500000", "cycles" : "0..1500000",
"threads" : "1", "threads" : "1",
@ -25,9 +25,9 @@ activitydef1 = {
} }
}; };
print('starting activity erroring_activity'); print('starting activity activity_error');
scenario.start(activitydef1); scenario.start(activitydef1);
scenario.waitMillis(2000); scenario.waitMillis(2000);
activities.erroring_activity.threads="unparsable"; activities.activity_error.threads="unparsable";
scenario.awaitActivity("erroring_activity"); scenario.awaitActivity("activity_error");
print("awaited activity"); print("awaited activity");

View File

@ -15,7 +15,7 @@
*/ */
activitydef1 = { activitydef1 = {
"alias" : "erroring_activity_init", "alias" : "activity_init_error",
"driver" : "diag", "driver" : "diag",
"cycles" : "invalid", "cycles" : "invalid",
"threads" : "1", "threads" : "1",
@ -24,8 +24,8 @@ activitydef1 = {
"op" : "noop" "op" : "noop"
}; };
print('starting activity erroring_activity_init'); print('starting activity activity_init_error');
scenario.start(activitydef1); scenario.start(activitydef1);
scenario.waitMillis(2000); scenario.waitMillis(2000);
scenario.awaitActivity("erroring_activity_init"); scenario.awaitActivity("activity_init_error");
print("awaited activity"); print("awaited activity");