Move AbstractGitDaemonTest to com.google.gerrit.acceptance
I0214fc8ed made the registerRepoConnection() package-protected
therefore it isn't possible anymore for the AbstractGitDaemonTest
to access it.
Moving the AbstractGitDaemonTest to com.google.gerrit.acceptance
as a workaroun, waiting to understand the rationale behind restricting
the access to registerRepoConnection().
Change-Id: I2c2e8ed6f8822d960db471df44c4d79245e4a59e
(cherry picked from commit bc9823c1e276922e55e401275714850920edac96)
diff --git a/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/AbstractGitDaemonTest.java b/src/test/java/com/google/gerrit/acceptance/AbstractGitDaemonTest.java
similarity index 95%
rename from src/test/java/com/googlesource/gerrit/libmodule/plugins/test/AbstractGitDaemonTest.java
rename to src/test/java/com/google/gerrit/acceptance/AbstractGitDaemonTest.java
index 243baa9..ab4ecbb 100644
--- a/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/AbstractGitDaemonTest.java
+++ b/src/test/java/com/google/gerrit/acceptance/AbstractGitDaemonTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.googlesource.gerrit.libmodule.plugins.test;
+package com.google.gerrit.acceptance;
import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowCapability;
@@ -46,7 +46,7 @@
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.util.FS;
-abstract class AbstractGitDaemonTest extends AbstractDaemonTest {
+public abstract class AbstractGitDaemonTest extends AbstractDaemonTest {
private static final String REFS_CHANGES = "+refs/changes/*:refs/remotes/origin/*";
@Inject private RequestScopeOperations requestScopeOperations;
@@ -154,4 +154,8 @@
projectCache.evict(project);
}
}
+
+ protected String registerRepoConnection(Project.NameKey p, TestAccount testAccount) throws Exception {
+ return super.registerRepoConnection(p, testAccount);
+ }
}
diff --git a/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterProtocolV2IT.java b/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterProtocolV2IT.java
index 0d56ec8..9312cd6 100644
--- a/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterProtocolV2IT.java
+++ b/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterProtocolV2IT.java
@@ -23,6 +23,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.ByteStreams;
+import com.google.gerrit.acceptance.AbstractGitDaemonTest;
import com.google.gerrit.acceptance.GitClientVersion;
import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.acceptance.UseSsh;
diff --git a/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterTest.java b/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterTest.java
index 7663d76..7fb3069 100644
--- a/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterTest.java
+++ b/src/test/java/com/googlesource/gerrit/libmodule/plugins/test/GitRefsFilterTest.java
@@ -19,6 +19,7 @@
import static com.googlesource.gerrit.modules.gitrefsfilter.ChangesTsCache.CHANGES_CACHE_TS;
import static com.googlesource.gerrit.modules.gitrefsfilter.OpenChangesCache.OPEN_CHANGES_CACHE;
+import com.google.gerrit.acceptance.AbstractGitDaemonTest;
import com.google.common.cache.LoadingCache;
import com.google.gerrit.acceptance.GitUtil;
import com.google.gerrit.acceptance.NoHttpd;
