fixed dumpRegion() test for SCXML dumper

Author: WorkingDevel

src/test/java/net/workingdeveloper/java/spring/statemachine/dumper/SsmScxmlDumperTest.java

@@ -93,13 +93,20 @@ public void dumpRegion() throws Exception {
             assertThat(lIdMap, not(hasItem(lId)));
             lIdMap.add(lId);
         }
+        lX = lDocument.getDocumentElement().getElementsByTagName("final");
+        for (int i = 0; i < lX.getLength(); i++) {
+            String lId = ((Element) lX.item(i)).getAttribute("id");
+            assertThat(lIdMap, not(hasItem(lId)));
+            lIdMap.add(lId);
+        }
         assertThat(
                 lIdMap,
                 containsInAnyOrder(
                         SMHierarch1.States.S1.toString(), SMHierarch1.States.S21.toString(),
                         SMHierarch1.States.S2.toString(), SMHierarch1.States.S2F.toString(),
                         SMHierarch1.States.S3I.toString(), SMHierarch1.States.S31.toString(),
-                        SMHierarch1.States.S3F.toString()
+                        SMHierarch1.States.S3F.toString(), SMHierarch1.States.S2I.toString(),
+                        SMHierarch1.States.SE.toString(), "S2r1", "S2r0"
                 )
         );
     }

src/test/java/net/workingdeveloper/java/spring/statemachine/dumper/testdata/SMHierarch1.java

@@ -19,23 +19,10 @@ public enum States {
     }
 
     public enum Events {
-        E_S1_SE, E_S1_1__S1_2, E_S1_S1, E_S1_S2, E_SI_S1
+        E_S1_SE, E_S1_1__S1_2, E_S1_S1, E_S1_S2, E_S31__S3F, E_S2__SE, E_S3I__S31, E_S21_S21, E_S21_S2F, E_S2I_S21, E_SI_S1
 
     }
 
-    public StateMachine<String, String> buildUmlMachine(String aPath) throws Exception {
-        StateMachineBuilder.Builder<String, String> builder = StateMachineBuilder.builder();
-
-        builder.configureModel().withModel().factory(new UmlStateMachineModelFactory(
-                aPath
-        ));
-        builder.configureConfiguration()
-               .withConfiguration()
-               .taskExecutor(new SyncTaskExecutor())
-        ;
-        return builder.build();
-    }
-
     public StateMachine<SMHierarch1.States, SMHierarch1.Events> buildMachine() throws Exception {
         StateMachineBuilder.Builder<SMHierarch1.States, SMHierarch1.Events> builder = StateMachineBuilder.builder();
 
@@ -91,6 +78,7 @@ public StateMachine<SMHierarch1.States, SMHierarch1.Events> buildRegionMachine()
                .withStates()
                .initial(States.S1)
                .state(States.S2)
+               .end(States.SE)
                .and()
                .withStates()
                .parent(States.S2)
@@ -112,23 +100,27 @@ public StateMachine<SMHierarch1.States, SMHierarch1.Events> buildRegionMachine()
                .and()
                .withExternal()
                .source(States.S2I).target(States.S21)
-               .event(Events.E_S1_S1)
+               .event(Events.E_S2I_S21)
                .and()
                .withExternal()
                .source(States.S21).target(States.S2F)
-               .event(Events.E_S1_SE)
+               .event(Events.E_S21_S2F)
                .and()
                .withInternal()
                .source(States.S21)
-               .event(Events.E_S1_S1)
+               .event(Events.E_S21_S21)
                .and()
                .withExternal()
                .source(States.S3I).target(States.S31)
-               .event(Events.E_S1_1__S1_2)
+               .event(Events.E_S3I__S31)
+               .and()
+               .withExternal()
+               .source(States.S2).target(States.SE)
+               .event(Events.E_S2__SE)
                .and()
                .withExternal()
                .source(States.S31).target(States.S3F)
-               .event(Events.E_S1_1__S1_2)
+               .event(Events.E_S31__S3F)
                .and()
                .withInternal()
                .source(States.S31)
@@ -137,4 +129,17 @@ public StateMachine<SMHierarch1.States, SMHierarch1.Events> buildRegionMachine()
 
         return builder.build();
     }
+
+    public StateMachine<String, String> buildUmlMachine(String aPath) throws Exception {
+        StateMachineBuilder.Builder<String, String> builder = StateMachineBuilder.builder();
+
+        builder.configureModel().withModel().factory(new UmlStateMachineModelFactory(
+                aPath
+        ));
+        builder.configureConfiguration()
+               .withConfiguration()
+               .taskExecutor(new SyncTaskExecutor())
+        ;
+        return builder.build();
+    }
 }