Merge changes from topic 'config-annotation-fix' * changes: Move Annotation Tests to own Package and add testList for Configs Use values() to set StringListConfig from Annotation

diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ConfigAnnotationParser.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ConfigAnnotationParser.java
index 4adb6c3..5d6a854 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ConfigAnnotationParser.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/ConfigAnnotationParser.java

@@ -55,7 +55,7 @@
       if (!Strings.isNullOrEmpty(c.value())) {
         cfg.setString(l.get(0), l.get(1), l.get(2), c.value());
       } else {
-        cfg.setStringList(l.get(0), l.get(1), l.get(2), Arrays.asList(c.value()));
+        cfg.setStringList(l.get(0), l.get(1), l.get(2), Arrays.asList(c.values()));
       }
     } else {
       throw new IllegalArgumentException(

diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD
index 769baeb..e7a6222 100644
--- a/gerrit-acceptance-tests/BUILD
+++ b/gerrit-acceptance-tests/BUILD

@@ -1,10 +1,8 @@
-load("//tools/bzl:java.bzl", "java_library2")
-
-java_library2(
+java_library(
     name = "lib",
     testonly = 1,
-    srcs = glob(["src/test/java/com/google/gerrit/acceptance/*.java"]),
-    exported_deps = [
+    visibility = ["//visibility:public"],
+    exports = [
         "//gerrit-acceptance-framework:lib",
         "//gerrit-common:annotations",
         "//gerrit-common:server",
@@ -40,5 +38,4 @@
         "//lib/log:api",
         "//lib/mina:sshd",
     ],
-    visibility = ["//visibility:public"],
 )

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/BUILD
new file mode 100644
index 0000000..d16b64a
--- /dev/null
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/BUILD

@@ -0,0 +1,7 @@
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
+
+acceptance_tests(
+    srcs = glob(["*.java"]),
+    group = "annotation",
+    labels = ["annotation"],
+)

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/SandboxTest.java
similarity index 88%
rename from gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java
rename to gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/SandboxTest.java
index 7b5dfa9..8d7bc3d 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/SandboxTest.java

@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.acceptance;
+package com.google.gerrit.acceptance.annotation;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.acceptance.Sandboxed;
 import org.junit.After;
 import org.junit.Test;
 

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java
similarity index 65%
rename from gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java
rename to gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java
index e3223b3..705ad4f 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java

@@ -12,30 +12,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.acceptance;
+package com.google.gerrit.acceptance.annotation;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.inject.Inject;
-import org.eclipse.jgit.lib.Config;
+import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.acceptance.GerritConfig;
 import org.junit.Test;
 
 public class UseGerritConfigAnnotationTest extends AbstractDaemonTest {
-
-  @Inject @GerritServerConfig Config serverConfig;
-
   @Test
   @GerritConfig(name = "x.y", value = "z")
   public void testOne() {
-    assertThat(serverConfig.getString("x", null, "y")).isEqualTo("z");
+    assertThat(cfg.getString("x", null, "y")).isEqualTo("z");
   }
 
   @Test
   @GerritConfig(name = "x.y", value = "z")
   @GerritConfig(name = "a.b", value = "c")
   public void testMultiple() {
-    assertThat(serverConfig.getString("x", null, "y")).isEqualTo("z");
-    assertThat(serverConfig.getString("a", null, "b")).isEqualTo("c");
+    assertThat(cfg.getString("x", null, "y")).isEqualTo("z");
+    assertThat(cfg.getString("a", null, "b")).isEqualTo("c");
+  }
+
+  @Test
+  @GerritConfig(name = "x.y", values = { "a", "b" })
+  public void testList() {
+    assertThat(cfg.getStringList("x", null, "y")).asList().containsExactly("a" , "b");
   }
 }