diff --git a/ttool/src/test/java/pragmasmodel/AvatarNetworkProjectPragmaTests.java b/ttool/src/test/java/pragmasmodel/AvatarNetworkProjectPragmaTests.java index ad1bc316d79111c3aa6a4c87bc7410c7b53a94ca..5c97666e122b10568891b7c7e1458ddaae1de356 100644 --- a/ttool/src/test/java/pragmasmodel/AvatarNetworkProjectPragmaTests.java +++ b/ttool/src/test/java/pragmasmodel/AvatarNetworkProjectPragmaTests.java @@ -13,6 +13,7 @@ import myutil.MalformedConfigurationException; import myutil.TraceManager; import proverifspec.ProVerifOutputAnalyzer; import proverifspec.ProVerifSpec; +import tmltranslator.TMLError; import tmltranslator.TMLMapping; import tmltranslator.TMLMappingTextSpecification; import tmltranslator.TMLSyntaxChecking; @@ -70,6 +71,13 @@ public class AvatarNetworkProjectPragmaTests { // Checking syntax TMLSyntaxChecking syntax = new TMLSyntaxChecking(_tmapPattern); syntax.checkSyntax(); + + if (syntax.hasErrors() > 0) { + for (TMLError error: syntax.getErrors()) { + TraceManager.addDev("Error: " + error.toString()); + } + + } return _tmapPattern; } @@ -77,15 +85,16 @@ public class AvatarNetworkProjectPragmaTests { currentTabbedPane = _currentTabbedPane; TMLMapping<?> _tmapPattern = buildTMAPPattern(); - //null for _referenceObject ? + //null for _referenceObject ? => getReferenceObject null Object o = null; + TraceManager.addDev("getReference ? : " + _tmapPattern.getTMLModeling().getTasks().get(0).toString()); if (_tmapPattern.getTMLModeling().getReference() instanceof TGComponent) { o = ((TGComponent)(_tmapPattern.getTMLModeling().getReference())).getTDiagramPanel().tp; } - TML2Avatar tml2Avatar = new TML2Avatar(_tmapPattern,false,false,o); + TML2Avatar tml2Avatar = new TML2Avatar(_tmapPattern,false,true,o); AvatarSpecification avatarspec = tml2Avatar.generateAvatarSpec("1",true); AVATAR2ProVerif avatar2proverif = new AVATAR2ProVerif(avatarspec); - ProVerifSpec proverif = avatar2proverif.generateProVerif(true, true, 0, true, + ProVerifSpec proverif = avatar2proverif.generateProVerif(true, true, 1, true, true); String filename = currentFolderPath + "pvspec";