From e1fafafbba55ed46371128535469032c2f62cc06 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Fri, 16 Apr 2021 08:51:06 +0200
Subject: [PATCH] Update on test for parsing
---
src/main/java/tmltranslator/touppaal/TML2UPPAAL.java | 2 +-
src/main/java/ui/window/JDialogUPPAALValidation.java | 2 +-
.../src/test/java/avatartranslator/AvatarExpressionTest.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java b/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java
index d29ead3c65..25031df343 100755
--- a/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java
+++ b/src/main/java/tmltranslator/touppaal/TML2UPPAAL.java
@@ -760,7 +760,7 @@ public class TML2UPPAAL {
}
public void makeLoss(String name) {
- TraceManager.addDev("Makking loss");
+ TraceManager.addDev("Making loss");
if (lossTemplate == null) {
lossTemplate = new UPPAALTemplate();
lossTemplate.setName("LossManager__");
diff --git a/src/main/java/ui/window/JDialogUPPAALValidation.java b/src/main/java/ui/window/JDialogUPPAALValidation.java
index 0f64ab0946..48d60fabf4 100644
--- a/src/main/java/ui/window/JDialogUPPAALValidation.java
+++ b/src/main/java/ui/window/JDialogUPPAALValidation.java
@@ -599,7 +599,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
jta.append("Using default size");
}
- TraceManager.addDev("spec=" + spec);
+ //TraceManager.addDev("spec=" + spec);
}
t = new Thread(this);
diff --git a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
index 66fc79e821..88ff6e423f 100644
--- a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
+++ b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
@@ -235,6 +235,8 @@ public class AvatarExpressionTest {
assertTrue(e12.buildExpression(block1));
AvatarExpressionSolver e13 = new AvatarExpressionSolver("(key1==false) and (key2==true)");
assertTrue(e13.buildExpression(block1));
+ AvatarExpressionSolver e14 = new AvatarExpressionSolver("x-40<3");
+ assertTrue(e14.buildExpression(block1));
assertTrue(e1.getResult(specBlock) == 15);
assertTrue(e2.getResult(specBlock) == 1);
assertTrue(e3.getResult(specBlock) == 0);
@@ -248,6 +250,8 @@ public class AvatarExpressionTest {
assertTrue(e11.getResult(attributes) == 5);
assertTrue(e12.getResult(attributes) == 36);
assertTrue(e13.getResult(attributes) == 1);
+ assertTrue(e14.getResult(attributes) == 1);
+
}
@Test
--
GitLab