Make interesting state aggregation test

tests/regression/test-aggregation2/og.pr

 SYSTEM og;
     /* CIF TEXT (159, 221), (356, 248) */
-    -- Text area for declarations and comments
+    use dv comment 'dataview-uniq.asn';
 
-use dv comment 'dataview-uniq.asn';
-
---use dv2 comment 'dataview2.asn';
-
-signal dd(Type2);
-signal we(Some_Thing);
-
-procedure hehe;
-fpar in/out a_param Type2;
-external;
+signal reset_all;
+signal for_a;
+signal for_b;
+signal response;
     /* CIF ENDTEXT */
     CHANNEL c
-        FROM ENV TO og WITH dd;
-        FROM og TO ENV WITH we;
+        FROM ENV TO og WITH reset_all,
+for_a,
+for_b;
+        FROM og TO ENV WITH response;
     ENDCHANNEL;
     BLOCK og;
         SIGNALROUTE r
-            FROM ENV TO og WITH dd;
-            FROM og TO ENV WITH we;
+            FROM ENV TO og WITH reset_all,
+for_a,
+for_b;
+            FROM og TO ENV WITH response;
         CONNECT c AND r;
         /* CIF PROCESS (225, 49), (150, 75) */
         PROCESS og;
             STATE AGGREGATION wait;
             SUBSTRUCTURE
-                    STATE b;
+                    STATE a;
                     SUBSTRUCTURE
-                            /* CIF START (36, 35), (70, 35) */
+                            /* CIF START (134, 57), (70, 35) */
                             START;
-                                /* CIF NEXTSTATE (36, 85), (70, 35) */
-                                NEXTSTATE d;
-                            /* CIF STATE (116, 91), (70, 35) */
-                            STATE d;
+                                /* CIF PROCEDURECALL (70, 107), (198, 35) */
+                                CALL writeln('[a] startup');
+                                /* CIF NEXTSTATE (134, 157), (70, 35) */
+                                NEXTSTATE a1;
+                            /* CIF STATE (134, 157), (70, 35) */
+                            STATE a1;
+                                /* CIF INPUT (129, 212), (79, 35) */
+                                INPUT for_a;
+                                    /* CIF PROCEDURECALL (54, 262), (229, 35) */
+                                    CALL writeln('[a] Going to a2');
+                                    /* CIF NEXTSTATE (134, 312), (70, 35) */
+                                    NEXTSTATE a2;
+                            ENDSTATE;
+                            /* CIF STATE (293, 53), (70, 35) */
+                            STATE a2;
+                                /* CIF INPUT (289, 108), (79, 35) */
+                                INPUT for_a;
+                                    /* CIF PROCEDURECALL (209, 158), (239, 35) */
+                                    CALL writeln('[a] Going to a1');
+                                    /* CIF NEXTSTATE (293, 208), (70, 35) */
+                                    NEXTSTATE a1;
                             ENDSTATE;
                     ENDSUBSTRUCTURE;
-                    STATE a;
+                    STATE b;
                     SUBSTRUCTURE
-                            /* CIF START (7, 15), (70, 35) */
+                            /* CIF START (146, 55), (70, 35) */
                             START;
-                                /* CIF NEXTSTATE (7, 65), (70, 35) */
-                                NEXTSTATE c;
-                            /* CIF STATE (119, 53), (70, 35) */
-                            STATE c;
+                                /* CIF PROCEDURECALL (77, 105), (208, 35) */
+                                CALL writeln('[b] startup');
+                                /* CIF NEXTSTATE (146, 155), (70, 35) */
+                                NEXTSTATE b1;
+                            /* CIF STATE (146, 155), (70, 35) */
+                            STATE b1;
+                                /* CIF INPUT (138, 210), (80, 35) */
+                                INPUT for_b;
+                                    /* CIF PROCEDURECALL (59, 260), (239, 35) */
+                                    CALL writeln('[b] Going to b2');
+                                    /* CIF NEXTSTATE (143, 310), (70, 35) */
+                                    NEXTSTATE b2;
+                            ENDSTATE;
+                            /* CIF STATE (392, 144), (70, 35) */
+                            STATE b2;
+                                /* CIF INPUT (388, 199), (79, 35) */
+                                INPUT for_a;
+                                    /* CIF PROCEDURECALL (308, 249), (239, 35) */
+                                    CALL writeln('[b] Going to b1');
+                                    /* CIF NEXTSTATE (392, 299), (70, 35) */
+                                    NEXTSTATE b1;
                             ENDSTATE;
                     ENDSUBSTRUCTURE;
-                    /* CIF STATE (55, 14), (70, 35) */
-                    STATE a;
-                    ENDSTATE;
-                    /* CIF STATE (71, 136), (70, 35) */
+                    /* CIF STATE (170, 160), (70, 35) */
                     STATE b;
                     ENDSTATE;
+                    /* CIF STATE (170, 50), (70, 35) */
+                    STATE a;
+                    ENDSTATE;
             ENDSUBSTRUCTURE;
-            /* CIF START (121, 191), (70, 35) */
+            /* CIF START (226, 249), (70, 35) */
             START;
-                /* CIF NEXTSTATE (121, 241), (70, 35) */
+                /* CIF NEXTSTATE (226, 299), (70, 35) */
                 NEXTSTATE wait;
-            /* CIF STATE (251, 205), (70, 35) */
+            /* CIF STATE (487, 484), (70, 35) */
+            STATE wait;
+            ENDSTATE;
+            /* CIF STATE (226, 299), (70, 35) */
             STATE wait;
+                /* CIF INPUT (208, 354), (106, 35) */
+                INPUT reset_all;
+                    /* CIF PROCEDURECALL (174, 404), (174, 35) */
+                    CALL writeln('reset');
+                    /* CIF NEXTSTATE (226, 454), (70, 35) */
+                    NEXTSTATE -;
             ENDSTATE;
         ENDPROCESS og;
     ENDBLOCK;