Move Truth rules to a subdirectory of lib

The list of supported Truth extensions is only going to grow. Change-Id: Ic67a9df6a7548d964fc10b13c10b6db1c96e514e
2018-05-14 16:44:16 -07:00 · 2018-05-14 16:44:16 -07:00 · 94fd307693
commit 94fd307693
parent 31c377f420
40 changed files with 69 additions and 70 deletions
--- a/gerrit-gwtui/BUILD
+++ b/gerrit-gwtui/BUILD
@ -34,8 +34,8 @@ junit_tests(
        "//java/com/google/gerrit/common:client",
        "//java/com/google/gerrit/extensions:client",
        "//lib:junit",
-        "//lib:truth",
        "//lib/gwt:dev",
        "//lib/gwt:user",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@ -77,8 +77,6 @@ java_library2(
        "//java/com/google/gerrit/server/project/testing:project-test-util",
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//lib:jimfs",
-        "//lib:truth",
-        "//lib:truth-java8-extension",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
        "//lib/httpcomponents:fluent-hc",
@ -88,6 +86,8 @@ java_library2(
        "//lib/jgit/org.eclipse.jgit.junit:junit",
        "//lib/log:impl_log4j",
        "//lib/log:log4j",
+        "//lib/truth",
+        "//lib/truth:truth-java8-extension",
        "//prolog:gerrit-prolog-common",
    ],
    visibility = ["//visibility:public"],
--- a/java/com/google/gerrit/common/data/testing/BUILD
+++ b/java/com/google/gerrit/common/data/testing/BUILD
@ -6,6 +6,6 @@ java_library(
    deps = [
        "//java/com/google/gerrit/common:server",
        "//java/com/google/gerrit/reviewdb:server",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/extensions/common/testing/BUILD
+++ b/java/com/google/gerrit/extensions/common/testing/BUILD
@ -6,7 +6,7 @@ java_library(
    deps = [
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/truth",
-        "//lib:truth",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/extensions/restapi/testing/BUILD
+++ b/java/com/google/gerrit/extensions/restapi/testing/BUILD
@ -6,6 +6,6 @@ java_library(
    deps = [
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/truth",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/git/testing/BUILD
+++ b/java/com/google/gerrit/git/testing/BUILD
@ -7,8 +7,8 @@ java_library(
    deps = [
        "//java/com/google/gerrit/common:annotations",
        "//lib:guava",
-        "//lib:truth",
-        "//lib:truth-java8-extension",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
+        "//lib/truth:truth-java8-extension",
    ],
 )
--- a/java/com/google/gerrit/server/cache/testing/BUILD
+++ b/java/com/google/gerrit/server/cache/testing/BUILD
@ -7,7 +7,7 @@ java_library(
    deps = [
        "//lib:guava",
        "//lib:protobuf",
-        "//lib:truth",
        "//lib/commons:lang3",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/server/group/testing/BUILD
+++ b/java/com/google/gerrit/server/group/testing/BUILD
@ -8,7 +8,7 @@ java_library(
        "//java/com/google/gerrit/common:server",
        "//java/com/google/gerrit/reviewdb:server",
        "//java/com/google/gerrit/server",
-        "//lib:truth",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/testing/BUILD
+++ b/java/com/google/gerrit/testing/BUILD
@ -31,7 +31,6 @@ java_library(
        "//java/com/google/gerrit/server/schema",
        "//lib:gwtorm",
        "//lib:h2",
-        "//lib:truth",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
        "//lib/guice",
@ -39,5 +38,6 @@ java_library(
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
        "//lib/log:api",
+        "//lib/truth",
    ],
 )
--- a/java/com/google/gerrit/truth/BUILD
+++ b/java/com/google/gerrit/truth/BUILD
@ -4,6 +4,6 @@ java_library(
    srcs = glob(["**/*.java"]),
    visibility = ["//visibility:public"],
    deps = [
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/acceptance/BUILD
+++ b/javatests/com/google/gerrit/acceptance/BUILD
@ -6,7 +6,7 @@ junit_tests(
    deps = [
        "//java/com/google/gerrit/acceptance:lib",
        "//lib:guava",
-        "//lib:truth",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/acceptance/api/group/BUILD
+++ b/javatests/com/google/gerrit/acceptance/api/group/BUILD
@ -21,6 +21,6 @@ java_library(
        "//java/com/google/gerrit/reviewdb:server",
        "//java/com/google/gerrit/server",
        "//lib:gwtorm",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/acceptance/rest/project/BUILD
+++ b/javatests/com/google/gerrit/acceptance/rest/project/BUILD
@ -18,7 +18,7 @@ java_library(
    ],
    deps = [
        "//java/com/google/gerrit/extensions:api",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )

@ -32,7 +32,7 @@ java_library(
        "//java/com/google/gerrit/reviewdb:server",
        "//java/com/google/gerrit/server",
        "//lib:gwtorm",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )

--- a/javatests/com/google/gerrit/common/BUILD
+++ b/javatests/com/google/gerrit/common/BUILD
@ -15,7 +15,7 @@ junit_tests(
        "//java/com/google/gerrit/common:client",
        "//lib:guava",
        "//lib:junit",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )

@ -28,8 +28,8 @@ junit_tests(
        "//java/com/google/gerrit/common:version",
        "//java/com/google/gerrit/launcher",
        "//lib:guava",
-        "//lib:truth",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@ -14,10 +14,10 @@ java_library(
        "//lib:gson",
        "//lib:guava",
        "//lib:junit",
-        "//lib:truth",
        "//lib/elasticsearch",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )

--- a/javatests/com/google/gerrit/extensions/BUILD
+++ b/javatests/com/google/gerrit/extensions/BUILD
@ -7,7 +7,7 @@ junit_tests(
    deps = [
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/extensions/common/testing:common-test-util",
-        "//lib:truth",
        "//lib/guice",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/extensions/conditions/BUILD
+++ b/javatests/com/google/gerrit/extensions/conditions/BUILD
@ -5,6 +5,6 @@ junit_tests(
    srcs = glob(["*.java"]),
    deps = [
        "//java/com/google/gerrit/extensions:lib",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/git/testing/BUILD
+++ b/javatests/com/google/gerrit/git/testing/BUILD
@ -5,6 +5,6 @@ junit_tests(
    srcs = glob(["*.java"]),
    deps = [
        "//java/com/google/gerrit/git/testing",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/gpg/BUILD
+++ b/javatests/com/google/gerrit/gpg/BUILD
@ -20,7 +20,6 @@ junit_tests(
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//lib:guava",
        "//lib:gwtorm",
-        "//lib:truth",
        "//lib/bouncycastle:bcpg",
        "//lib/bouncycastle:bcpg-neverlink",
        "//lib/bouncycastle:bcprov",
@ -30,5 +29,6 @@ junit_tests(
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
        "//lib/log:api",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/httpd/BUILD
+++ b/javatests/com/google/gerrit/httpd/BUILD
@ -19,11 +19,11 @@ junit_tests(
        "//lib:junit",
        "//lib:servlet-api-3_1-without-neverlink",
        "//lib:soy",
-        "//lib:truth",
        "//lib/easymock",
        "//lib/guice",
        "//lib/guice:guice-servlet",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/index/BUILD
+++ b/javatests/com/google/gerrit/index/BUILD
@ -10,8 +10,8 @@ junit_tests(
        "//java/com/google/gerrit/index:query_exception",
        "//java/com/google/gerrit/index:query_parser",
        "//lib:junit",
-        "//lib:truth",
        "//lib/antlr:java_runtime",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/metrics/proc/BUILD
+++ b/javatests/com/google/gerrit/metrics/proc/BUILD
@ -9,8 +9,8 @@ junit_tests(
        "//java/com/google/gerrit/lifecycle",
        "//java/com/google/gerrit/metrics",
        "//java/com/google/gerrit/metrics/dropwizard",
-        "//lib:truth",
        "//lib/dropwizard:dropwizard-core",
        "//lib/guice",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@ -13,11 +13,11 @@ junit_tests(
        "//java/com/google/gerrit/server",
        "//lib:guava",
        "//lib:junit",
-        "//lib:truth",
        "//lib/easymock",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )

--- a/javatests/com/google/gerrit/reviewdb/BUILD
+++ b/javatests/com/google/gerrit/reviewdb/BUILD
@ -8,6 +8,6 @@ junit_tests(
        "//java/com/google/gerrit/server/project/testing:project-test-util",
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//lib:gwtorm",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/server/BUILD
+++ b/javatests/com/google/gerrit/server/BUILD
@ -12,7 +12,7 @@ java_library(
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/truth",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )

@ -55,13 +55,13 @@ junit_tests(
        "//lib:guava-retrying",
        "//lib:gwtorm",
        "//lib:protobuf",
-        "//lib:truth-java8-extension",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
        "//lib/commons:codec",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth:truth-java8-extension",
        "//proto:cache_java_proto",
    ],
 )
--- a/javatests/com/google/gerrit/server/cache/BUILD
+++ b/javatests/com/google/gerrit/server/cache/BUILD
@ -9,8 +9,8 @@ junit_tests(
        "//lib:gwtorm",
        "//lib:junit",
        "//lib:protobuf",
-        "//lib:truth",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/server/cache/h2/BUILD
+++ b/javatests/com/google/gerrit/server/cache/h2/BUILD
@ -9,7 +9,7 @@ junit_tests(
        "//lib:guava",
        "//lib:h2",
        "//lib:junit",
-        "//lib:truth",
        "//lib/guice",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/server/group/db/BUILD
+++ b/javatests/com/google/gerrit/server/group/db/BUILD
@ -17,8 +17,8 @@ junit_tests(
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//java/com/google/gerrit/truth",
        "//lib:gwtorm",
-        "//lib:truth",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/server/query/account/BUILD
+++ b/javatests/com/google/gerrit/server/query/account/BUILD
@ -15,10 +15,10 @@ java_library(
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/server/schema",
        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//lib:truth",
-        "//lib:truth-java8-extension",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
+        "//lib/truth:truth-java8-extension",
        "//prolog:gerrit-prolog-common",
    ],
 )
--- a/javatests/com/google/gerrit/server/query/change/BUILD
+++ b/javatests/com/google/gerrit/server/query/change/BUILD
@ -20,10 +20,10 @@ java_library(
        "//java/com/google/gerrit/server/schema",
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//lib:gwtorm",
-        "//lib:truth",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )

@ -42,9 +42,9 @@ junit_tests(
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//lib:gwtorm",
-        "//lib:truth",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/server/query/group/BUILD
+++ b/javatests/com/google/gerrit/server/query/group/BUILD
@ -15,10 +15,10 @@ java_library(
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/server/schema",
        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//lib:truth",
-        "//lib:truth-java8-extension",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
+        "//lib/truth:truth-java8-extension",
    ],
 )

--- a/javatests/com/google/gerrit/server/query/project/BUILD
+++ b/javatests/com/google/gerrit/server/query/project/BUILD
@ -14,9 +14,9 @@ java_library(
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/server/schema",
        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//lib:truth",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/truth",
    ],
 )

--- a/javatests/com/google/gerrit/server/rules/BUILD
+++ b/javatests/com/google/gerrit/server/rules/BUILD
@ -10,10 +10,10 @@ junit_tests(
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/server/project/testing:project-test-util",
        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//lib:truth",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/prolog:runtime",
+        "//lib/truth",
        "//prolog:gerrit-prolog-common",
    ],
 )
--- a/javatests/com/google/gerrit/server/update/BUILD
+++ b/javatests/com/google/gerrit/server/update/BUILD
@ -12,9 +12,9 @@ junit_tests(
        "//java/com/google/gerrit/server",
        "//lib:guava",
        "//lib:junit",
-        "//lib:truth",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
    ],
 )

@ -34,10 +34,10 @@ junit_tests(
        "//java/com/google/gerrit/testing:gerrit-test-util",
        "//lib:guava",
        "//lib:gwtorm",
-        "//lib:truth",
-        "//lib:truth-java8-extension",
        "//lib/guice",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/truth",
+        "//lib/truth:truth-java8-extension",
    ],
 )
--- a/javatests/com/google/gerrit/sshd/BUILD
+++ b/javatests/com/google/gerrit/sshd/BUILD
@ -7,7 +7,7 @@ junit_tests(
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/sshd",
-        "//lib:truth",
        "//lib/mina:sshd",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/testing/BUILD
+++ b/javatests/com/google/gerrit/testing/BUILD
@ -7,6 +7,6 @@ junit_tests(
    deps = [
        "//java/com/google/gerrit/server",
        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//lib:truth",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gerrit/util/http/BUILD
+++ b/javatests/com/google/gerrit/util/http/BUILD
@ -8,7 +8,7 @@ junit_tests(
        "//javatests/com/google/gerrit/util/http/testutil",
        "//lib:junit",
        "//lib:servlet-api-3_1-without-neverlink",
-        "//lib:truth",
        "//lib/easymock",
+        "//lib/truth",
    ],
 )
--- a/javatests/com/google/gwtexpui/safehtml/BUILD
+++ b/javatests/com/google/gwtexpui/safehtml/BUILD
@ -5,8 +5,8 @@ junit_tests(
    srcs = glob(["client/**/*.java"]),
    deps = [
        "//java/com/google/gwtexpui/safehtml",
-        "//lib:truth",
        "//lib/gwt:dev",
        "//lib/gwt:user",
+        "//lib/truth",
    ],
 )
--- a/lib/BUILD
+++ b/lib/BUILD
@ -216,28 +216,6 @@ java_library(
    exports = ["@hamcrest_core//jar"],
 )

-java_library(
-    name = "truth",
-    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
-    visibility = ["//visibility:public"],
-    exports = [
-        ":guava",
-        ":junit",
-        "@truth//jar",
-    ],
-)
-
-java_library(
-    name = "truth-java8-extension",
-    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
-    visibility = ["//visibility:public"],
-    exports = [
-        ":guava",
-        ":truth",
-        "@truth-java8-extension//jar",
-    ],
-)
-
 java_library(
    name = "javassist",
    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
--- a/lib/truth/BUILD
+++ b/lib/truth/BUILD
@ -0,0 +1,21 @@
+java_library(
+    name = "truth",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        "//lib:guava",
+        "//lib:junit",
+        "@truth//jar",
+    ],
+)
+
+java_library(
+    name = "truth-java8-extension",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":truth",
+        "//lib:guava",
+        "@truth-java8-extension//jar",
+    ],
+)