Dissolve gerrit-acceptance-framework top-level directory

Change-Id: I16f1aa0714bb653bb1f81b503beeeac1c9fc1d64

BUILD

@@ -45,9 +45,9 @@ pkg_war(
 )
 
 API_DEPS = [
-    "//gerrit-acceptance-framework:acceptance-framework_deploy.jar",
+    "//java/com/google/gerrit/acceptance:acceptance-framework_deploy.jar",
-    "//gerrit-acceptance-framework:liblib-src.jar",
+    "//java/com/google/gerrit/acceptance:liblib-src.jar",
-    "//gerrit-acceptance-framework:acceptance-framework-javadoc",
+    "//java/com/google/gerrit/acceptance:acceptance-framework-javadoc",
     "//java/com/google/gerrit/extensions:extension-api_deploy.jar",
     "//java/com/google/gerrit/extensions:libapi-src.jar",
     "//java/com/google/gerrit/extensions:extension-api-javadoc",

gerrit-acceptance-tests/BUILD

@@ -7,11 +7,11 @@ java_library(
     resources = RESOURCES,
     visibility = ["//visibility:public"],
     exports = [
-        "//gerrit-acceptance-framework:lib",
         "//gerrit-launcher:launcher",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-server:testutil",
+        "//java/com/google/gerrit/acceptance:lib",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",

java/com/google/gerrit/acceptance/BUILD

@@ -1,12 +1,4 @@
 load("//tools/bzl:java.bzl", "java_library2")
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-TEST_SRCS = ["src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfigTest.java"]
-
-SRCS = glob(
-    ["src/test/java/com/google/gerrit/acceptance/*.java"],
-    exclude = TEST_SRCS,
-)
 
 PROVIDED = [
     "//java/com/google/gerrit/common:annotations",
@@ -38,7 +30,7 @@ java_binary(
 java_library2(
     name = "lib",
     testonly = 1,
-    srcs = SRCS,
+    srcs = glob(["**/*.java"]),
     exported_deps = [
         "//gerrit-launcher:launcher",
         "//gerrit-server:testutil",
@@ -84,14 +76,3 @@ java_doc(
     title = "Gerrit Acceptance Test Framework Documentation",
     visibility = ["//visibility:public"],
 )
-
-junit_tests(
-    name = "acceptance_framework_tests",
-    srcs = TEST_SRCS,
-    deps = [
-        ":lib",
-        "//lib:guava",
-        "//lib:truth",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-    ],
-)

javatests/com/google/gerrit/acceptance/BUILD

@@ -0,0 +1,12 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+    name = "acceptance_framework_tests",
+    srcs = glob(["**/*.java"]),
+    deps = [
+        "//java/com/google/gerrit/acceptance:lib",
+        "//lib:guava",
+        "//lib:truth",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
+)

tools/bzl/plugin.bzl

@@ -13,7 +13,7 @@ PLUGIN_DEPS = ["//gerrit-plugin-api:lib"]
 PLUGIN_DEPS_NEVERLINK = ["//gerrit-plugin-api:lib-neverlink"]
 
 PLUGIN_TEST_DEPS = [
-    "//gerrit-acceptance-framework:lib",
+    "//java/com/google/gerrit/acceptance:lib",
     "//lib/bouncycastle:bcpg",
     "//lib/bouncycastle:bcpkix",
     "//lib/bouncycastle:bcprov",

tools/maven/BUILD

@@ -7,19 +7,19 @@ URL = "https://oss.sonatype.org/content/repositories/snapshots" if GERRIT_VERSIO
 
 maven_package(
     src = {
-        "gerrit-acceptance-framework": "//gerrit-acceptance-framework:liblib-src.jar",
+        "gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:liblib-src.jar",
         "gerrit-extension-api": "//java/com/google/gerrit/extensions:libapi-src.jar",
         "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-sources_deploy.jar",
         "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
     },
     doc = {
-        "gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework-javadoc",
+        "gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:acceptance-framework-javadoc",
         "gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api-javadoc",
         "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-javadoc",
         "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-javadoc",
     },
     jar = {
-        "gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework_deploy.jar",
+        "gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:acceptance-framework_deploy.jar",
         "gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api_deploy.jar",
         "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api_deploy.jar",
         "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api_deploy.jar",