commit b4da137bfc086605348731707adce5bd2982a223
author David Pursehouse <dpursehouse@collab.net> Tue Jul 25 06:53:34 2017 +0100
committer David Pursehouse <dpursehouse@collab.net> Tue Jul 25 06:53:34 2017 +0100
tree 4f84dd0edf5cb0c6a9a1a78303615b9181801754
parent 6e1160727a155af2bb2b5ea2b3e53c99336c4b98
parent e1c2190582d65775b7e1b773bdf7c54cd3d70cec

Merge branch 'stable-2.14'

* stable-2.14:
  IndexEventHandlerTest: Fix 'Unlikely argument type' Eclipse warnings
  Format build files with buildifier

Change-Id: I9e009d4fb1cb98d9ddda2745def73f3981800688

BUILD

diff --git a/BUILD b/BUILD
index 7b92317..3d84d55 100644
--- a/BUILD
+++ b/BUILD
@@ -34,8 +34,8 @@
 
 java_library(
     name = "high-availability__plugin_test_deps",
-    visibility = ["//visibility:public"],
     testonly = 1,
+    visibility = ["//visibility:public"],
     exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
         ":high-availability__plugin",
         "@byte-buddy//jar",

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 77d1f08..74e65b2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,4 +1,5 @@
 workspace(name = "high_availability")
+
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
@@ -25,4 +26,5 @@
 #gerrit_api()
 
 load("//:external_plugin_deps.bzl", "external_plugin_deps")
+
 external_plugin_deps()

src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
index 6db6f98..3f94f21 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
@@ -45,6 +45,7 @@
   private static final int CHANGE_ID = 1;
   private static final int ACCOUNT_ID = 2;
   private static final String UUID = "3";
+  private static final String OTHER_UUID = "4";
 
   private IndexEventHandler indexEventHandler;
   @Mock private Forwarder forwarder;
@@ -180,7 +181,7 @@
     assertThat(task.hashCode()).isEqualTo(identicalTask.hashCode());
 
     assertThat(task.equals(null)).isFalse();
-    assertThat(task.equals("test")).isFalse();
+    assertThat(task.equals(indexEventHandler.new IndexChangeTask(CHANGE_ID + 1, false))).isFalse();
     assertThat(task.hashCode()).isNotEqualTo("test".hashCode());
 
     IndexChangeTask differentChangeIdTask = indexEventHandler.new IndexChangeTask(123, false);
@@ -205,7 +206,7 @@
     assertThat(task.hashCode()).isEqualTo(identicalTask.hashCode());
 
     assertThat(task.equals(null)).isFalse();
-    assertThat(task.equals("test")).isFalse();
+    assertThat(task.equals(indexEventHandler.new IndexAccountTask(ACCOUNT_ID + 1))).isFalse();
     assertThat(task.hashCode()).isNotEqualTo("test".hashCode());
 
     IndexAccountTask differentAccountIdTask = indexEventHandler.new IndexAccountTask(123);
@@ -226,7 +227,7 @@
     assertThat(task.hashCode()).isEqualTo(identicalTask.hashCode());
 
     assertThat(task.equals(null)).isFalse();
-    assertThat(task.equals("test")).isFalse();
+    assertThat(task.equals(indexEventHandler.new IndexGroupTask(OTHER_UUID))).isFalse();
     assertThat(task.hashCode()).isNotEqualTo("test".hashCode());
 
     IndexGroupTask differentGroupIdTask = indexEventHandler.new IndexGroupTask("123");

tools/eclipse/BUILD

diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index fa4ea16..14715e7 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -4,7 +4,7 @@
     name = "classpath",
     testonly = 1,
     runtime_deps = [
-        "//:high-availability__plugin_test_deps"
+        "//:high-availability__plugin_test_deps",
     ],
 )
 
@@ -12,6 +12,6 @@
     name = "main_classpath_collect",
     testonly = 1,
     deps = [
-        "//:high-availability__plugin_test_deps"
+        "//:high-availability__plugin_test_deps",
     ],
 )