From d451d5ba872da4a922e61cad9fafcb559e2c0cba Mon Sep 17 00:00:00 2001
From: tempiaa <tempiaa@eurecom.fr>
Date: Thu, 25 Jun 2020 14:48:41 +0200
Subject: [PATCH] Tests on compression
---
.../java/ui/window/JDialogAvatarModelChecker.java | 2 +-
.../avatartranslator/AvatarExpressionTest.java | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/main/java/ui/window/JDialogAvatarModelChecker.java b/src/main/java/ui/window/JDialogAvatarModelChecker.java
index 0b78621a84..609b25baf4 100644
--- a/src/main/java/ui/window/JDialogAvatarModelChecker.java
+++ b/src/main/java/ui/window/JDialogAvatarModelChecker.java
@@ -729,7 +729,7 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
timer.scheduleAtFixedRate(mcm, 0, 500);
// Setting options
- amc.setCompressionFactor(1);
+ amc.setCompressionFactor(2);
amc.setIgnoreEmptyTransitions(ignoreEmptyTransitionsSelected);
amc.setIgnoreConcurrenceBetweenInternalActions(ignoreConcurrenceBetweenInternalActionsSelected);
amc.setIgnoreInternalStates(ignoreInternalStatesSelected);
diff --git a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
index 88c068afd1..d49c5a5a0e 100644
--- a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
+++ b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
@@ -194,6 +194,20 @@ public class AvatarExpressionTest {
assertTrue(e1.getResult(ss) == 17);
assertTrue(e2.getResult(ss) == 1);
assertTrue(e3.getResult(ss) == 0);
+
+ as.setAttributeOptRatio(4);
+ ss = new SpecificationState();
+ ss.setInit(as, false);
+
+ e1 = new AvatarExpressionSolver("block1.x + block2.y");
+ assertTrue(e1.buildExpression(as));
+ e2 = new AvatarExpressionSolver("-block1.x / block1.y - 15 * block2.z + 1 == -46");
+ assertTrue(e2.buildExpression(as));
+ e3 = new AvatarExpressionSolver("not(-block2.x / block2.z - not(block1.x + block2.y) * -2 + -(1) <= -(-4 + 7))");
+ assertFalse(e3.buildExpression(as));
+ assertTrue(e1.getResult(ss) == 17);
+ assertTrue(e2.getResult(ss) == 1);
+ assertTrue(e3.getResult(ss) == 0);
}
}
--
GitLab