commit 5d4c3aad0f542517f6e71bd3a5b3d19535423742
author David Ostrovsky <david@ostrovsky.org> Fri May 22 15:14:48 2020 +0200
committer David Ostrovsky <david@ostrovsky.org> Fri Jun 05 08:48:04 2020 +0200
tree 3a987241e236ffb6c216cc6c7acb9ef93773d8bc
parent 6338e7bde6d19d8979a729d3792adfd98686efd2

Remove left over GWT dependencies

Also fix the unit tests.

Change-Id: I8e03d583e5081c26c8c9e91fa2d5c6cfb9644d6e

BUILD

diff --git a/BUILD b/BUILD
index c3ea47d..441fa83 100644
--- a/BUILD
+++ b/BUILD
@@ -33,6 +33,7 @@
     tags = ["verify-status"],
     deps = [
         ":verify-status__plugin_test_deps",
+        "@gwtorm//jar",
     ],
 )
 

src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java b/src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java
index 61a689b..ffe60fa 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java
@@ -15,17 +15,19 @@
 package com.googlesource.gerrit.plugins.verifystatus;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowCapability;
 
 import com.google.common.collect.Iterables;
-import com.google.gerrit.acceptance.GerritConfig;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.PushOneCommit.Result;
 import com.google.gerrit.acceptance.RestResponse;
 import com.google.gerrit.acceptance.TestPlugin;
 import com.google.gerrit.acceptance.UseLocalDisk;
+import com.google.gerrit.acceptance.config.GerritConfig;
+import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
 import com.google.gson.reflect.TypeToken;
 import com.google.gwtorm.jdbc.SimpleDataSource;
+import com.google.inject.Inject;
 import com.googlesource.gerrit.plugins.verifystatus.common.VerificationInfo;
 import com.googlesource.gerrit.plugins.verifystatus.common.VerifyInput;
 import java.sql.Connection;
@@ -67,11 +69,20 @@
           + "JOB_ID       VARCHAR(255) DEFAULT '' NOT NULL)";
   private static final String DELETE_TABLE = "DELETE FROM " + TABLE;
 
+  @Inject private ProjectOperations projectOperations;
+
   @Before
   @Override
   public void setUpTestPlugin() throws Exception {
     super.setUpTestPlugin();
-    allowGlobalCapabilities(REGISTERED_USERS, SaveReportCapability.getName(NAME));
+
+    projectOperations
+        .project(allProjects)
+        .forUpdate()
+        .add(
+            allowCapability("checks-administrateCheckers")
+                .group(group("Administrators").getGroupUUID()))
+        .update();
 
     Properties p = new Properties();
     p.setProperty("driver", "org.h2.Driver");

tools/eclipse/BUILD

diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index 75d59dd..f1be3a8 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -1,15 +1,9 @@
 load("//tools/bzl:classpath.bzl", "classpath_collector")
-load(
-    "//tools/bzl:plugin.bzl",
-    "GWT_PLUGIN_DEPS",
-)
 
 classpath_collector(
     name = "main_classpath_collect",
     testonly = 1,
-    deps = GWT_PLUGIN_DEPS + [
-        "//external:gwt-dev",
-        "//external:gwt-user",
+    deps = [
         "//:verify-status__plugin_test_deps",
     ],
 )