Fix machine autostart with annotation config

- This seem to relate with machine build from an annotation
  config which is then used as a session scoped bean.
- Fix autostart usage where appropriate and also fix some
  test which were using wrong logic to determine autostart
  usage(tests were wrong).
- Fixes #141
This commit is contained in:
Janne Valkealahti
2015-12-12 20:05:43 +00:00
parent 05a4155d9d
commit 8aaf66afea
4 changed files with 53 additions and 14 deletions

View File

@@ -191,10 +191,10 @@ public class ZookeeperStateMachineTests extends AbstractZookeeperTests {
StateMachine<String, String> machine2 =
context.getBean("sm2", StateMachine.class);
assertThat(((SmartLifecycle)machine1).isAutoStartup(), is(true));
assertThat(((SmartLifecycle)machine1).isRunning(), is(true));
assertThat(((SmartLifecycle)machine2).isAutoStartup(), is(true));
assertThat(((SmartLifecycle)machine2).isRunning(), is(true));
assertThat(((SmartLifecycle)machine1).isAutoStartup(), is(false));
assertThat(((SmartLifecycle)machine1).isRunning(), is(false));
assertThat(((SmartLifecycle)machine2).isAutoStartup(), is(false));
assertThat(((SmartLifecycle)machine2).isRunning(), is(false));
}
@Test
@@ -387,10 +387,10 @@ public class ZookeeperStateMachineTests extends AbstractZookeeperTests {
StateMachine<String, String> machine2 =
buildTestStateMachine2(curatorClient);
Message<String> message = MessageBuilder
.withPayload("EV")
.setHeader("testVariable", "x1")
.build();
Message<String> message = MessageBuilder
.withPayload("EV")
.setHeader("testVariable", "x1")
.build();
StateMachineTestPlan<String, String> plan =
StateMachineTestPlanBuilder.<String, String>builder()
@@ -423,10 +423,10 @@ public class ZookeeperStateMachineTests extends AbstractZookeeperTests {
StateMachine<String, String> machine2 =
buildTestStateMachine2(curatorClient);
Message<String> message = MessageBuilder
.withPayload("EV")
.setHeader("testVariable", "x1")
.build();
Message<String> message = MessageBuilder
.withPayload("EV")
.setHeader("testVariable", "x1")
.build();
StateMachineTestPlan<String, String> plan =
StateMachineTestPlanBuilder.<String, String>builder()
@@ -704,7 +704,10 @@ public class ZookeeperStateMachineTests extends AbstractZookeeperTests {
.and()
.withConfiguration()
.listener(stateMachineListener())
.autoStartup(true);
// TODO: false, really? testStateChangesConfigSetup() will fail if true
// maybe it's due to dist needs to be reseted!
// previously setting it true, didn't actually enable autostart.
.autoStartup(false);
}
public abstract StateMachineEnsemble<String, String> stateMachineEnsemble() throws Exception;