fix: Repair failing unit tests and CI integration tests #12350

wanling0000 · wanling0000 · commit f1214d9851a3 · 2025-07-14T00:48:12.000+01:00
diff --git a/jablib/src/main/java/org/jabref/logic/git/GitSyncService.java b/jablib/src/main/java/org/jabref/logic/git/GitSyncService.java
@@ -120,13 +120,18 @@ public MergeResult performSemanticMerge(Git git,
         // 2. Conflict detection
         List<ThreeWayEntryConflict> conflicts = SemanticConflictDetector.detectConflicts(base, local, remote);
 
-        // 3. If there are conflicts, ask strategy to resolve
-        Optional<BibDatabaseContext> maybeRemote = gitConflictResolverStrategy.resolveConflicts(conflicts, remote);
-        if (maybeRemote.isEmpty()) {
-            LOGGER.warn("Merge aborted: Conflict resolution was canceled or denied.");
-            return MergeResult.failure();
+        BibDatabaseContext effectiveRemote;
+        if (conflicts.isEmpty()) {
+            effectiveRemote = remote;
+        } else {
+            // 3. If there are conflicts, ask strategy to resolve
+            Optional<BibDatabaseContext> maybeRemote = gitConflictResolverStrategy.resolveConflicts(conflicts, remote);
+            if (maybeRemote.isEmpty()) {
+                LOGGER.warn("Merge aborted: Conflict resolution was canceled or denied.");
+                return MergeResult.failure();
+            }
+            effectiveRemote = maybeRemote.get();
         }
-        BibDatabaseContext effectiveRemote = maybeRemote.get();
 
         //  4. Apply resolved remote (either original or conflict-resolved) to local
         MergePlan plan = SemanticConflictDetector.extractMergePlan(base, effectiveRemote);
diff --git a/jablib/src/main/java/org/jabref/logic/git/status/GitStatusChecker.java b/jablib/src/main/java/org/jabref/logic/git/status/GitStatusChecker.java
@@ -49,7 +49,7 @@ public static GitStatusSnapshot checkStatus(Path anyPathInsideRepo) {
                     Optional.ofNullable(localHead).map(ObjectId::getName)
             );
         } catch (IOException | GitAPIException e) {
-            LOGGER.warn("Failed to check Git status: " + e.getMessage());
+            LOGGER.warn("Failed to check Git status: {}", e.getMessage(), e);
             return new GitStatusSnapshot(
                     true,
                     SyncStatus.UNKNOWN,
diff --git a/jablib/src/test/java/org/jabref/logic/git/GitHandlerTest.java b/jablib/src/test/java/org/jabref/logic/git/GitHandlerTest.java
@@ -11,6 +11,7 @@
 import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.URIish;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -22,11 +23,38 @@
 class GitHandlerTest {
     @TempDir
     Path repositoryPath;
+    Path remoteRepoPath;
     private GitHandler gitHandler;
 
     @BeforeEach
-    void setUpGitHandler() {
+    void setUpGitHandler() throws IOException, GitAPIException, URISyntaxException {
         gitHandler = new GitHandler(repositoryPath);
+
+        remoteRepoPath = Files.createTempDirectory("remote-repo");
+        try (Git remoteGit = Git.init()
+                                .setBare(true)
+                                .setDirectory(remoteRepoPath.toFile())
+                                .call()) {
+            // Remote repo initialized
+        }
+        Path testFile = repositoryPath.resolve("initial.txt");
+        Files.writeString(testFile, "init");
+
+        gitHandler.createCommitOnCurrentBranch("Initial commit", false);
+
+        try (Git localGit = Git.open(repositoryPath.toFile())) {
+            localGit.remoteAdd()
+                    .setName("origin")
+                    .setUri(new URIish(remoteRepoPath.toUri().toString()))
+                    .call();
+
+            localGit.push()
+                    .setRemote("origin")
+                    .setRefSpecs(new RefSpec("refs/heads/main:refs/heads/main"))
+                    .call();
+        }
+
+        Files.writeString(remoteRepoPath.resolve("HEAD"), "ref: refs/heads/main");
     }
 
     @Test
diff --git a/jablib/src/test/java/org/jabref/logic/git/GitSyncServiceTest.java b/jablib/src/test/java/org/jabref/logic/git/GitSyncServiceTest.java
@@ -83,12 +83,11 @@ class GitSyncServiceTest {
             }
             """;
 
-
     /**
      * Creates a commit graph with a base commit, one modification by Alice and one modification by Bob
      * 1. Alice commit initial → push to remote
-     * 2. Bob clone remote -> update `b` → push
-     * 3. Alice update `a` → pull
+     * 2. Bob clone remote -> update b → push
+     * 3. Alice update a → pull
      */
     @BeforeEach
     void aliceBobSimple(@TempDir Path tempDir) throws Exception {
@@ -98,7 +97,11 @@ void aliceBobSimple(@TempDir Path tempDir) throws Exception {
 
         // create fake remote repo
         Path remoteDir = tempDir.resolve("remote.git");
-        Git remoteGit = Git.init().setBare(true).setDirectory(remoteDir.toFile()).call();
+        Git remoteGit = Git.init()
+                           .setBare(true)
+                           .setInitialBranch("main")
+                           .setDirectory(remoteDir.toFile())
+                           .call();
 
         // Alice clone remote -> local repository
         Path aliceDir = tempDir.resolve("alice");
@@ -120,7 +123,7 @@ void aliceBobSimple(@TempDir Path tempDir) throws Exception {
                         .setURI(remoteDir.toUri().toString())
                         .setDirectory(bobDir.toFile())
                         .setBranchesToClone(List.of("refs/heads/main"))
-                        .setBranch("refs/heads/main")
+                        .setBranch("main")
                         .call();
         Path bobLibrary = bobDir.resolve("library.bib");
         bobCommit = writeAndCommit(bobUpdatedContent, "Exchange a with b", bob, bobLibrary, bobGit);
@@ -184,7 +187,12 @@ void pushTriggersMergeAndPushWhenNoConflicts() throws Exception {
     void mergeConflictOnSameFieldTriggersDialogAndUsesUserResolution(@TempDir Path tempDir) throws Exception {
         // Setup remote bare repo
         Path remoteDir = tempDir.resolve("remote.git");
-        Git remoteGit = Git.init().setBare(true).setDirectory(remoteDir.toFile()).call();
+        Git remoteGit = Git.init()
+                           .setBare(true)
+                           .setInitialBranch("main")
+                           .setDirectory(remoteDir.toFile())
+                           .call();
+        Files.writeString(remoteDir.resolve("HEAD"), "ref: refs/heads/main");
 
         // Clone to local working directory
         Path localDir = tempDir.resolve("local");
diff --git a/jablib/src/test/java/org/jabref/logic/git/merge/GitMergeUtilTest.java b/jablib/src/test/java/org/jabref/logic/git/merge/GitMergeUtilTest.java
@@ -57,6 +57,6 @@ void replaceEntriesIgnoresResolvedWithoutCitationKey() {
                 .withField(StandardField.TITLE, "New Title");
 
         BibDatabaseContext result = GitMergeUtil.replaceEntries(remote, List.of(resolved));
-        assertEquals("Original Title", result.getDatabase().getEntries().get(0).getField(StandardField.TITLE).orElse(""));
+        assertEquals("Original Title", result.getDatabase().getEntries().getFirst().getField(StandardField.TITLE).orElse(""));
     }
 }
diff --git a/jablib/src/test/java/org/jabref/logic/git/status/GitStatusCheckerTest.java b/jablib/src/test/java/org/jabref/logic/git/status/GitStatusCheckerTest.java
@@ -3,10 +3,13 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.transport.RefSpec;
+import org.eclipse.jgit.transport.URIish;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -63,6 +66,24 @@ void setup(@TempDir Path tempDir) throws Exception {
         Path remoteDir = tempDir.resolve("remote.git");
         remoteGit = Git.init().setBare(true).setDirectory(remoteDir.toFile()).call();
 
+        Path seedDir = tempDir.resolve("seed");
+        Git seedGit = Git.init().setDirectory(seedDir.toFile()).call();
+        Path seedFile = seedDir.resolve("library.bib");
+        Files.writeString(seedFile, baseContent, StandardCharsets.UTF_8);
+
+        seedGit.add().addFilepattern("library.bib").call();
+        seedGit.commit().setAuthor(author).setMessage("Initial commit").call();
+        seedGit.branchCreate().setName("master").call();
+
+        seedGit.remoteAdd()
+               .setName("origin")
+               .setUri(new URIish(remoteDir.toUri().toString()))
+               .call();
+        seedGit.push()
+               .setRemote("origin")
+               .setRefSpecs(new RefSpec("refs/heads/master:refs/heads/main"))
+               .call();
+
         Path localDir = tempDir.resolve("local");
         localGit = Git.cloneRepository()
                       .setURI(remoteDir.toUri().toString())
@@ -71,12 +92,6 @@ void setup(@TempDir Path tempDir) throws Exception {
                       .call();
 
         this.localLibrary = localDir.resolve("library.bib");
-
-        // Initial commit
-        commitFile(localGit, baseContent, "Initial commit");
-
-        // Push to remote
-        localGit.push().setRemote("origin").call();
     }
 
     @Test
@@ -100,10 +115,15 @@ void behindStatusWhenRemoteHasNewCommit(@TempDir Path tempDir) throws Exception
         Git remoteClone = Git.cloneRepository()
                              .setURI(remoteGit.getRepository().getDirectory().toURI().toString())
                              .setDirectory(remoteWork.toFile())
+                             .setBranchesToClone(List.of("refs/heads/main"))
+                             .setBranch("main")
                              .call();
         Path remoteFile = remoteWork.resolve("library.bib");
         commitFile(remoteClone, remoteUpdatedContent, "Remote update");
-        remoteClone.push().setRemote("origin").call();
+        remoteClone.push()
+                   .setRemote("origin")
+                   .setRefSpecs(new RefSpec("refs/heads/main:refs/heads/main"))
+                   .call();
 
         localGit.fetch().setRemote("origin").call();
         GitStatusSnapshot snapshot = GitStatusChecker.checkStatus(localLibrary);
@@ -125,10 +145,15 @@ void divergedStatusWhenBothSidesHaveCommits(@TempDir Path tempDir) throws Except
         Git remoteClone = Git.cloneRepository()
                              .setURI(remoteGit.getRepository().getDirectory().toURI().toString())
                              .setDirectory(remoteWork.toFile())
+                             .setBranchesToClone(List.of("refs/heads/main"))
+                             .setBranch("main")
                              .call();
         Path remoteFile = remoteWork.resolve("library.bib");
         commitFile(remoteClone, remoteUpdatedContent, "Remote update");
-        remoteClone.push().setRemote("origin").call();
+        remoteClone.push()
+                   .setRemote("origin")
+                   .setRefSpecs(new RefSpec("refs/heads/main:refs/heads/main"))
+                   .call();
 
         localGit.fetch().setRemote("origin").call();
         GitStatusSnapshot snapshot = GitStatusChecker.checkStatus(localLibrary);

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ void replaceEntriesIgnoresResolvedWithoutCitationKey() {`
`57`	`57`	`.withField(StandardField.TITLE, "New Title");`
`58`	`58`
`59`	`59`	`BibDatabaseContext result = GitMergeUtil.replaceEntries(remote, List.of(resolved));`
`60`		`- assertEquals("Original Title", result.getDatabase().getEntries().get(0).getField(StandardField.TITLE).orElse(""));`
	`60`	`+ assertEquals("Original Title", result.getDatabase().getEntries().getFirst().getField(StandardField.TITLE).orElse(""));`
`61`	`61`	`}`
`62`	`62`	`}`