Integration release of NQt GerritRC-V2.2.1-INT-008BL-QTQAINFRA-462BL-QTQAINFRA-382

  Fixed JIRA issues:
  167 Fixed gerrit email verification link requires insecure login
  220 Added a check to prevent NumberFormatException
  270 Fixed review database update from StagingApprove
  335 Fixed automatic update of reviewer list
  347 Fixed late removal of review approvals
  348 Fixed cherry pick footer settings
  350 Consider sanity review column
  352 Fix typo in project config's topic review checkbox label
  355 Hide review panel also on diff and topic pages
  372 Validate topic current change set
  375 Topic permalink copy to clipboard corrected
  381 Do not permit trailing slash when pushing
  385 Keep highlight on review request
  389 Set patch approval changeOpen to false

Change-Id: I33f254b32bd01804e0830fcf5039b8f08e36f702

1 files changed, 42 insertions, 0 deletions

diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/BooleanExpressionTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/BooleanExpressionTest.java
new file mode 100644
index 0000000000..357fd7de23
--- /dev/null
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/BooleanExpressionTest.java
@@ -0,0 +1,42 @@
+package com.google.gerrit.server.util;
+
+import static org.junit.Assert.*;
+
+import java.text.ParseException;
+import java.util.HashMap;
+
+import org.junit.Test;
+
+public class BooleanExpressionTest {
+
+  @Test
+  public void testEvaluate() {
+
+    try {
+      assertTrue(new BooleanExpression("true && true && true").evaluate(null));
+      assertTrue(new BooleanExpression("true || true || false").evaluate(null));
+      assertTrue(new BooleanExpression("true || false || false").evaluate(null));
+      assertTrue(new BooleanExpression("true || false || true").evaluate(null));
+      assertTrue(new BooleanExpression("false || true || true").evaluate(null));
+      assertTrue(new BooleanExpression("false || true || false").evaluate(null));
+      assertFalse(new BooleanExpression("false || false || false").evaluate(null));
+      assertFalse(new BooleanExpression("false && false || false").evaluate(null));
+      assertFalse(new BooleanExpression("false && false && false").evaluate(null));
+      assertTrue(new BooleanExpression("false && false || true").evaluate(null));
+      assertTrue(new BooleanExpression("false = false").evaluate(null));
+      assertTrue(new BooleanExpression("true = true").evaluate(null));
+      assertFalse(new BooleanExpression("true = false").evaluate(null));
+      assertFalse(new BooleanExpression("false = true").evaluate(null));
+
+      HashMap<String,String> hashMap = new HashMap<String, String>();
+      hashMap.put("SRVW", "-1");
+      hashMap.put("reviewer", "qt_sanity_bot");
+
+      assertTrue(new BooleanExpression("SRVW < 0 || reviewer != qt_sanity_bot").evaluate(hashMap));
+
+    } catch (ParseException e) {
+      fail(e.getMessage());
+    }
+  }
+
+}