aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-07-11 10:00:23 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2019-07-11 10:00:23 +0200
commita024759cf5bf1cd6b9beb4f790d484943761a7e1 (patch)
tree64df7209f558892a45fafd5eb4ae4489d734660e /org.eclipse.jgit.test/tst/org/eclipse/jgit/lib
parent84e6c24e58f9d5dbbeef9fd299e5c5598e7a48e7 (diff)
downloadjgit-a024759cf5bf1cd6b9beb4f790d484943761a7e1.tar.gz
jgit-a024759cf5bf1cd6b9beb4f790d484943761a7e1.zip
Delete unused FileTreeIteratorWithTimeControl
The only usage of this test iterator was removed in df637928d. Hence delete this iterator and associated test. Change-Id: I47710133ec3edc675c21db210960c024982668c6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/lib')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java68
1 files changed, 0 insertions, 68 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java
index c1b6cb2591..d044e65cf4 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java
@@ -42,7 +42,6 @@
*/
package org.eclipse.jgit.lib;
-import static java.lang.Long.valueOf;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -51,82 +50,15 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.TreeSet;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.treewalk.FileTreeIterator;
-import org.eclipse.jgit.treewalk.FileTreeIteratorWithTimeControl;
-import org.eclipse.jgit.treewalk.NameConflictTreeWalk;
import org.eclipse.jgit.treewalk.WorkingTreeOptions;
-import org.eclipse.jgit.util.FileUtils;
import org.junit.Test;
public class RacyGitTests extends RepositoryTestCase {
- @Test
- public void testIterator()
- throws IllegalStateException, IOException, InterruptedException {
- TreeSet<Long> modTimes = new TreeSet<>();
- File lastFile = null;
- for (int i = 0; i < 10; i++) {
- lastFile = new File(db.getWorkTree(), "0." + i);
- FileUtils.createNewFile(lastFile);
- if (i == 5)
- fsTick(lastFile);
- }
- modTimes.add(valueOf(fsTick(lastFile)));
- for (int i = 0; i < 10; i++) {
- lastFile = new File(db.getWorkTree(), "1." + i);
- FileUtils.createNewFile(lastFile);
- }
- modTimes.add(valueOf(fsTick(lastFile)));
- for (int i = 0; i < 10; i++) {
- lastFile = new File(db.getWorkTree(), "2." + i);
- FileUtils.createNewFile(lastFile);
- if (i % 4 == 0)
- fsTick(lastFile);
- }
- FileTreeIteratorWithTimeControl fileIt = new FileTreeIteratorWithTimeControl(
- db, modTimes);
- try (NameConflictTreeWalk tw = new NameConflictTreeWalk(db)) {
- tw.addTree(fileIt);
- tw.setRecursive(true);
- FileTreeIterator t;
- long t0 = 0;
- for (int i = 0; i < 10; i++) {
- assertTrue(tw.next());
- t = tw.getTree(0, FileTreeIterator.class);
- if (i == 0) {
- t0 = t.getEntryLastModified();
- } else {
- assertEquals(t0, t.getEntryLastModified());
- }
- }
- long t1 = 0;
- for (int i = 0; i < 10; i++) {
- assertTrue(tw.next());
- t = tw.getTree(0, FileTreeIterator.class);
- if (i == 0) {
- t1 = t.getEntryLastModified();
- assertTrue(t1 > t0);
- } else {
- assertEquals(t1, t.getEntryLastModified());
- }
- }
- long t2 = 0;
- for (int i = 0; i < 10; i++) {
- assertTrue(tw.next());
- t = tw.getTree(0, FileTreeIterator.class);
- if (i == 0) {
- t2 = t.getEntryLastModified();
- assertTrue(t2 > t1);
- } else {
- assertEquals(t2, t.getEntryLastModified());
- }
- }
- }
- }
@Test
public void testRacyGitDetection() throws Exception {