motiejus
/
jgit
1
Fork 0
Code Releases Activity

Simplify file creation in ResetCommandTest 

Use existing test utility methods instead of nested PrintWriter usage.

Change-Id: I324852c7971ae644fa499f377a31d1cf265c7fd9
Signed-off-by: René Scheibe <rene.scheibe@gmail.com>
This commit is contained in:
René Scheibe 2018-09-03 23:21:10 +02:00
parent a3cb474c94
commit 685f8c8dbe
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2013, Chris Aniszczyk <caniszczyk@gmail.com> * Copyright (C) 2011-2018, Chris Aniszczyk <caniszczyk@gmail.com>
* and other copyright owners as documented in the project's IP log. * and other copyright owners as documented in the project's IP log.
* *
* This program and the accompanying materials are made available * This program and the accompanying materials are made available
@ -52,7 +52,6 @@
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
@ -94,45 +93,25 @@ public void setupRepository() throws IOException, JGitInternalException,
git = new Git(db); git = new Git(db);
initialCommit = git.commit().setMessage("initial commit").call(); initialCommit = git.commit().setMessage("initial commit").call();
// create file
indexFile = writeTrashFile("a.txt", "content");
// create nested file // create nested file
File dir = new File(db.getWorkTree(), "dir"); writeTrashFile("dir/b.txt", "content");
FileUtils.mkdir(dir);
File nestedFile = new File(dir, "b.txt");
FileUtils.createNewFile(nestedFile);
try (PrintWriter nestedFileWriter = new PrintWriter(nestedFile)) { // add files and commit them
nestedFileWriter.print("content"); git.add().addFilepattern("a.txt").addFilepattern("dir/b.txt").call();
nestedFileWriter.flush(); secondCommit = git.commit().setMessage("adding a.txt and dir/b.txt").call();
// create file prestage = DirCache.read(db.getIndexFile(), db.getFS()).getEntry(indexFile.getName());
indexFile = new File(db.getWorkTree(), "a.txt");
FileUtils.createNewFile(indexFile);
try (PrintWriter writer = new PrintWriter(indexFile)) {
writer.print("content");
writer.flush();
// add file and commit it // modify files and add to index
git.add().addFilepattern("dir").addFilepattern("a.txt").call(); writeTrashFile("a.txt", "new content");
secondCommit = git.commit() writeTrashFile("dir/b.txt", "new content");
.setMessage("adding a.txt and dir/b.txt").call(); git.add().addFilepattern("a.txt").addFilepattern("dir/b.txt").call();
prestage = DirCache.read(db.getIndexFile(), db.getFS())
.getEntry(indexFile.getName());
// modify file and add to index
writer.print("new content");
}
nestedFileWriter.print("new content");
}
git.add().addFilepattern("a.txt").addFilepattern("dir").call();
// create a file not added to the index // create a file not added to the index
untrackedFile = new File(db.getWorkTree(), untrackedFile = writeTrashFile("notAddedToIndex.txt", "content");
"notAddedToIndex.txt");
FileUtils.createNewFile(untrackedFile);
try (PrintWriter writer2 = new PrintWriter(untrackedFile)) {
writer2.print("content");
}
} }
@Test @Test