Dissolve gerrit-acceptance-tests top-level directory

Change-Id: Ibf27b61d867eef7539fc85f92aab1b051082e964

BUILD

@@ -45,9 +45,9 @@ pkg_war(
 )
 
 API_DEPS = [
-    "//java/com/google/gerrit/acceptance:acceptance-framework_deploy.jar",
-    "//java/com/google/gerrit/acceptance:liblib-src.jar",
-    "//java/com/google/gerrit/acceptance:acceptance-framework-javadoc",
+    "//java/com/google/gerrit/acceptance:framework_deploy.jar",
+    "//java/com/google/gerrit/acceptance:libframework-lib-src.jar",
+    "//java/com/google/gerrit/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",

Documentation/dev-bazel.txt

@@ -193,13 +193,13 @@ Debugging tests:
 Debug test example:
 
 ----
-  bazel test --test_output=streamed --test_filter=com.google.gerrit.acceptance.api.change.ChangeIT.getAmbiguous //gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change:api_change
+  bazel test --test_output=streamed --test_filter=com.google.gerrit.acceptance.api.change.ChangeIT.getAmbiguous //javatests/com/google/gerrit/acceptance/api/change:api_change
 ----
 
 To run a specific test group, e.g. the rest-account test group:
 
 ----
-  bazel test //gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account:rest_account
+  bazel test //javatests/com/google/gerrit/acceptance/rest/account:rest_account
 ----
 
 To run the tests against NoteDb backend with write

gerrit-acceptance-tests/BUILD

@@ -1,49 +0,0 @@
-RESOURCES = glob(["src/test/resources/**/*"])
-
-java_library(
-    name = "lib",
-    testonly = 1,
-    srcs = ["src/test/java/com/google/gerrit/acceptance/Dummy.java"],
-    resources = RESOURCES,
-    visibility = ["//visibility:public"],
-    exports = [
-        "//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/extensions/common/testing:common-test-util",
-        "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
-        "//java/com/google/gerrit/gpg/testing:gpg-test-util",
-        "//java/com/google/gerrit/httpd",
-        "//java/com/google/gerrit/lucene",
-        "//java/com/google/gerrit/metrics",
-        "//java/com/google/gerrit/pgm",
-        "//java/com/google/gerrit/pgm/init",
-        "//java/com/google/gerrit/pgm/util",
-        "//java/com/google/gerrit/reviewdb:server",
-        "//java/com/google/gerrit/sshd",
-        "//lib:args4j",
-        "//lib:gson",
-        "//lib:guava-retrying",
-        "//lib:gwtjsonrpc",
-        "//lib:gwtorm",
-        "//lib:h2",
-        "//lib:jimfs",
-        "//lib:jsch",
-        "//lib:servlet-api-3_1-without-neverlink",
-        "//lib/bouncycastle:bcpg",
-        "//lib/bouncycastle:bcprov",
-        "//lib/commons:compress",
-        "//lib/guice",
-        "//lib/guice:guice-assistedinject",
-        "//lib/guice:guice-servlet",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/log:api",
-        "//lib/mina:sshd",
-        "//prolog:gerrit-prolog-common",
-    ],
-)

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/Dummy.java

@@ -1,17 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.acceptance;
-
-public class Dummy {}

java/com/google/gerrit/acceptance/BUILD

@@ -1,5 +1,53 @@
 load("//tools/bzl:java.bzl", "java_library2")
 
+java_library(
+    name = "lib",
+    testonly = 1,
+    resource_strip_prefix = "resources",
+    resources = ["//resources/com/google/gerrit/acceptance"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":framework-lib",
+        "//gerrit-launcher:launcher",
+        "//gerrit-server:receive",
+        "//gerrit-server:server",
+        "//gerrit-server:testutil",
+        "//java/com/google/gerrit/common:annotations",
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/extensions/common/testing:common-test-util",
+        "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
+        "//java/com/google/gerrit/gpg/testing:gpg-test-util",
+        "//java/com/google/gerrit/httpd",
+        "//java/com/google/gerrit/lucene",
+        "//java/com/google/gerrit/metrics",
+        "//java/com/google/gerrit/pgm",
+        "//java/com/google/gerrit/pgm/init",
+        "//java/com/google/gerrit/pgm/util",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/sshd",
+        "//lib:args4j",
+        "//lib:gson",
+        "//lib:guava-retrying",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:h2",
+        "//lib:jimfs",
+        "//lib:jsch",
+        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib/bouncycastle:bcpg",
+        "//lib/bouncycastle:bcprov",
+        "//lib/commons:compress",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/mina:sshd",
+        "//prolog:gerrit-prolog-common",
+    ],
+)
+
 PROVIDED = [
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
@@ -20,15 +68,15 @@ PROVIDED = [
 ]
 
 java_binary(
-    name = "acceptance-framework",
+    name = "framework",
     testonly = 1,
     main_class = "Dummy",
     visibility = ["//visibility:public"],
-    runtime_deps = [":lib"],
+    runtime_deps = [":framework-lib"],
 )
 
 java_library2(
-    name = "lib",
+    name = "framework-lib",
     testonly = 1,
     srcs = glob(["**/*.java"]),
     exported_deps = [
@@ -69,9 +117,9 @@ java_library2(
 load("//tools/bzl:javadoc.bzl", "java_doc")
 
 java_doc(
-    name = "acceptance-framework-javadoc",
+    name = "framework-javadoc",
     testonly = 1,
-    libs = [":lib"],
+    libs = [":framework-lib"],
     pkgs = ["com.google.gerrit.acceptance"],
     title = "Gerrit Acceptance Test Framework Documentation",
     visibility = ["//visibility:public"],

javatests/com/google/gerrit/acceptance/annotation/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*.java"]),

javatests/com/google/gerrit/acceptance/api/accounts/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),

javatests/com/google/gerrit/acceptance/api/change/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),

javatests/com/google/gerrit/acceptance/api/config/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),

javatests/com/google/gerrit/acceptance/api/group/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),
@@ -6,7 +6,7 @@ acceptance_tests(
     labels = ["api"],
     deps = [
         ":util",
-        "//gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account:util",
+        "//javatests/com/google/gerrit/acceptance/rest/account:util",
     ],
 )
 

javatests/com/google/gerrit/acceptance/api/plugin/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),

javatests/com/google/gerrit/acceptance/api/project/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),

javatests/com/google/gerrit/acceptance/api/revision/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),

javatests/com/google/gerrit/acceptance/edit/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = ["ChangeEditIT.java"],

javatests/com/google/gerrit/acceptance/git/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),
@@ -15,7 +15,7 @@ java_library(
     testonly = 1,
     srcs = ["AbstractPushForReview.java"],
     deps = [
-        "//gerrit-acceptance-tests:lib",
+        "//java/com/google/gerrit/acceptance:lib",
     ],
 )
 
@@ -23,5 +23,5 @@ java_library(
     name = "submodule_util",
     testonly = 1,
     srcs = ["AbstractSubmoduleSubscription.java"],
-    deps = ["//gerrit-acceptance-tests:lib"],
+    deps = ["//java/com/google/gerrit/acceptance:lib"],
 )

javatests/com/google/gerrit/acceptance/pgm/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),
@@ -12,5 +12,5 @@ java_library(
     name = "util",
     testonly = 1,
     srcs = ["IndexUpgradeController.java"],
-    deps = ["//gerrit-acceptance-tests:lib"],
+    deps = ["//java/com/google/gerrit/acceptance:lib"],
 )

javatests/com/google/gerrit/acceptance/rest/account/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
     srcs = glob(["*IT.java"]),
@@ -16,7 +16,7 @@ java_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-acceptance-tests:lib",
+        "//java/com/google/gerrit/acceptance:lib",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:gwtorm",
         "//lib:junit",

javatests/com/google/gerrit/acceptance/rest/change/BUILD

@@ -1,4 +1,4 @@
-load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
 
 SUBMIT_UTIL_SRCS = glob(["AbstractSubmit*.java"])
 
@@ -32,6 +32,6 @@ java_library(
     testonly = 1,
     srcs = SUBMIT_UTIL_SRCS,
     deps = [
-        "//gerrit-acceptance-tests:lib",
+        "//java/com/google/gerrit/acceptance:lib",
     ],
 )