commit 82d69e1f80cbea9888ab12b375b13069e2a4a712
author Shawn Pearce <sop@google.com> Sat Dec 14 01:02:09 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 14 01:02:09 2013 +0000
tree fc83c300e31404ed59f62589beeec723de595619
parent 4c146e5ef49a24df9771bdc3755a7d80cdf545b4
parent d1ba6f51a2cfb00d93a05977a6bc130b3b00c17d

Merge changes Ia439a16c,I5d4af103

* changes:
  Support > and < in LabelPredicate, with refactorings
  Update index tests

gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java
index b8d942d..9032eca 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java
@@ -75,8 +75,6 @@
   public String format() {
     if (value == (short) 0) {
       return '-' + name;
-    } else if (value == (short) 1) {
-      return name;
     } else if (value < 0) {
       return name + value;
     } else {

gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java
index d7ae61a..0ed0ba8 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java
@@ -34,6 +34,9 @@
     l = LabelVote.parse("Code-Review");
     assertEquals("Code-Review", l.getLabel());
     assertEquals((short) 1, l.getValue());
+    l = LabelVote.parse("Code-Review+1");
+    assertEquals("Code-Review", l.getLabel());
+    assertEquals((short) 1, l.getValue());
     l = LabelVote.parse("Code-Review+2");
     assertEquals("Code-Review", l.getLabel());
     assertEquals((short) 2, l.getValue());
@@ -44,7 +47,7 @@
     assertEquals("Code-Review-2", LabelVote.parse("Code-Review-2").format());
     assertEquals("Code-Review-1", LabelVote.parse("Code-Review-1").format());
     assertEquals("-Code-Review", LabelVote.parse("-Code-Review").format());
-    assertEquals("Code-Review", LabelVote.parse("Code-Review").format());
+    assertEquals("Code-Review+1", LabelVote.parse("Code-Review+1").format());
     assertEquals("Code-Review+2", LabelVote.parse("Code-Review+2").format());
   }