From cdf4aea655eadd2f577bfdaac23377cb879b6e9d Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Wed, 17 Jul 2024 17:50:10 +0200
Subject: [PATCH] first test completed
---
.../java/avatartranslator/tosysmlv2/AvatarFromSysML.java | 1 -
.../avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java | 4 ++--
.../avatartranslator/tosysmlv2/AvatarFromSysMLParser.java | 2 ++
.../avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup | 1 +
ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java | 6 +++---
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index 45a73e8d20..b9961d5c30 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -500,7 +500,6 @@ public class AvatarFromSysML {
// create method
AvatarMethod am = new AvatarMethod(sm.getName(),null);
// add method
- System.out.println("$$$$$$$$$$$ " + theBlock.getName() + " : " + am.getName());
theBlock.addMethod(am);
// add input parameters to method
buildProfile(sm, am, theBlock);
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
index 4d4a7e71f2..b88457eeba 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 15/07/2024 15:37 */
+/* The following code was generated by JFlex 1.4.3 on 17/07/2024 17:44 */
/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
@@ -47,7 +47,7 @@ import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 15/07/2024 15:37 from the specification file
+ * on 17/07/2024 17:44 from the specification file
* <code>__AvatarFromSysMLLexer__.jflex</code>
*/
public class AvatarFromSysMLLexer implements java_cup.runtime.Scanner {
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
index c1c48a4823..8c4e3e386f 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
@@ -4544,11 +4544,13 @@ class CUP$AvatarFromSysMLParser$actions {
Location zxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
Object z = CUP$AvatarFromSysMLParser$stack.peek().<Object>value();
+ System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$ IF " + e);
if (n != requestIndex + 1) {
addError( new AvatarFromSysMLError(AvatarFromSysMLError.LOWWARNING, nxleft,
" request index must be the request range in the request list (beginning at 1)", null) );
}
if (okRequest) {
+ theTransition.setGuard(e);
theTransition.setRleft(ixleft);
theTransition.setRright(zxright);
}
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
index 72e0e7af45..0360b19f9d 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
@@ -1574,6 +1574,7 @@ request ::=
" request index must be the request range in the request list (beginning at 1)", null) );
}
if (okRequest) {
+ theTransition.setGuard(e);
theTransition.setRleft(ixleft);
theTransition.setRright(zxright);
}
diff --git a/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java b/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java
index 03cf3b04e7..00e8b4c409 100644
--- a/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java
+++ b/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java
@@ -87,7 +87,7 @@ public class CLIAvatar2SysMLV2Test extends AbstractTest implements InterpreterOu
outputResult.append(s);
}
- //@Test
+ @Test
public void testOriginalModel() {
String filePath = getBaseResourcesDir() + PATH_TO_TEST_FILE + "scriptavsysml";
String script;
@@ -133,8 +133,8 @@ public class CLIAvatar2SysMLV2Test extends AbstractTest implements InterpreterOu
System.out.println("states=" + oristates + ", " + tgtstates + " -- transitions=" + oritrans + ", " + tgttrans);
- assertTrue(graph.getNbOfStates() == 14);
- assertTrue(graph.getNbOfTransitions() == 16);
+ assertTrue(oristates == tgtstates);
+ assertTrue(oritrans == tgttrans);
// Graph minimization
--
GitLab