From 353a3e841804b6e29ae6aa24ebaabce22acf6986 Mon Sep 17 00:00:00 2001
From: tempiaa <tempiaa@eurecom.fr>
Date: Fri, 12 Jun 2020 14:17:36 +0200
Subject: [PATCH] Right check syntax
---
.../java/avatartranslator/AvatarExpressionSolver.java | 8 ++++----
.../test/java/avatartranslator/AvatarExpressionTest.java | 7 +++++++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/avatartranslator/AvatarExpressionSolver.java b/src/main/java/avatartranslator/AvatarExpressionSolver.java
index d3bcceef3f..d9e9bec944 100644
--- a/src/main/java/avatartranslator/AvatarExpressionSolver.java
+++ b/src/main/java/avatartranslator/AvatarExpressionSolver.java
@@ -813,10 +813,6 @@ public class AvatarExpressionSolver {
}
switch (operator) {
- case '<':
- case '>':
- case ':':
- case ';':
case '-':
case '+':
case '/':
@@ -827,6 +823,10 @@ public class AvatarExpressionSolver {
case '&':
case '=':
case '$':
+ case '<':
+ case '>':
+ case ':':
+ case ';':
optype = IMMEDIATE_BOOL;
break;
default:
diff --git a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
index d941e627c3..1f4c1d21dc 100644
--- a/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
+++ b/ttool/src/test/java/avatartranslator/AvatarExpressionTest.java
@@ -115,10 +115,17 @@ public class AvatarExpressionTest {
assertTrue(e5.buildExpression());
AvatarExpressionSolver e6 = new AvatarExpressionSolver("10 -Cabin.match");
assertFalse(e6.buildExpression());
+ AvatarExpressionSolver e7 = new AvatarExpressionSolver("not(10)");
+ assertFalse(e7.buildExpression());
+ AvatarExpressionSolver e8 = new AvatarExpressionSolver("-(false)");
+ assertFalse(e8.buildExpression());
+ AvatarExpressionSolver e9 = new AvatarExpressionSolver("-10 < 5 || 20/4 == 5");
+ assertTrue(e9.buildExpression());
assertTrue(e1.getResult() == 1);
assertTrue(e2.getResult() == 1);
assertTrue(e3.getResult() == 0);
assertTrue(e5.getResult() == 1);
+ assertTrue(e9.getResult() == 1);
}
@Test
--
GitLab