Dissolve gerrit-test-util top-level directory

Change-Id: I3be9943f8eb9c0b125bea49660b38eea467f0240

gerrit-acceptance-tests/BUILD

@@ -24,7 +24,7 @@ java_library(
         "//gerrit-server:server",
         "//gerrit-server:testutil",
         "//gerrit-sshd:sshd",
-        "//gerrit-test-util:test_util",
+        "//java/com/google/gerrit/extensions",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava-retrying",

gerrit-extension-api/BUILD

@@ -54,7 +54,7 @@ junit_tests(
     srcs = glob(["src/test/java/**/*Test.java"]),
     deps = [
         ":api",
-        "//gerrit-test-util:test_util",
+        "//java/com/google/gerrit/extensions",
         "//lib:truth",
         "//lib/guice",
     ],

gerrit-server/BUILD

@@ -216,7 +216,7 @@ java_library(
     deps = [
         ":server",
         "//gerrit-extension-api:api",
-        "//gerrit-test-util:test_util",
+        "//java/com/google/gerrit/truth",
         "//lib:truth",
     ],
 )
@@ -299,7 +299,7 @@ junit_tests(
         ":testutil",
         "//gerrit-index:query_exception",
         "//gerrit-patch-jgit:server",
-        "//gerrit-test-util:test_util",
+        "//java/com/google/gerrit/extensions",
         "//lib:args4j",
         "//lib:grappa",
         "//lib:gson",

java/com/google/gerrit/extensions/BUILD

@@ -1,10 +1,11 @@
 java_library(
-    name = "test_util",
+    name = "extensions",
     testonly = 1,
-    srcs = glob(["src/main/java/**/*.java"]),
+    srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-extension-api:api",
+        "//java/com/google/gerrit/truth",
         "//lib:truth",
     ],
 )

java/com/google/gerrit/truth/BUILD

@@ -0,0 +1,9 @@
+java_library(
+    name = "truth",
+    testonly = 1,
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//lib:truth",
+    ],
+)

tools/eclipse/project.py

@@ -173,6 +173,7 @@ def gen_classpath(ext):
     if m:
       gwt_src.add(m.group(1))
 
+  classpathentry('src', 'java')
   for s in sorted(src):
     out = None