Move plugin field tests into respective packages
These originated in the "api" package but the REST/SSH tests are a
better fit for the "rest"/"ssh" packages. Similarly, move the abstract
test class to a common place where we don't have to @Ignore it.
Arguably, the SSH tests belong in a separate ssh.change subpackage, but
that doesn't currently exist.
Change-Id: I2feae1edc020c527d089c4d8679d32b85c76744a
diff --git a/javatests/com/google/gerrit/acceptance/api/change/AbstractPluginFieldsTest.java b/java/com/google/gerrit/acceptance/AbstractPluginFieldsTest.java
similarity index 96%
rename from javatests/com/google/gerrit/acceptance/api/change/AbstractPluginFieldsTest.java
rename to java/com/google/gerrit/acceptance/AbstractPluginFieldsTest.java
index 8ecafa1..9d62e20 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/AbstractPluginFieldsTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractPluginFieldsTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.acceptance.api.change;
+package com.google.gerrit.acceptance;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.truth.Truth.assertThat;
@@ -20,7 +20,6 @@
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableListMultimap;
-import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.common.ChangeInfo;
@@ -36,15 +35,13 @@
import com.google.inject.Module;
import java.util.List;
import java.util.Objects;
-import org.junit.Ignore;
import org.kohsuke.args4j.Option;
-@Ignore
public class AbstractPluginFieldsTest extends AbstractDaemonTest {
protected static class MyInfo extends PluginDefinedInfo {
@Nullable String theAttribute;
- MyInfo(@Nullable String theAttribute) {
+ public MyInfo(@Nullable String theAttribute) {
this.theAttribute = theAttribute;
}
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index 5e59007..d61cf7a 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -115,6 +115,8 @@
"//java/com/google/gerrit/server/restapi",
"//java/com/google/gerrit/server/schema",
"//java/com/google/gerrit/server/util/time",
+ "//java/com/google/gerrit/sshd",
+ "//lib:args4j",
"//lib:gson",
"//lib:guava-retrying",
"//lib:gwtorm",
diff --git a/javatests/com/google/gerrit/acceptance/api/change/BUILD b/javatests/com/google/gerrit/acceptance/api/change/BUILD
index 37939b0..9279488 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/BUILD
+++ b/javatests/com/google/gerrit/acceptance/api/change/BUILD
@@ -1,27 +1,11 @@
load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
-PLUGIN_UTIL_SRCS = ["AbstractPluginFieldsTest.java"]
-
acceptance_tests(
- srcs = glob(
- ["*IT.java"],
- exclude = PLUGIN_UTIL_SRCS,
- ),
+ srcs = glob(["*IT.java"]),
group = "api_change",
labels = [
"api",
"noci",
],
- deps = [
- ":plugin_util",
- "//java/com/google/gerrit/server/util/time",
- ],
-)
-
-java_library(
- name = "plugin_util",
- srcs = PLUGIN_UTIL_SRCS,
- deps = [
- "//java/com/google/gerrit/acceptance:lib",
- ],
+ deps = ["//java/com/google/gerrit/server/util/time"],
)
diff --git a/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsIT.java b/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsIT.java
index c68ceac..9ab730c 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsIT.java
@@ -14,6 +14,7 @@
package com.google.gerrit.acceptance.api.change;
+import com.google.gerrit.acceptance.AbstractPluginFieldsTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.server.change.ChangeAttributeFactory;
diff --git a/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsRestIT.java b/javatests/com/google/gerrit/acceptance/rest/change/PluginFieldsIT.java
similarity index 96%
rename from javatests/com/google/gerrit/acceptance/api/change/PluginFieldsRestIT.java
rename to javatests/com/google/gerrit/acceptance/rest/change/PluginFieldsIT.java
index 54ff975..6388fe9 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsRestIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/PluginFieldsIT.java
@@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.acceptance.api.change;
+package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableListMultimap;
+import com.google.gerrit.acceptance.AbstractPluginFieldsTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.json.OutputFormat;
@@ -28,7 +29,7 @@
import java.util.Map;
import org.junit.Test;
-public class PluginFieldsRestIT extends AbstractPluginFieldsTest {
+public class PluginFieldsIT extends AbstractPluginFieldsTest {
private static final Gson GSON = OutputFormat.JSON.newGson();
@Test
diff --git a/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsSshIT.java b/javatests/com/google/gerrit/acceptance/ssh/PluginChangeFieldsIT.java
similarity index 94%
rename from javatests/com/google/gerrit/acceptance/api/change/PluginFieldsSshIT.java
rename to javatests/com/google/gerrit/acceptance/ssh/PluginChangeFieldsIT.java
index df896a8..d196c5a 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/PluginFieldsSshIT.java
+++ b/javatests/com/google/gerrit/acceptance/ssh/PluginChangeFieldsIT.java
@@ -12,13 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.acceptance.api.change;
+package com.google.gerrit.acceptance.ssh;
import static com.google.common.truth.Truth.assertThat;
import static java.util.stream.Collectors.joining;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.io.CharStreams;
+import com.google.gerrit.acceptance.AbstractPluginFieldsTest;
import com.google.gerrit.acceptance.UseSsh;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.reviewdb.client.Change;
@@ -33,7 +34,7 @@
import org.junit.Test;
@UseSsh
-public class PluginFieldsSshIT extends AbstractPluginFieldsTest {
+public class PluginChangeFieldsIT extends AbstractPluginFieldsTest {
// No tests for getting a single change over SSH, since the only API is the query API.
private static final Gson GSON = OutputStreamQuery.GSON;
