Adapt to new package for JGit subjects
Change-Id: If56944bbf66bef718860b54ad0f423415f7f65d5
diff --git a/java/com/google/gerrit/plugins/checks/testing/BUILD b/java/com/google/gerrit/plugins/checks/testing/BUILD
index f50b6a0..a613c7b 100644
--- a/java/com/google/gerrit/plugins/checks/testing/BUILD
+++ b/java/com/google/gerrit/plugins/checks/testing/BUILD
@@ -7,8 +7,8 @@
name = "testing",
srcs = glob(["*.java"]),
deps = [
+ "//java/com/google/gerrit/git/testing",
"//java/com/google/gerrit/reviewdb:server",
- "//java/com/google/gerrit/server/testing",
"//java/com/google/gerrit/truth",
"//lib/truth",
"//lib/truth:truth-java8-extension",
diff --git a/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java b/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java
index 250036f..f57acd6 100644
--- a/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java
+++ b/java/com/google/gerrit/plugins/checks/testing/CheckerConfigSubject.java
@@ -23,11 +23,11 @@
import com.google.common.truth.Subject;
import com.google.common.truth.Truth;
import com.google.common.truth.Truth8;
+import com.google.gerrit.git.testing.ObjectIdSubject;
import com.google.gerrit.plugins.checks.Checker;
import com.google.gerrit.plugins.checks.api.CheckerStatus;
import com.google.gerrit.plugins.checks.db.CheckerConfig;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.server.testing.ObjectIdSubject;
import com.google.gerrit.truth.OptionalSubject;
import java.sql.Timestamp;
import java.util.Optional;
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/BUILD b/javatests/com/google/gerrit/plugins/checks/acceptance/api/BUILD
index 4404551..7db608a 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/BUILD
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/BUILD
@@ -8,7 +8,7 @@
"noci",
],
deps = [
- "//java/com/google/gerrit/server/testing",
+ "//java/com/google/gerrit/git/testing",
"//java/com/google/gerrit/server/util/time",
"//plugins/checks:checks__plugin",
"//plugins/checks/java/com/google/gerrit/plugins/checks/acceptance",
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
index 1e3daf6..50ff378 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks.acceptance.api;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gerrit.server.testing.CommitSubject.assertCommit;
+import static com.google.gerrit.git.testing.CommitSubject.assertCommit;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
index f6f3b0e..1239eea 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks.acceptance.api;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gerrit.server.testing.CommitSubject.assertCommit;
+import static com.google.gerrit.git.testing.CommitSubject.assertCommit;
import com.google.gerrit.acceptance.SkipProjectClone;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
diff --git a/javatests/com/google/gerrit/plugins/checks/db/BUILD b/javatests/com/google/gerrit/plugins/checks/db/BUILD
index a8d497c..2aaedf8 100644
--- a/javatests/com/google/gerrit/plugins/checks/db/BUILD
+++ b/javatests/com/google/gerrit/plugins/checks/db/BUILD
@@ -11,9 +11,9 @@
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/extensions/common/testing:common-test-util",
"//java/com/google/gerrit/git",
+ "//java/com/google/gerrit/git/testing",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
- "//java/com/google/gerrit/server/testing",
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//java/com/google/gerrit/truth",
