Skip to content

Fixes internal transitions for parent states #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jassuncao wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes internal transitions for parent states #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c56168
Fixes internal transitions for parent states
Jun 8, 2020
681896d
Merge remote-tracking branch 'hekailiang/master'
Jul 7, 2020
586c6dc
Prepare release 0.3.9-RC1
Jul 8, 2020
d79d7d1
Reverts to SNAPSHOT version
Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions squirrel-foundation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,18 +191,34 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Staging Repo</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Nexus Snapshot Repo</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<id>unofficial</id>
<activation>
<property>
<name>unofficial</name>
<value>true</value>
</property>
</activation>
<distributionManagement>
<repository>
<id>github</id>
<name>GitHub Squirrel Maven Packages</name>
<url>https://maven.pkg.github.com/jassuncao/squirrel</url>
</repository>
</distributionManagement>
</profile>
</profiles>
<distributionManagement>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Staging Repo</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Nexus Snapshot Repo</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>
9 changes: 2 additions & 7 deletions ...el-foundation/src/main/java/org/squirrelframework/foundation/fsm/impl/TransitionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,16 +184,11 @@ private void doTransitInternal(ImmutableState<T, S, E, C> source, ImmutableState
}

@Override
public void internalFire(StateContext<T, S, E, C> stateContext) {
// Fix issue17
if(type==TransitionType.INTERNAL && stateContext.
getSourceState().getStateId()!=targetState.getStateId()) {
return;
}
public void internalFire(StateContext<T, S, E, C> stateContext) {
if(condition.isSatisfied(stateContext.getContext())) {
ImmutableState<T, S, E, C> newState = stateContext.getSourceState();
if(type==TransitionType.INTERNAL) {
newState = transit(stateContext);
transit(stateContext);
} else {
// exit origin states
unwindSubStates(stateContext.getSourceState(), stateContext);
Expand Down
17 changes: 15 additions & 2 deletions squirrel-foundation/src/test/java/org/squirrelframework/foundation/issues/Issue17.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class Issue17 {

enum Issue17State {A, A1, A2}

enum Issue17Event {SAME, NEXT}
enum Issue17Event {SAME, NEXT, SAME_A2}

@ContextInsensitive
@StateMachineParameters(stateType=Issue17State.class, eventType=Issue17Event.class, contextType=Void.class)
Expand All @@ -27,6 +27,12 @@ void onA1ToA2(Issue17State from, Issue17State to, Issue17Event cause) {
void onSameWithinA(Issue17State from, Issue17State to, Issue17Event cause) {
logger.append("onSameWithinA");
}
void onSameWithinA2(Issue17State from, Issue17State to, Issue17Event cause) {
logger.append("onSameWithinA2");
}
void onExitA2(Issue17State from, Issue17State to, Issue17Event cause) {
logger.append("onExitA2");
}
String consumeLog() {
final String result = logger.toString();
logger = new StringBuilder();
Expand All @@ -39,7 +45,9 @@ public void testIssue17() {
final UntypedStateMachineBuilder builder = StateMachineBuilderFactory.create(Issue17StateMachine.class);
builder.defineSequentialStatesOn(Issue17State.A, Issue17State.A1, Issue17State.A2);
builder.internalTransition().within(Issue17State.A).on(Issue17Event.SAME).callMethod("onSameWithinA");
builder.internalTransition().within(Issue17State.A2).on(Issue17Event.SAME_A2).callMethod("onSameWithinA2");
builder.localTransition().from(Issue17State.A1).to(Issue17State.A2).on(Issue17Event.NEXT).callMethod("onA1ToA2");
builder.onExit(Issue17State.A2).callMethod("onExitA2");

Issue17StateMachine fsm = builder.newUntypedStateMachine(Issue17State.A);
fsm.addTransitionDeclinedListener(new TransitionDeclinedListener<UntypedStateMachine, Object, Object, Object>() {
Expand All @@ -51,8 +59,13 @@ public void transitionDeclined(
});
fsm.start();
fsm.fire(Issue17Event.NEXT);
Assert.assertEquals("onA1ToA2", fsm.consumeLog());
fsm.fire(Issue17Event.SAME);
Assert.assertTrue(fsm.consumeLog().equals("onA1ToA2"));
Assert.assertEquals(Issue17State.A2, fsm.getCurrentState());
Assert.assertEquals("onSameWithinA",fsm.consumeLog());
fsm.fire(Issue17Event.SAME_A2);
Assert.assertEquals(Issue17State.A2, fsm.getCurrentState());
Assert.assertEquals("onSameWithinA2",fsm.consumeLog());
}

}