source.dussan.org Git - jgit.git/commit

author	David Pursehouse <david.pursehouse@gmail.com>
	Thu, 26 Jan 2017 04:38:50 +0000 (13:38 +0900)
committer	Matthias Sohn <matthias.sohn@sap.com>
	Mon, 30 Jan 2017 12:23:52 +0000 (13:23 +0100)
commit	c64412e1f908d054cbd0198c0ac12397aab14c9f
tree	73d595cf4952fcd4d8843302639bb93eab9de759	tree \| snapshot
parent	b198f77c1e7de73334c7fd624778c41a8e3d208c	commit \| diff

Merge FileTreeIteratorJava7Test into FileTreeIteratorTest

JGit now requires Java 8, so it is no longer necessary to have a
separate class for Java 7 specific tests. Remove it and merge its
tests into the existing FileTreeIteratorTest.

FileTreeIteratorTest has an @Before annotated method that sets up
some files in the git, which breaks the tests which have assumptions
on the file names. Add adjustments.

Change-Id: I14f88d8e079e1677c8dfbc1fcbf4444ea8265365
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java	[deleted file]	blob \| history
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java		diff \| blob \| history