commit 6fe058bfb11f83b02803721e2017f3f9c6a94901
author Alice Kober-Sotzek <aliceks@google.com> Wed Jul 11 09:20:11 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 11 09:20:11 2018 +0000
tree e528fa36865e3e9c8a4eb22eaa3a1aefca8fd610
parent 4f2d6d0b6e3be904c07236b65f8f009ee7ba5048
parent acaf3faf496c4914fb35e1a3034d1c61d39671ed

Merge "Join client_tests and server_tests into common_tests"

javatests/com/google/gerrit/common/BUILD

diff --git a/javatests/com/google/gerrit/common/BUILD b/javatests/com/google/gerrit/common/BUILD
index ba9a5bc..c4f2c0a 100644
--- a/javatests/com/google/gerrit/common/BUILD
+++ b/javatests/com/google/gerrit/common/BUILD
@@ -1,32 +1,14 @@
 load("//tools/bzl:junit.bzl", "junit_tests")
 
-SERVER_TEST_SRCS = [
-    "AutoValueTest.java",
-    "VersionTest.java",
-]
-
 junit_tests(
-    name = "client_tests",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = SERVER_TEST_SRCS,
-    ),
-    deps = [
-        "//java/com/google/gerrit/common:client",
-        "//lib:guava",
-        "//lib:junit",
-        "//lib/truth",
-    ],
-)
-
-junit_tests(
-    name = "server_tests",
-    srcs = SERVER_TEST_SRCS,
+    name = "common_tests",
+    srcs = glob(["**/*.java"]),
     tags = ["no_windows"],
     deps = [
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/common:version",
         "//java/com/google/gerrit/launcher",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
         "//lib/auto:auto-value",
         "//lib/auto:auto-value-annotations",