aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
diff options
context:
space:
mode:
authorAlex Blewitt <alex.blewitt@gmail.com>2009-10-19 09:48:00 +0100
committerShawn O. Pearce <spearce@spearce.org>2009-10-31 14:48:44 -0700
commit4d91645e890527efbe04ffaee12b4aa3637733c4 (patch)
treed3efbcdb2ea2b9e7187057d55b060d1d75b6a024 /org.eclipse.jgit.test
parentf3d75800a0fb687f65e64b82235140f86be6171e (diff)
downloadjgit-4d91645e890527efbe04ffaee12b4aa3637733c4.tar.gz
jgit-4d91645e890527efbe04ffaee12b4aa3637733c4.zip
Remove trailing whitespace at end of line
As discussed on the egit-dev mailing list, we prefer not to have trailing whitespace in our source code. Correct all currently offending lines by trimming them. Change-Id: I002b1d1980071084c0bc53242c8f5900970e6845 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java2
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java6
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java32
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java4
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java152
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java12
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java2
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java8
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java8
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java8
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java2
11 files changed, 118 insertions, 118 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java
index b84b240a74..f74a35cd35 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheTreeTest.java
@@ -162,7 +162,7 @@ public class DirCacheTreeTest extends RepositoryTestCase {
* index larger than the default BufferedInputStream buffer size. This made
* the DirCache unable to read the extensions when index size exceeded the
* buffer size (in some cases at least).
- *
+ *
* @throws CorruptObjectException
* @throws IOException
*/
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
index f871cc0524..ac7ce5bd48 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
@@ -94,11 +94,11 @@ public class IndexDiffTest extends RepositoryTestCase {
public void testModified() throws IOException {
GitIndex index = new GitIndex(db);
-
-
+
+
index.add(trash, writeTrashFile("file2", "file2"));
index.add(trash, writeTrashFile("dir/file3", "dir/file3"));
-
+
writeTrashFile("dir/file3", "changed");
Tree tree = new Tree(db);
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java
index eb7b622d6c..f93343aab6 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexTreeWalkerTest.java
@@ -54,7 +54,7 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
private ArrayList<String> treeOnlyEntriesVisited = new ArrayList<String>();
private ArrayList<String> bothVisited = new ArrayList<String>();
private ArrayList<String> indexOnlyEntriesVisited = new ArrayList<String>();
-
+
private class TestIndexTreeVisitor extends AbstractIndexTreeVisitor {
public void visitEntry(TreeEntry treeEntry, Entry indexEntry, File file) {
if (treeEntry == null)
@@ -67,13 +67,13 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
/*
* Need to think about what I really need to be able to do....
- *
+ *
* 1) Visit all entries in index and tree
* 2) Get all directories that exist in the index, but not in the tree
* -- I'm pretty sure that I don't need to do the other way around
- * because I already
+ * because I already
*/
-
+
public void testTreeOnlyOneLevel() throws IOException {
GitIndex index = new GitIndex(db);
Tree tree = new Tree(db);
@@ -81,11 +81,11 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
tree.addFile("bar");
new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk();
-
+
assertTrue(treeOnlyEntriesVisited.get(0).equals("bar"));
assertTrue(treeOnlyEntriesVisited.get(1).equals("foo"));
}
-
+
public void testIndexOnlyOneLevel() throws IOException {
GitIndex index = new GitIndex(db);
Tree tree = new Tree(db);
@@ -93,11 +93,11 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
index.add(trash, writeTrashFile("foo", "foo"));
index.add(trash, writeTrashFile("bar", "bar"));
new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk();
-
+
assertTrue(indexOnlyEntriesVisited.get(0).equals("bar"));
assertTrue(indexOnlyEntriesVisited.get(1).equals("foo"));
}
-
+
public void testBoth() throws IOException {
GitIndex index = new GitIndex(db);
Tree tree = new Tree(db);
@@ -106,14 +106,14 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
tree.addFile("b/b");
index.add(trash, writeTrashFile("c", "c"));
tree.addFile("c");
-
+
new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk();
assertTrue(indexOnlyEntriesVisited.contains("a"));
assertTrue(treeOnlyEntriesVisited.contains("b/b"));
assertTrue(bothVisited.contains("c"));
-
+
}
-
+
public void testIndexOnlySubDirs() throws IOException {
GitIndex index = new GitIndex(db);
Tree tree = new Tree(db);
@@ -121,23 +121,23 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
index.add(trash, writeTrashFile("foo/bar/baz", "foobar"));
index.add(trash, writeTrashFile("asdf", "asdf"));
new IndexTreeWalker(index, tree, trash, new TestIndexTreeVisitor()).walk();
-
+
assertEquals("asdf", indexOnlyEntriesVisited.get(0));
assertEquals("foo/bar/baz", indexOnlyEntriesVisited.get(1));
}
-
+
public void testLeavingTree() throws IOException {
GitIndex index = new GitIndex(db);
index.add(trash, writeTrashFile("foo/bar", "foo/bar"));
index.add(trash, writeTrashFile("foobar", "foobar"));
-
+
new IndexTreeWalker(index, db.mapTree(index.writeTree()), trash, new AbstractIndexTreeVisitor() {
@Override
public void visitEntry(TreeEntry entry, Entry indexEntry, File f) {
if (entry == null || indexEntry == null)
fail();
}
-
+
@Override
public void finishVisitTree(Tree tree, int i, String curDir)
throws IOException {
@@ -146,7 +146,7 @@ public class IndexTreeWalkerTest extends RepositoryTestCase {
if (i == 0)
fail();
}
-
+
}).walk();
}
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java
index 31de3d98ad..d1c5c5eccd 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PackIndexTestCase.java
@@ -64,14 +64,14 @@ public abstract class PackIndexTestCase extends RepositoryTestCase {
/**
* Return file with appropriate index version for prepared pack.
- *
+ *
* @return file with index
*/
public abstract File getFileForPack34be9032();
/**
* Return file with appropriate index version for prepared pack.
- *
+ *
* @return file with index
*/
public abstract File getFileForPackdf2982f28();
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java
index 5ac75d8043..481691a448 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java
@@ -54,7 +54,7 @@ import java.util.HashMap;
import org.eclipse.jgit.errors.CheckoutConflictException;
public class ReadTreeTest extends RepositoryTestCase {
-
+
private Tree theHead;
private Tree theMerge;
private GitIndex theIndex;
@@ -64,64 +64,64 @@ public class ReadTreeTest extends RepositoryTestCase {
// Rule 0 is left out for obvious reasons :)
public void testRules1thru3_NoIndexEntry() throws IOException {
GitIndex index = new GitIndex(db);
-
+
Tree head = new Tree(db);
FileTreeEntry headFile = head.addFile("foo");
ObjectId objectId = ObjectId.fromString("ba78e065e2c261d4f7b8f42107588051e87e18e9");
headFile.setId(objectId);
Tree merge = new Tree(db);
-
+
WorkDirCheckout readTree = new WorkDirCheckout(db, trash, head, index, merge);
readTree.prescanTwoTrees();
-
+
assertTrue(readTree.removed.contains("foo"));
-
+
readTree = new WorkDirCheckout(db, trash, merge, index, head);
readTree.prescanTwoTrees();
-
+
assertEquals(objectId, readTree.updated.get("foo"));
-
+
ObjectId anotherId = ObjectId.fromString("ba78e065e2c261d4f7b8f42107588051e87e18ee");
merge.addFile("foo").setId(anotherId);
-
+
readTree = new WorkDirCheckout(db, trash, head, index, merge);
readTree.prescanTwoTrees();
-
+
assertEquals(anotherId, readTree.updated.get("foo"));
}
- void setupCase(HashMap<String, String> headEntries,
- HashMap<String, String> mergeEntries,
+ void setupCase(HashMap<String, String> headEntries,
+ HashMap<String, String> mergeEntries,
HashMap<String, String> indexEntries) throws IOException {
theHead = buildTree(headEntries);
theMerge = buildTree(mergeEntries);
theIndex = buildIndex(indexEntries);
}
-
+
private GitIndex buildIndex(HashMap<String, String> indexEntries) throws IOException {
GitIndex index = new GitIndex(db);
-
+
if (indexEntries == null)
return index;
for (java.util.Map.Entry<String,String> e : indexEntries.entrySet()) {
index.add(trash, writeTrashFile(e.getKey(), e.getValue())).forceRecheck();
}
-
+
return index;
}
private Tree buildTree(HashMap<String, String> headEntries) throws IOException {
Tree tree = new Tree(db);
-
- if (headEntries == null)
+
+ if (headEntries == null)
return tree;
for (java.util.Map.Entry<String,String> e : headEntries.entrySet()) {
tree.addFile(e.getKey()).setId(genSha1(e.getValue()));
}
-
+
return tree;
}
-
+
ObjectId genSha1(String data) {
InputStream is = new ByteArrayInputStream(data.getBytes());
ObjectWriter objectWriter = new ObjectWriter(db);
@@ -133,7 +133,7 @@ public class ReadTreeTest extends RepositoryTestCase {
}
return null;
}
-
+
private WorkDirCheckout go() throws IOException {
theReadTree = new WorkDirCheckout(db, trash, theHead, theIndex, theMerge);
theReadTree.prescanTwoTrees();
@@ -151,11 +151,11 @@ public class ReadTreeTest extends RepositoryTestCase {
idxMap.put("foo", "foo");
setupCase(null, null, idxMap);
theReadTree = go();
-
+
assertTrue(theReadTree.updated.isEmpty());
assertTrue(theReadTree.removed.isEmpty());
assertTrue(theReadTree.conflicts.isEmpty());
-
+
// rules 6 and 7
idxMap = new HashMap<String, String>();
idxMap.put("foo", "foo");
@@ -163,70 +163,70 @@ public class ReadTreeTest extends RepositoryTestCase {
theReadTree = go();
assertAllEmpty();
-
+
// rules 8 and 9
HashMap<String, String> mergeMap;
mergeMap = new HashMap<String, String>();
-
+
mergeMap.put("foo", "merge");
setupCase(null, mergeMap, idxMap);
go();
-
+
assertTrue(theReadTree.updated.isEmpty());
assertTrue(theReadTree.removed.isEmpty());
assertTrue(theReadTree.conflicts.contains("foo"));
-
+
// rule 10
-
+
HashMap<String, String> headMap = new HashMap<String, String>();
headMap.put("foo", "foo");
setupCase(headMap, null, idxMap);
go();
-
+
assertTrue(theReadTree.removed.contains("foo"));
assertTrue(theReadTree.updated.isEmpty());
assertTrue(theReadTree.conflicts.isEmpty());
-
+
// rule 11
setupCase(headMap, null, idxMap);
new File(trash, "foo").delete();
writeTrashFile("foo", "bar");
theIndex.getMembers()[0].forceRecheck();
go();
-
+
assertTrue(theReadTree.removed.isEmpty());
assertTrue(theReadTree.updated.isEmpty());
assertTrue(theReadTree.conflicts.contains("foo"));
-
+
// rule 12 & 13
headMap.put("foo", "head");
setupCase(headMap, null, idxMap);
go();
-
+
assertTrue(theReadTree.removed.isEmpty());
assertTrue(theReadTree.updated.isEmpty());
assertTrue(theReadTree.conflicts.contains("foo"));
-
+
// rules 14 & 15
setupCase(headMap, headMap, idxMap);
go();
-
+
assertAllEmpty();
-
+
// rules 16 & 17
setupCase(headMap, mergeMap, idxMap); go();
assertTrue(theReadTree.conflicts.contains("foo"));
-
+
// rules 18 & 19
setupCase(headMap, idxMap, idxMap); go();
assertAllEmpty();
-
+
// rule 20
setupCase(idxMap, mergeMap, idxMap); go();
assertTrue(theReadTree.updated.containsKey("foo"));
-
+
// rules 21
- setupCase(idxMap, mergeMap, idxMap);
+ setupCase(idxMap, mergeMap, idxMap);
new File(trash, "foo").delete();
writeTrashFile("foo", "bar");
theIndex.getMembers()[0].forceRecheck();
@@ -239,37 +239,37 @@ public class ReadTreeTest extends RepositoryTestCase {
assertTrue(theReadTree.updated.isEmpty());
assertTrue(theReadTree.conflicts.isEmpty());
}
-
+
public void testDirectoryFileSimple() throws IOException {
theIndex = new GitIndex(db);
theIndex.add(trash, writeTrashFile("DF", "DF"));
Tree treeDF = db.mapTree(theIndex.writeTree());
-
+
recursiveDelete(new File(trash, "DF"));
theIndex = new GitIndex(db);
theIndex.add(trash, writeTrashFile("DF/DF", "DF/DF"));
Tree treeDFDF = db.mapTree(theIndex.writeTree());
-
+
theIndex = new GitIndex(db);
recursiveDelete(new File(trash, "DF"));
-
+
theIndex.add(trash, writeTrashFile("DF", "DF"));
theReadTree = new WorkDirCheckout(db, trash, treeDF, theIndex, treeDFDF);
theReadTree.prescanTwoTrees();
-
+
assertTrue(theReadTree.removed.contains("DF"));
assertTrue(theReadTree.updated.containsKey("DF/DF"));
-
+
recursiveDelete(new File(trash, "DF"));
theIndex = new GitIndex(db);
theIndex.add(trash, writeTrashFile("DF/DF", "DF/DF"));
-
+
theReadTree = new WorkDirCheckout(db, trash, treeDFDF, theIndex, treeDF);
theReadTree.prescanTwoTrees();
assertTrue(theReadTree.removed.contains("DF/DF"));
assertTrue(theReadTree.updated.containsKey("DF"));
}
-
+
/*
* Directory/File Conflict cases:
* It's entirely possible that in practice a number of these may be equivalent
@@ -277,7 +277,7 @@ public class ReadTreeTest extends RepositoryTestCase {
* that's all I care about. These are basically reverse-engineered from
* what git currently does. If there are tests for these in git, it's kind of
* hard to track them all down...
- *
+ *
* H I M Clean H==M H==I I==M Result
* ------------------------------------------------------------------
*1 D D F Y N Y N Update
@@ -290,7 +290,7 @@ public class ReadTreeTest extends RepositoryTestCase {
*8 F D F N Y N N Conflict
*9 F D F Y N N N Update
*10 F D D N N Y Keep
- *11 F D D N N N Conflict
+ *11 F D D N N N Conflict
*12 F F D Y N Y N Update
*13 F F D N N Y N Conflict
*14 F F D N N N Conflict
@@ -300,7 +300,7 @@ public class ReadTreeTest extends RepositoryTestCase {
*18 F 0 D Update
*19 D 0 F Update
*/
-
+
public void testDirectoryFileConflicts_1() throws Exception {
// 1
doit(mk("DF/DF"), mk("DF"), mk("DF/DF"));
@@ -315,7 +315,7 @@ public class ReadTreeTest extends RepositoryTestCase {
writeTrashFile("DF/DF", "different");
go();
assertConflict("DF/DF");
-
+
}
public void testDirectoryFileConflicts_3() throws Exception {
@@ -330,14 +330,14 @@ public class ReadTreeTest extends RepositoryTestCase {
doit(mk("DF/DF"), mkmap("DF/DF", "foo"), mk("DF"));
assertUpdated("DF/DF");
assertRemoved("DF");
-
+
}
public void testDirectoryFileConflicts_5() throws Exception {
// 5
doit(mk("DF/DF"), mk("DF"), mk("DF"));
assertRemoved("DF/DF");
-
+
}
public void testDirectoryFileConflicts_6() throws Exception {
@@ -359,7 +359,7 @@ public class ReadTreeTest extends RepositoryTestCase {
go();
assertRemoved("DF/DF/DF/DF/DF");
assertUpdated("DF/DF");
-
+
cleanUpDF();
setupCase(mk("DF/DF"), mk("DF/DF"), mk("DF/DF/DF/DF/DF"));
writeTrashFile("DF/DF/DF/DF/DF", "diff");
@@ -383,7 +383,7 @@ public class ReadTreeTest extends RepositoryTestCase {
cleanUpDF();
doit(mk("DF"), mk("DF/DF"), mk("DF/DF"));
assertNoConflicts();
-
+
}
public void testDirectoryFileConflicts_11() throws Exception {
@@ -471,19 +471,19 @@ public class ReadTreeTest extends RepositoryTestCase {
setUp();
recursiveDelete(new File(trash, "DF"));
}
-
+
private void assertConflict(String s) {
assertTrue(theReadTree.conflicts.contains(s));
}
-
+
private void assertUpdated(String s) {
assertTrue(theReadTree.updated.containsKey(s));
}
-
+
private void assertRemoved(String s) {
assertTrue(theReadTree.removed.contains(s));
}
-
+
private void assertNoConflicts() {
assertTrue(theReadTree.conflicts.isEmpty());
}
@@ -493,30 +493,30 @@ public class ReadTreeTest extends RepositoryTestCase {
setupCase(h, m, i);
go();
}
-
+
private static HashMap<String, String> mk(String a) {
return mkmap(a, a);
}
-
+
private static HashMap<String, String> mkmap(String... args) {
- if ((args.length % 2) > 0)
+ if ((args.length % 2) > 0)
throw new IllegalArgumentException("needs to be pairs");
-
+
HashMap<String, String> map = new HashMap<String, String>();
for (int i = 0; i < args.length; i += 2) {
map.put(args[i], args[i+1]);
}
-
+
return map;
}
-
- public void testUntrackedConflicts() throws IOException {
+
+ public void testUntrackedConflicts() throws IOException {
setupCase(null, mk("foo"), null);
writeTrashFile("foo", "foo");
go();
-
+
assertConflict("foo");
-
+
recursiveDelete(new File(trash, "foo"));
setupCase(null, mk("foo"), null);
writeTrashFile("foo/bar/baz", "");
@@ -525,14 +525,14 @@ public class ReadTreeTest extends RepositoryTestCase {
assertConflict("foo/bar/baz");
assertConflict("foo/blahblah");
-
+
recursiveDelete(new File(trash, "foo"));
-
- setupCase(mkmap("foo/bar", "", "foo/baz", ""),
+
+ setupCase(mkmap("foo/bar", "", "foo/baz", ""),
mk("foo"), mkmap("foo/bar", "", "foo/baz", ""));
assertTrue(new File(trash, "foo/bar").exists());
go();
-
+
assertNoConflicts();
}
@@ -554,23 +554,23 @@ public class ReadTreeTest extends RepositoryTestCase {
theReadTree = new WorkDirCheckout(db, trash, theHead, theIndex, theMerge);
theReadTree.checkout();
}
-
+
public void testCheckoutOutChanges() throws IOException {
setupCase(mk("foo"), mk("foo/bar"), mk("foo"));
checkout();
-
+
assertFalse(new File(trash, "foo").isFile());
assertTrue(new File(trash, "foo/bar").isFile());
recursiveDelete(new File(trash, "foo"));
setupCase(mk("foo/bar"), mk("foo"), mk("foo/bar"));
checkout();
-
+
assertFalse(new File(trash, "foo/bar").isFile());
assertTrue(new File(trash, "foo").isFile());
-
+
setupCase(mk("foo"), mkmap("foo", "qux"), mkmap("foo", "bar"));
-
+
try {
checkout();
fail("did not throw exception");
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java
index 2cf557fb01..74e98f1d8c 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0003_Basic.java
@@ -276,10 +276,10 @@ public class T0003_Basic extends RepositoryTestCase {
t.setTag("test020b");
t.setObjId(ObjectId.fromString("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
t.tag();
-
+
Tag mapTag = db.mapTag("test020b");
assertEquals("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", mapTag.getObjId().name());
-
+
// We do not repeat the plain tag test for other object types
}
@@ -330,7 +330,7 @@ public class T0003_Basic extends RepositoryTestCase {
assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag.getAuthor());
assertEquals("b5d3b45a96b340441f5abb9080411705c51cc86c", mapTag.getObjId().name());
}
-
+
public void test023_createCommitNonAnullii() throws IOException {
final ObjectId emptyId = new ObjectWriter(db).writeBlob(new byte[0]);
final Tree almostEmptyTree = new Tree(db);
@@ -363,7 +363,7 @@ public class T0003_Basic extends RepositoryTestCase {
ObjectId cid = new ObjectWriter(db).writeCommit(commit);
assertEquals("2979b39d385014b33287054b87f77bcb3ecb5ebf", cid.name());
}
-
+
public void test025_packedRefs() throws IOException {
test020_createBlobTag();
test021_createTreeTag();
@@ -502,9 +502,9 @@ public class T0003_Basic extends RepositoryTestCase {
assertEquals(c2.getCommitId(), rm4.getParentIds()[1]);
assertEquals(c3.getCommitId(), rm4.getParentIds()[2]);
}
-
+
public void test027_UnpackedRefHigherPriorityThanPacked() throws IOException {
- PrintWriter writer = new PrintWriter(new FileWriter(new File(db.getDirectory(), "refs/heads/a")));
+ PrintWriter writer = new PrintWriter(new FileWriter(new File(db.getDirectory(), "refs/heads/a")));
String unpackedId = "7f822839a2fe9760f386cbbbcb3f92c5fe81def7";
writer.print(unpackedId);
writer.print('\n');
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java
index 74e4bfbdea..ca2400cfb8 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0007_Index.java
@@ -179,7 +179,7 @@ public class T0007_Index extends RepositoryTestCase {
ObjectId id = index.writeTree();
assertEquals("c696abc3ab8e091c665f49d00eb8919690b3aec3", id.name());
-
+
writeTrashFile("a/b", "data:a/b");
index.add(trash, new File(trash, "a/b"));
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java
index 6b19cc1e89..0b7e60c5c7 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorLeafOnlyTest.java
@@ -57,7 +57,7 @@ public class TreeIteratorLeafOnlyTest extends RepositoryTestCase {
/**
* one file
- *
+ *
* @throws IOException
*/
public void testSimpleF1() throws IOException {
@@ -70,7 +70,7 @@ public class TreeIteratorLeafOnlyTest extends RepositoryTestCase {
/**
* two files
- *
+ *
* @throws IOException
*/
public void testSimpleF2() throws IOException {
@@ -85,7 +85,7 @@ public class TreeIteratorLeafOnlyTest extends RepositoryTestCase {
/**
* Empty tree
- *
+ *
* @throws IOException
*/
public void testSimpleT() throws IOException {
@@ -94,7 +94,7 @@ public class TreeIteratorLeafOnlyTest extends RepositoryTestCase {
TreeIterator i = makeIterator(tree);
assertFalse(i.hasNext());
}
-
+
public void testTricky() throws IOException {
Tree tree = new Tree(db);
tree.addFile("a.b");
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java
index caf8bff2a7..459570430f 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPostOrderTest.java
@@ -59,7 +59,7 @@ public class TreeIteratorPostOrderTest extends RepositoryTestCase {
/**
* one file
- *
+ *
* @throws IOException
*/
public void testSimpleF1() throws IOException {
@@ -75,7 +75,7 @@ public class TreeIteratorPostOrderTest extends RepositoryTestCase {
/**
* two files
- *
+ *
* @throws IOException
*/
public void testSimpleF2() throws IOException {
@@ -93,7 +93,7 @@ public class TreeIteratorPostOrderTest extends RepositoryTestCase {
/**
* Empty tree
- *
+ *
* @throws IOException
*/
public void testSimpleT() throws IOException {
@@ -106,7 +106,7 @@ public class TreeIteratorPostOrderTest extends RepositoryTestCase {
assertEquals("", i.next().getFullName());
assertFalse(i.hasNext());
}
-
+
public void testTricky() throws IOException {
Tree tree = new Tree(db);
tree.addFile("a.b");
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java
index c6f41446d2..79d090d8a0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/TreeIteratorPreOrderTest.java
@@ -59,7 +59,7 @@ public class TreeIteratorPreOrderTest extends RepositoryTestCase {
/**
* one file
- *
+ *
* @throws IOException
*/
public void testSimpleF1() throws IOException {
@@ -75,7 +75,7 @@ public class TreeIteratorPreOrderTest extends RepositoryTestCase {
/**
* two files
- *
+ *
* @throws IOException
*/
public void testSimpleF2() throws IOException {
@@ -93,7 +93,7 @@ public class TreeIteratorPreOrderTest extends RepositoryTestCase {
/**
* Empty tree
- *
+ *
* @throws IOException
*/
public void testSimpleT() throws IOException {
@@ -106,7 +106,7 @@ public class TreeIteratorPreOrderTest extends RepositoryTestCase {
assertEquals("a", i.next().getFullName());
assertFalse(i.hasNext());
}
-
+
public void testTricky() throws IOException {
Tree tree = new Tree(db);
tree.addFile("a.b");
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
index fb9b358b2a..6a6b63cab8 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
@@ -89,7 +89,7 @@ public class BundleWriterTest extends RepositoryTestCase {
/**
* Incremental bundle test
- *
+ *
* @throws Exception
*/
public void testWrite1() throws Exception {