diff --git a/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/AbstractEventsourcedProcessorSpec.java b/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/AbstractEventsourcedProcessorSpec.java index 69c08d48..b308002d 100644 --- a/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/AbstractEventsourcedProcessorSpec.java +++ b/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/AbstractEventsourcedProcessorSpec.java @@ -95,10 +95,10 @@ public void onWriteFailure(final Throwable cause) { @Before public void beforeEach() { + instanceId = getInstanceId(); srcProbe = new TestProbe(system); targetProbe = new TestProbe(system); appProbe = new TestProbe(system); - instanceId = getInstanceId(); } private ActorRef unrecoveredStatelessEventProcessor() { @@ -157,20 +157,26 @@ public void shouldProcessEvents() { } @Test - public void shouldReportFailureOnFailedRead() { - unrecoveredStatelessEventProcessor(); + public void shouldResumeOnFailedRead() { + final ActorRef actor = unrecoveredStatelessEventProcessor(); processReadFailure(); appProbe.expectMsg(FAILURE); + + processReadSuccess(0); + processReplay(actor, 1, instanceId + 1, srcProbe, REPLAY_BATCH_SIZE); } @Test - public void shouldReportFailureOnFailedWrite() { + public void shouldResumeOnFailedWrite() { final ActorRef actor = recoveredStatelessEventProcessor(); actor.tell(new Written(eventA), getRef()); processWriteFailure(1, eventA1, eventA2); appProbe.expectMsg(FAILURE); + + processReadSuccess(0); + processReplay(actor, 1, instanceId + 1, srcProbe, REPLAY_BATCH_SIZE); } } diff --git a/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/BaseSpec.java b/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/BaseSpec.java index 3e19af6f..cf459ac4 100644 --- a/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/BaseSpec.java +++ b/eventuate-core/src/test/java/com/rbmhtechnology/eventuate/BaseSpec.java @@ -27,6 +27,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.scalatest.junit.JUnitSuite; import scala.Option; import scala.collection.immutable.$colon$colon; import scala.collection.immutable.List$; @@ -36,7 +37,7 @@ import java.util.Arrays; -public abstract class BaseSpec { +public abstract class BaseSpec extends JUnitSuite { @SuppressWarnings("ThrowableInstanceNeverThrown") public static final Throwable FAILURE = new NoStackTraceException("failure"); diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala index d671aaa4..1472d490 100644 --- a/project/ProjectSettings.scala +++ b/project/ProjectSettings.scala @@ -60,7 +60,6 @@ object ProjectSettings { ) lazy val testSettings: Seq[Setting[_]] = Seq( - testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-a"), parallelExecution in Test := false, fork in Test := true )