From 261187922d4fde3118f4e640f5ae9cfa8f0ee9f6 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 17 Sep 2017 23:29:52 +0200 Subject: [PATCH] Move extensions test utility sources to testing packages In the vein of matching the Gerrit layout to what is used internally at Google: * Test utilities go in the java tree; specifically, tests for subpackage foo go in java/com/google/gerrit/foo/testing * java_library rules for test utilities get testonly = 1 * Tests for subpackage foo go in javatests/com/google/gerrit/foo * Tests for test utilities go in javatests/com/google/gerrit/foo/testing Change-Id: I6a537855d54809f5e033f299147121361e750a78 --- gerrit-acceptance-tests/BUILD | 3 ++- .../acceptance/api/revision/RevisionDiffIT.java | 4 ++-- .../acceptance/api/revision/RobotCommentsIT.java | 6 +++--- .../google/gerrit/acceptance/edit/ChangeEditIT.java | 4 ++-- .../gerrit/acceptance/git/AbstractPushForReview.java | 4 ++-- .../acceptance/server/change/GetRelatedIT.java | 2 +- gerrit-extension-api/BUILD | 3 ++- .../google/gerrit/extensions/client/RangeTest.java | 2 +- gerrit-server/BUILD | 2 +- .../google/gerrit/server/config/SitePathsTest.java | 2 +- .../gerrit/extensions/{ => client/testing}/BUILD | 2 +- .../client/{ => testing}/RangeSubject.java | 3 ++- .../google/gerrit/extensions/common/testing/BUILD | 12 ++++++++++++ .../common/{ => testing}/CommitInfoSubject.java | 3 ++- .../common/{ => testing}/ContentEntrySubject.java | 2 +- .../common/{ => testing}/DiffInfoSubject.java | 4 +++- .../common/{ => testing}/EditInfoSubject.java | 3 ++- .../common/{ => testing}/FileInfoSubject.java | 3 ++- .../{ => testing}/FixReplacementInfoSubject.java | 5 +++-- .../{ => testing}/FixSuggestionInfoSubject.java | 4 +++- .../common/{ => testing}/GitPersonSubject.java | 3 ++- .../extensions/common/{ => testing}/PathSubject.java | 2 +- .../{ => testing}/RobotCommentInfoSubject.java | 4 +++- .../google/gerrit/extensions/restapi/testing/BUILD | 11 +++++++++++ .../restapi/{ => testing}/BinaryResultSubject.java | 3 ++- 25 files changed, 67 insertions(+), 29 deletions(-) rename java/com/google/gerrit/extensions/{ => client/testing}/BUILD (88%) rename java/com/google/gerrit/extensions/client/{ => testing}/RangeSubject.java (94%) create mode 100644 java/com/google/gerrit/extensions/common/testing/BUILD rename java/com/google/gerrit/extensions/common/{ => testing}/CommitInfoSubject.java (94%) rename java/com/google/gerrit/extensions/common/{ => testing}/ContentEntrySubject.java (97%) rename java/com/google/gerrit/extensions/common/{ => testing}/DiffInfoSubject.java (91%) rename java/com/google/gerrit/extensions/common/{ => testing}/EditInfoSubject.java (94%) rename java/com/google/gerrit/extensions/common/{ => testing}/FileInfoSubject.java (94%) rename java/com/google/gerrit/extensions/common/{ => testing}/FixReplacementInfoSubject.java (89%) rename java/com/google/gerrit/extensions/common/{ => testing}/FixSuggestionInfoSubject.java (91%) rename java/com/google/gerrit/extensions/common/{ => testing}/GitPersonSubject.java (92%) rename java/com/google/gerrit/extensions/common/{ => testing}/PathSubject.java (95%) rename java/com/google/gerrit/extensions/common/{ => testing}/RobotCommentInfoSubject.java (91%) create mode 100644 java/com/google/gerrit/extensions/restapi/testing/BUILD rename java/com/google/gerrit/extensions/restapi/{ => testing}/BinaryResultSubject.java (95%) diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD index f895d68280..d7360651e3 100644 --- a/gerrit-acceptance-tests/BUILD +++ b/gerrit-acceptance-tests/BUILD @@ -24,7 +24,8 @@ java_library( "//gerrit-server:server", "//gerrit-server:testutil", "//gerrit-sshd:sshd", - "//java/com/google/gerrit/extensions", + "//java/com/google/gerrit/extensions/common/testing:common-test-util", + "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util", "//lib:args4j", "//lib:gson", "//lib:guava-retrying", diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java index 35eb034b78..61bba0ed49 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java @@ -16,8 +16,8 @@ package com.google.gerrit.acceptance.api.revision; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.TruthJUnit.assume; -import static com.google.gerrit.extensions.common.DiffInfoSubject.assertThat; -import static com.google.gerrit.extensions.common.FileInfoSubject.assertThat; +import static com.google.gerrit.extensions.common.testing.DiffInfoSubject.assertThat; +import static com.google.gerrit.extensions.common.testing.FileInfoSubject.assertThat; import static com.google.gerrit.reviewdb.client.Patch.COMMIT_MSG; import com.google.common.base.Joiner; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java index c440d9099c..cd20765940 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java @@ -17,8 +17,8 @@ package com.google.gerrit.acceptance.api.revision; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.TruthJUnit.assume; import static com.google.gerrit.acceptance.PushOneCommit.SUBJECT; -import static com.google.gerrit.extensions.common.EditInfoSubject.assertThat; -import static com.google.gerrit.extensions.common.RobotCommentInfoSubject.assertThatList; +import static com.google.gerrit.extensions.common.testing.EditInfoSubject.assertThat; +import static com.google.gerrit.extensions.common.testing.RobotCommentInfoSubject.assertThatList; import static java.util.stream.Collectors.toList; import com.google.common.collect.ImmutableList; @@ -38,11 +38,11 @@ import com.google.gerrit.extensions.common.FixSuggestionInfo; import com.google.gerrit.extensions.common.RobotCommentInfo; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.BinaryResult; -import com.google.gerrit.extensions.restapi.BinaryResultSubject; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.extensions.restapi.testing.BinaryResultSubject; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java index 8e74b7e192..19fd9f7291 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java @@ -20,8 +20,8 @@ import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_COMM import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION; import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS; import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES; -import static com.google.gerrit.extensions.common.EditInfoSubject.assertThat; -import static com.google.gerrit.extensions.restapi.BinaryResultSubject.assertThat; +import static com.google.gerrit.extensions.common.testing.EditInfoSubject.assertThat; +import static com.google.gerrit.extensions.restapi.testing.BinaryResultSubject.assertThat; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 8fba98027b..da51f15f5b 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -27,7 +27,7 @@ import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVI import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_ACCOUNTS; import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS; import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES; -import static com.google.gerrit.extensions.common.EditInfoSubject.assertThat; +import static com.google.gerrit.extensions.common.testing.EditInfoSubject.assertThat; import static com.google.gerrit.server.git.receive.ReceiveConstants.PUSH_OPTION_SKIP_VALIDATION; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.project.Util.category; @@ -65,9 +65,9 @@ import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.common.EditInfo; -import com.google.gerrit.extensions.common.EditInfoSubject; import com.google.gerrit.extensions.common.LabelInfo; import com.google.gerrit.extensions.common.RevisionInfo; +import com.google.gerrit.extensions.common.testing.EditInfoSubject; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.ChangeMessage; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index d4019ec341..93fa261b31 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -16,7 +16,7 @@ package com.google.gerrit.acceptance.server.change; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.acceptance.GitUtil.pushHead; -import static com.google.gerrit.extensions.common.EditInfoSubject.assertThat; +import static com.google.gerrit.extensions.common.testing.EditInfoSubject.assertThat; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.common.collect.ImmutableList; diff --git a/gerrit-extension-api/BUILD b/gerrit-extension-api/BUILD index 657a85c30d..4e0ff33d0f 100644 --- a/gerrit-extension-api/BUILD +++ b/gerrit-extension-api/BUILD @@ -54,7 +54,8 @@ junit_tests( srcs = glob(["src/test/java/**/*Test.java"]), deps = [ ":api", - "//java/com/google/gerrit/extensions", + "//java/com/google/gerrit/extensions/client/testing:client-test-util", + "//java/com/google/gerrit/extensions/common/testing:common-test-util", "//lib:truth", "//lib/guice", ], diff --git a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/client/RangeTest.java b/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/client/RangeTest.java index 9695933679..ebffc7cd63 100644 --- a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/client/RangeTest.java +++ b/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/client/RangeTest.java @@ -14,7 +14,7 @@ package com.google.gerrit.extensions.client; -import static com.google.gerrit.extensions.client.RangeSubject.assertThat; +import static com.google.gerrit.extensions.client.testing.RangeSubject.assertThat; import org.junit.Test; diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD index fcab2912cb..c78fc11924 100644 --- a/gerrit-server/BUILD +++ b/gerrit-server/BUILD @@ -299,7 +299,7 @@ junit_tests( ":testutil", "//gerrit-index:query_exception", "//gerrit-patch-jgit:server", - "//java/com/google/gerrit/extensions", + "//java/com/google/gerrit/extensions/common/testing:common-test-util", "//lib:args4j", "//lib:grappa", "//lib:gson", diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java index 3fb278df24..979dd7cc21 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.config; import static com.google.common.truth.Truth.assertThat; -import com.google.gerrit.extensions.common.PathSubject; +import com.google.gerrit.extensions.common.testing.PathSubject; import com.google.gerrit.server.util.HostPlatform; import com.google.gerrit.testutil.GerritBaseTests; import java.io.IOException; diff --git a/java/com/google/gerrit/extensions/BUILD b/java/com/google/gerrit/extensions/client/testing/BUILD similarity index 88% rename from java/com/google/gerrit/extensions/BUILD rename to java/com/google/gerrit/extensions/client/testing/BUILD index dc56785c88..3ce7e1bccf 100644 --- a/java/com/google/gerrit/extensions/BUILD +++ b/java/com/google/gerrit/extensions/client/testing/BUILD @@ -1,5 +1,5 @@ java_library( - name = "extensions", + name = "client-test-util", testonly = 1, srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], diff --git a/java/com/google/gerrit/extensions/client/RangeSubject.java b/java/com/google/gerrit/extensions/client/testing/RangeSubject.java similarity index 94% rename from java/com/google/gerrit/extensions/client/RangeSubject.java rename to java/com/google/gerrit/extensions/client/testing/RangeSubject.java index 40347a7aa7..df925299f3 100644 --- a/java/com/google/gerrit/extensions/client/RangeSubject.java +++ b/java/com/google/gerrit/extensions/client/testing/RangeSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.client; +package com.google.gerrit.extensions.client.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,6 +20,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.IntegerSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.client.Comment; public class RangeSubject extends Subject { diff --git a/java/com/google/gerrit/extensions/common/testing/BUILD b/java/com/google/gerrit/extensions/common/testing/BUILD new file mode 100644 index 0000000000..70d9c50b17 --- /dev/null +++ b/java/com/google/gerrit/extensions/common/testing/BUILD @@ -0,0 +1,12 @@ +java_library( + name = "common-test-util", + testonly = 1, + srcs = glob(["**/*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions/client/testing:client-test-util", + "//java/com/google/gerrit/truth", + "//lib:truth", + ], +) diff --git a/java/com/google/gerrit/extensions/common/CommitInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java similarity index 94% rename from java/com/google/gerrit/extensions/common/CommitInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java index 37ae64319e..1e32c6e91f 100644 --- a/java/com/google/gerrit/extensions/common/CommitInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,6 +20,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.common.CommitInfo; import com.google.gerrit.truth.ListSubject; public class CommitInfoSubject extends Subject { diff --git a/java/com/google/gerrit/extensions/common/ContentEntrySubject.java b/java/com/google/gerrit/extensions/common/testing/ContentEntrySubject.java similarity index 97% rename from java/com/google/gerrit/extensions/common/ContentEntrySubject.java rename to java/com/google/gerrit/extensions/common/testing/ContentEntrySubject.java index 4e10ec4b9d..48f7f45f86 100644 --- a/java/com/google/gerrit/extensions/common/ContentEntrySubject.java +++ b/java/com/google/gerrit/extensions/common/testing/ContentEntrySubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; diff --git a/java/com/google/gerrit/extensions/common/DiffInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java similarity index 91% rename from java/com/google/gerrit/extensions/common/DiffInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java index a91c0bacf0..6918325f34 100644 --- a/java/com/google/gerrit/extensions/common/DiffInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,6 +20,8 @@ import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.common.ChangeType; +import com.google.gerrit.extensions.common.DiffInfo; import com.google.gerrit.extensions.common.DiffInfo.ContentEntry; import com.google.gerrit.truth.ListSubject; diff --git a/java/com/google/gerrit/extensions/common/EditInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/EditInfoSubject.java similarity index 94% rename from java/com/google/gerrit/extensions/common/EditInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/EditInfoSubject.java index ea5f72e1d1..84ad61ce0e 100644 --- a/java/com/google/gerrit/extensions/common/EditInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/EditInfoSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,6 +20,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.common.EditInfo; import com.google.gerrit.truth.OptionalSubject; import java.util.Optional; diff --git a/java/com/google/gerrit/extensions/common/FileInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java similarity index 94% rename from java/com/google/gerrit/extensions/common/FileInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java index ac926341c9..b088016f9b 100644 --- a/java/com/google/gerrit/extensions/common/FileInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -21,6 +21,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.IntegerSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.common.FileInfo; public class FileInfoSubject extends Subject { diff --git a/java/com/google/gerrit/extensions/common/FixReplacementInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java similarity index 89% rename from java/com/google/gerrit/extensions/common/FixReplacementInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java index 811cc47d77..cfc2ea07b5 100644 --- a/java/com/google/gerrit/extensions/common/FixReplacementInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,7 +20,8 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; -import com.google.gerrit.extensions.client.RangeSubject; +import com.google.gerrit.extensions.client.testing.RangeSubject; +import com.google.gerrit.extensions.common.FixReplacementInfo; public class FixReplacementInfoSubject extends Subject { diff --git a/java/com/google/gerrit/extensions/common/FixSuggestionInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/FixSuggestionInfoSubject.java similarity index 91% rename from java/com/google/gerrit/extensions/common/FixSuggestionInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/FixSuggestionInfoSubject.java index beaf6c1489..7a6da9cb90 100644 --- a/java/com/google/gerrit/extensions/common/FixSuggestionInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/FixSuggestionInfoSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,6 +20,8 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.common.FixReplacementInfo; +import com.google.gerrit.extensions.common.FixSuggestionInfo; import com.google.gerrit.truth.ListSubject; public class FixSuggestionInfoSubject extends Subject { diff --git a/java/com/google/gerrit/extensions/common/GitPersonSubject.java b/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java similarity index 92% rename from java/com/google/gerrit/extensions/common/GitPersonSubject.java rename to java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java index 5f29bc963c..0cab74c328 100644 --- a/java/com/google/gerrit/extensions/common/GitPersonSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; @@ -20,6 +20,7 @@ import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.common.GitPerson; import java.sql.Timestamp; public class GitPersonSubject extends Subject { diff --git a/java/com/google/gerrit/extensions/common/PathSubject.java b/java/com/google/gerrit/extensions/common/testing/PathSubject.java similarity index 95% rename from java/com/google/gerrit/extensions/common/PathSubject.java rename to java/com/google/gerrit/extensions/common/testing/PathSubject.java index aebeee23df..0b6917c308 100644 --- a/java/com/google/gerrit/extensions/common/PathSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/PathSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; diff --git a/java/com/google/gerrit/extensions/common/RobotCommentInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/RobotCommentInfoSubject.java similarity index 91% rename from java/com/google/gerrit/extensions/common/RobotCommentInfoSubject.java rename to java/com/google/gerrit/extensions/common/testing/RobotCommentInfoSubject.java index 465d447d21..c2bed866f7 100644 --- a/java/com/google/gerrit/extensions/common/RobotCommentInfoSubject.java +++ b/java/com/google/gerrit/extensions/common/testing/RobotCommentInfoSubject.java @@ -12,12 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.common; +package com.google.gerrit.extensions.common.testing; import static com.google.common.truth.Truth.assertAbout; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; +import com.google.gerrit.extensions.common.FixSuggestionInfo; +import com.google.gerrit.extensions.common.RobotCommentInfo; import com.google.gerrit.truth.ListSubject; import java.util.List; diff --git a/java/com/google/gerrit/extensions/restapi/testing/BUILD b/java/com/google/gerrit/extensions/restapi/testing/BUILD new file mode 100644 index 0000000000..e836c73c60 --- /dev/null +++ b/java/com/google/gerrit/extensions/restapi/testing/BUILD @@ -0,0 +1,11 @@ +java_library( + name = "restapi-test-util", + testonly = 1, + srcs = glob(["**/*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//gerrit-extension-api:api", + "//java/com/google/gerrit/truth", + "//lib:truth", + ], +) diff --git a/java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java b/java/com/google/gerrit/extensions/restapi/testing/BinaryResultSubject.java similarity index 95% rename from java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java rename to java/com/google/gerrit/extensions/restapi/testing/BinaryResultSubject.java index cf9df87bdb..186730824e 100644 --- a/java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java +++ b/java/com/google/gerrit/extensions/restapi/testing/BinaryResultSubject.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.extensions.restapi; +package com.google.gerrit.extensions.restapi.testing; import static com.google.common.truth.Truth.assertAbout; @@ -21,6 +21,7 @@ import com.google.common.truth.PrimitiveByteArraySubject; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import com.google.gerrit.extensions.restapi.BinaryResult; import com.google.gerrit.truth.OptionalSubject; import java.io.ByteArrayOutputStream; import java.io.IOException;