From 36db655bcbf5ad783760743ef640759ed24058fa Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 2 Sep 2015 11:10:27 -0400 Subject: [PATCH] Move DisabledReviewDb to gerrit-server testutil Change-Id: I7e337271766a442521069b5bcc8d0dac809a5831 --- .../google/gerrit/acceptance/AcceptanceTestRequestScope.java | 1 + .../java/com/google/gerrit/testutil}/DisabledReviewDb.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename {gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance => gerrit-server/src/test/java/com/google/gerrit/testutil}/DisabledReviewDb.java (98%) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java index d978c70ffa..43ad799918 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java @@ -23,6 +23,7 @@ import com.google.gerrit.server.config.RequestScopedReviewDbProvider; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator; +import com.google.gerrit.testutil.DisabledReviewDb; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; import com.google.inject.Key; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/DisabledReviewDb.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/DisabledReviewDb.java similarity index 98% rename from gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/DisabledReviewDb.java rename to gerrit-server/src/test/java/com/google/gerrit/testutil/DisabledReviewDb.java index 44d3d7fee4..7825cfb418 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/DisabledReviewDb.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/DisabledReviewDb.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.acceptance; +package com.google.gerrit.testutil; import com.google.gerrit.reviewdb.server.AccountAccess; import com.google.gerrit.reviewdb.server.AccountDiffPreferenceAccess; @@ -41,7 +41,7 @@ import com.google.gwtorm.server.Access; import com.google.gwtorm.server.StatementExecutor; /** ReviewDb that is disabled for testing. */ -class DisabledReviewDb implements ReviewDb { +public class DisabledReviewDb implements ReviewDb { private static final String MESSAGE = "ReviewDb is disabled for this test"; @Override