this improve compositions of transitions.

umple · May 18, 2017 · 2cc33d1 · 2cc33d1
1 parent 6f4b9f1
commit 2cc33d1
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 1 deletion.
diff --git a/cruise.umple/src/UmpleInternalParser_CodeTrait_StateMachine.ump b/cruise.umple/src/UmpleInternalParser_CodeTrait_StateMachine.ump
@@ -1177,14 +1177,18 @@ class UmpleInternalParser
           return true;
         } else if(tI.getEvent().compareWithAnotherEvent(tJ.getEvent())){
             if (tI.getGuard()!=null){
+              if (tJ.getGuard()==null && !tJ.getNextState().getName().equals(tI.getNextState().getName()))  {
+                getParseResult().addErrorMessage(new ErrorMessage(234,tJ.getPosition(),tJ.getEvent().getName(),n1,n2));
+                return true;
+              }
               if (tI.getGuard().isEqualTo(tJ.getGuard()) && !tI.getNextState().getName().equals(tJ.getNextState().getName())) {
                 getParseResult().addErrorMessage(new ErrorMessage(234,tJ.getPosition(),tJ.getEvent().getName(),n1,n2));
                 return true;
               }
             } else {
               if (tJ.getGuard()!=null)  {
                 getParseResult().addErrorMessage(new ErrorMessage(234,tJ.getPosition(),tJ.getEvent().getName(),n1,n2));
-              return true;
+                return true;
               }
             }
         }

diff --git a/cruise.umple/test/cruise/umple/compiler/UmpleTraitTest.java b/cruise.umple/test/cruise/umple/compiler/UmpleTraitTest.java
@@ -1762,6 +1762,34 @@ public void stateMachineTraits0119Test() {
 		Assert.assertEquals(model.getUmpleClass("A").getStateMachine("mode").numberOfStates(),2);
 	}
 
+	@Test
+	public void stateMachineTraits0120Test() {
+		UmpleModel model = getModelByFilename("trait_test_data_0094.ump");
+		boolean result = false;
+		try {
+			model.run();
+		} catch (Exception e) {
+			result = e.getMessage().contains("234");
+		} finally {
+			Assert.assertTrue(result);
+			SampleFileWriter.destroy("traitTest.ump");
+		}
+	}
+
+	@Test
+	public void stateMachineTraits0121Test() {
+		UmpleModel model = getModelByFilename("trait_test_data_0095.ump");
+		boolean result = false;
+		try {
+			model.run();
+		} catch (Exception e) {
+			result = e.getMessage().contains("234");
+		} finally {
+			Assert.assertFalse(result);
+			SampleFileWriter.destroy("traitTest.ump");
+		}
+	}
+
 	// the last StateTest
 
 	// This is related to issue #656

diff --git a/cruise.umple/test/cruise/umple/compiler/trait/test/resources/trait_test_data_0094.ump b/cruise.umple/test/cruise/umple/compiler/trait/test/resources/trait_test_data_0094.ump
@@ -0,0 +1,16 @@
+trait T1{
+  sm{
+    s1{ e1 -> s2; }
+    s2{ e2 -> s1; }
+  }
+}
+class C1{
+  isA T1;
+  sm{
+    s1{
+      e1 [x>0]-> s3;
+      e3 -> s3;
+    }
+    s3{ }
+  }
+}
diff --git a/cruise.umple/test/cruise/umple/compiler/trait/test/resources/trait_test_data_0095.ump b/cruise.umple/test/cruise/umple/compiler/trait/test/resources/trait_test_data_0095.ump
@@ -0,0 +1,17 @@
+trait T1{
+  sm{
+    s1{ e1 -> s2; }
+    s2{ e2 -> s1; }
+  }
+}
+class C1{
+  isA T1;
+  sm{
+    s1{
+      e1 [x>0]-> s2;
+      e3 -> s3;
+    }
+    s3{ }
+    s2{}
+  }
+}