The Unified and Autonomous Development Platform
Add more unit tests for BlobEdits
robin shen8fbcf296cc40
diff --git a/core/src/main/java/com/gitplex/server/git/BlobEdits.java b/core/src/main/java/com/gitplex/server/git/BlobEdits.javaindex 2fb13672cc..9e090722c9 100644--- a/core/src/main/java/com/gitplex/server/git/BlobEdits.java+++ b/core/src/main/java/com/gitplex/server/git/BlobEdits.java@@ -154,8 +154,6 @@ public class BlobEdits implements Serializable {}if (!entries.isEmpty()) {TreeFormatter formatter = new TreeFormatter();- // Do not sort entries as otherwise it may distort original tree-// Collections.sort(entries);for (TreeFormatterEntry entry: entries)formatter.append(entry.name, entry.mode, entry.id);return inserter.insert(formatter);@@ -226,13 +224,14 @@ public class BlobEdits implements Serializable {ru.setNewObjectId(commitId);ru.setExpectedOldObjectId(expectedOldCommitId);GitUtils.updateRef(ru);+return commitId;} catch (RevisionSyntaxException | IOException e) {throw new RuntimeException(e);}}- public static class TreeFormatterEntry implements Comparable<TreeFormatterEntry> {+ public static class TreeFormatterEntry {String name;@@ -246,10 +245,5 @@ public class BlobEdits implements Serializable {this.id = id;}- @Override- public int compareTo(TreeFormatterEntry entry) {- return name.compareTo(entry.name);- }-}}diff --git a/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java b/core/src/test/java/com/gitplex/server/git/BlobEditsTest.javaindex b5c237e080..39c7469b24 100644--- a/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java+++ b/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java@@ -3,9 +3,12 @@ package com.gitplex.server.git;import static org.junit.Assert.assertNotNull;import static org.junit.Assert.assertNull;import static org.junit.Assert.assertTrue;+import static org.junit.Assert.assertEquals;import java.io.IOException;+import java.util.ArrayList;import java.util.HashMap;+import java.util.List;import java.util.Map;import java.util.Set;@@ -202,6 +205,41 @@ public class BlobEditsTest extends AbstractGitTest {}}+ @Test+ public void testModifyFile() throws IOException {+ createDir("a");+ addFileAndCommit("a/file.java", "", "add a/file.java");++ createDir("a.b");+ addFileAndCommit("a.b/file.java", "", "add a.b/file.java");++ String refName = "refs/heads/master";+ ObjectId oldCommitId = git.getRepository().resolve(refName);++ List<String> oldPaths = new ArrayList<>();+ try ( RevWalk revWalk = new RevWalk(git.getRepository());+ TreeWalk treeWalk = new TreeWalk(git.getRepository());) {+ treeWalk.addTree(revWalk.parseCommit(oldCommitId).getTree());+ while (treeWalk.next())+ oldPaths.add(treeWalk.getPathString());+ }++ Map<String, BlobContent> newBlobs = new HashMap<>();+ newBlobs.put("a.b/file.java", new BlobContent.Immutable("hello".getBytes(), FileMode.REGULAR_FILE));+ BlobEdits edits = new BlobEdits(Sets.newHashSet("a.b/file.java"), newBlobs);+ ObjectId newCommitId = edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test modify");++ List<String> newPaths = new ArrayList<>();+ try ( RevWalk revWalk = new RevWalk(git.getRepository());+ TreeWalk treeWalk = new TreeWalk(git.getRepository());) {+ treeWalk.addTree(revWalk.parseCommit(newCommitId).getTree());+ while (treeWalk.next())+ newPaths.add(treeWalk.getPathString());+ }++ assertEquals(oldPaths, newPaths);+ }+@Testpublic void testAddExistFile() throws IOException {createDir("client");