Permalink
Browse files

Merge pull request #1135 from umple/fix-1134_jmcmanus

Closes #1134 line comments in state machines
  • Loading branch information...
TimLethbridge committed Nov 14, 2017
2 parents dd58bc5 + a84f2d1 commit 1af66aa218b5ed6be1b013ecda863d36ef518ca6
@@ -12,6 +12,9 @@ if (p != null) {
{
try
{
<<#if (p != null) {
realSb.append("\n // line " + p.getLineNumber() + " \"" + uClass.getRelativePath(p.getFilename(),"Java") + "\"");
} #>>
<<= activity.getActivityCode() >>
Thread.sleep(1);
<<# if (postTransition != null)
@@ -210,7 +210,7 @@ public void doActivity_Multiple()
@Test
public void doActivityMultipleInSameState()
{
assertUmpleTemplateFor("doActivityMulti.ump",languagePath + "/doActivityMulti."+ languagePath +".txt","X");
assertUmpleTemplateFor("doActivityMulti.ump",languagePath + "/doActivityMulti."+ languagePath +".txt","X", true, false);
}
@Test
@@ -3,6 +3,7 @@
// line 1 "doActivityMulti.ump"
public class X
{
@@ -90,6 +91,7 @@ public class X
{
try
{
// line 4 "doActivityMulti.ump"
blah1();
Thread.sleep(1);
}
@@ -103,6 +105,7 @@ public class X
{
try
{
// line 5 "doActivityMulti.ump"
blah2();
Thread.sleep(1);
}

0 comments on commit 1af66aa

Please sign in to comment.