Add JGit client test for unset mirror
The unset mirror test for the CGit client was added in a previous
change, but change 389376, which added this feature to JGit, didn't
include this.
Add test for the scenario where the mirror flag is unset, i.e. don't
remove remotely tracked refs. This provides the same coverage for this
feature for CGit and JGit.
Bug: Issue 40015295
Change-Id: I5b329b73c291536abc6d44d0d76c3f73c4489dbc
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchIT.java
index dea9a6d..b900d8a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchIT.java
@@ -26,26 +26,15 @@
import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.entities.Permission;
-import com.google.gerrit.extensions.config.FactoryModule;
import com.google.inject.Inject;
-import com.google.inject.Scopes;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-import com.googlesource.gerrit.plugins.replication.AutoReloadSecureCredentialsFactoryDecorator;
-import com.googlesource.gerrit.plugins.replication.CredentialsFactory;
-import com.googlesource.gerrit.plugins.replication.ReplicationConfig;
-import com.googlesource.gerrit.plugins.replication.ReplicationFileBasedConfig;
import com.googlesource.gerrit.plugins.replication.pull.fetch.Fetch;
-import com.googlesource.gerrit.plugins.replication.pull.fetch.FetchClientImplementation;
-import com.googlesource.gerrit.plugins.replication.pull.fetch.FetchFactory;
import com.googlesource.gerrit.plugins.replication.pull.fetch.JGitFetch;
import com.googlesource.gerrit.plugins.replication.pull.fetch.PermanentTransportException;
-import java.net.URISyntaxException;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RefSpec;
-import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
import org.junit.Before;
import org.junit.Test;
@@ -82,7 +71,7 @@
}
@Test
- public void shouldPruneRefsWhenMirrorIsTrue() throws Exception {
+ public void shouldPruneRefsWhenMirrorIsUnset() throws Exception {
testRepo = cloneProject(createTestProject(project + TEST_REPLICATION_SUFFIX));
String branchRef = Constants.R_HEADS + "anyBranch";
String tagRef = Constants.R_TAGS + "anyTag";
@@ -105,35 +94,23 @@
assertOkStatus(deleteTagResult, tagRef);
fetchAllRefs(TEST_TASK_ID, testRepoPath, localRepo);
- assertThat(getRef(localRepo, branchRef)).isNull();
- assertThat(getRef(localRepo, tagRef)).isNull();
+ assertThat(getRef(localRepo, branchRef)).isNotNull();
+ assertThat(getRef(localRepo, tagRef)).isNotNull();
}
}
@SuppressWarnings("unused")
- private static class TestModule extends FactoryModule {
+ private static class TestModule extends FetchModule<JGitFetch> {
@Override
- protected void configure() {
+ Class<JGitFetch> clientClass() {
+ return JGitFetch.class;
+ }
+
+ @Override
+ Config cf() {
Config cf = new Config();
cf.setInt("remote", "test_config", "timeout", 0);
- cf.setBoolean("remote", "test_config", "mirror", true);
- try {
- RemoteConfig remoteConfig = new RemoteConfig(cf, "test_config");
- SourceConfiguration sourceConfig = new SourceConfiguration(remoteConfig, cf);
- bind(ReplicationConfig.class).to(ReplicationFileBasedConfig.class);
- bind(CredentialsFactory.class)
- .to(AutoReloadSecureCredentialsFactoryDecorator.class)
- .in(Scopes.SINGLETON);
-
- bind(SourceConfiguration.class).toInstance(sourceConfig);
- install(
- new FactoryModuleBuilder()
- .implement(Fetch.class, JGitFetch.class)
- .implement(Fetch.class, FetchClientImplementation.class, JGitFetch.class)
- .build(FetchFactory.class));
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
+ return cf;
}
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchWithMirrorIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchWithMirrorIT.java
new file mode 100644
index 0000000..2df700f
--- /dev/null
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/JGitFetchWithMirrorIT.java
@@ -0,0 +1,100 @@
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.replication.pull;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.acceptance.GitUtil.deleteRef;
+import static com.google.gerrit.acceptance.GitUtil.pushHead;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow;
+
+import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.acceptance.SkipProjectClone;
+import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.UseLocalDisk;
+import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
+import com.google.gerrit.entities.Permission;
+import com.google.inject.Inject;
+import com.googlesource.gerrit.plugins.replication.pull.fetch.JGitFetch;
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.PushResult;
+import org.junit.Before;
+import org.junit.Test;
+
+@SkipProjectClone
+@UseLocalDisk
+@TestPlugin(
+ name = "pull-replication",
+ sysModule = "com.googlesource.gerrit.plugins.replication.pull.JGitFetchWithMirrorIT$TestModule")
+public class JGitFetchWithMirrorIT extends FetchITBase {
+ private static final String TEST_REPLICATION_SUFFIX = "suffix1";
+ private static final String TEST_TASK_ID = "taskid";
+
+ @Inject private ProjectOperations projectOperations;
+
+ @Before
+ public void allowRefDeletion() {
+ projectOperations
+ .allProjectsForUpdate()
+ .add(allow(Permission.DELETE).ref("refs/*").group(adminGroupUuid()))
+ .update();
+ }
+
+ @Test
+ public void shouldPruneRefsWhenMirrorIsTrue() throws Exception {
+ testRepo = cloneProject(createTestProject(project + TEST_REPLICATION_SUFFIX));
+ String branchRef = Constants.R_HEADS + "anyBranch";
+ String tagRef = Constants.R_TAGS + "anyTag";
+
+ PushOneCommit.Result branchPush = pushFactory.create(user.newIdent(), testRepo).to(branchRef);
+ branchPush.assertOkStatus();
+
+ PushResult tagPush = pushHead(testRepo, tagRef, false, false);
+ assertOkStatus(tagPush, tagRef);
+
+ try (Repository localRepo = repoManager.openRepository(project)) {
+ fetchAllRefs(TEST_TASK_ID, testRepoPath, localRepo);
+ assertThat(getRef(localRepo, branchRef)).isNotNull();
+ assertThat(getRef(localRepo, tagRef)).isNotNull();
+
+ PushResult deleteBranchResult = deleteRef(testRepo, branchRef);
+ assertOkStatus(deleteBranchResult, branchRef);
+
+ PushResult deleteTagResult = deleteRef(testRepo, tagRef);
+ assertOkStatus(deleteTagResult, tagRef);
+
+ fetchAllRefs(TEST_TASK_ID, testRepoPath, localRepo);
+ assertThat(getRef(localRepo, branchRef)).isNull();
+ assertThat(getRef(localRepo, tagRef)).isNull();
+ }
+ }
+
+ @SuppressWarnings("unused")
+ private static class TestModule extends FetchModule<JGitFetch> {
+ @Override
+ Class<JGitFetch> clientClass() {
+ return JGitFetch.class;
+ }
+
+ @Override
+ Config cf() {
+ Config cf = new Config();
+ cf.setInt("remote", "test_config", "timeout", 0);
+ cf.setBoolean("remote", "test_config", "mirror", true);
+ return cf;
+ }
+ }
+}
