Remove deprecated WorkDirCheckout

This class has been deprecated for a long time now.
Time to remove it.  Applications can use the newer
DirCacheCheckout class as a replacement.

Change-Id: Id66d29fcca5a7286b8f8838303d83f40898918d2
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

3 files changed, 1 insertions, 225 deletions

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 4f6e2b85b2..f76822ea59 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
@@ -615,11 +615,7 @@ public abstract class ReadTreeTest extends RepositoryTestCase {
 		writeTrashFile("foo/blahblah", "");
 		go();
 
-		// TODO: In DirCacheCheckout the following assertion would pass. But
-		// old WorkDirCheckout fails on this. For now I leave it out. Find out
-		// what's the correct behavior.
-		// assertConflict("foo");
-
+		assertConflict("foo");
 		assertConflict("foo/bar/baz");
 		assertConflict("foo/blahblah");
 
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/WorkDirCheckoutTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/WorkDirCheckoutTest.java
deleted file mode 100644
index 1136d6a2c1..0000000000
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/WorkDirCheckoutTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2007, Dave Watson <dwatson@mimvista.com>
- * Copyright (C) 2006, Shawn O. Pearce <spearce@spearce.org>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.lib;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.eclipse.jgit.errors.CheckoutConflictException;
-import org.junit.Test;
-
-public class WorkDirCheckoutTest extends RepositoryTestCase {
-	@Test
-	public void testFindingConflicts() throws IOException {
-		GitIndex index = new GitIndex(db);
-		index.add(trash, writeTrashFile("bar", "bar"));
-		index.add(trash, writeTrashFile("foo/bar/baz/qux", "foo/bar"));
-		recursiveDelete(new File(trash, "bar"));
-		recursiveDelete(new File(trash, "foo"));
-		writeTrashFile("bar/baz/qux/foo", "another nasty one");
-		writeTrashFile("foo", "troublesome little bugger");
-
-		WorkDirCheckout workDirCheckout = new WorkDirCheckout(db, trash, index,
-				index);
-		workDirCheckout.prescanOneTree();
-		ArrayList<String> conflictingEntries = workDirCheckout
-				.getConflicts();
-		ArrayList<String> removedEntries = workDirCheckout.getRemoved();
-		assertEquals("bar/baz/qux/foo", conflictingEntries.get(0));
-		assertEquals("foo", conflictingEntries.get(1));
-
-		GitIndex index2 = new GitIndex(db);
-		recursiveDelete(new File(trash, "bar"));
-		recursiveDelete(new File(trash, "foo"));
-
-		index2.add(trash, writeTrashFile("bar/baz/qux/foo", "bar"));
-		index2.add(trash, writeTrashFile("foo", "lalala"));
-
-		workDirCheckout = new WorkDirCheckout(db, trash, index2, index);
-		workDirCheckout.prescanOneTree();
-
-		conflictingEntries = workDirCheckout.getConflicts();
-		removedEntries = workDirCheckout.getRemoved();
-		assertTrue(conflictingEntries.isEmpty());
-		assertTrue(removedEntries.contains("bar/baz/qux/foo"));
-		assertTrue(removedEntries.contains("foo"));
-	}
-
-	@Test
-	public void testCheckingOutWithConflicts() throws IOException {
-		GitIndex index = new GitIndex(db);
-		index.add(trash, writeTrashFile("bar", "bar"));
-		index.add(trash, writeTrashFile("foo/bar/baz/qux", "foo/bar"));
-		recursiveDelete(new File(trash, "bar"));
-		recursiveDelete(new File(trash, "foo"));
-		writeTrashFile("bar/baz/qux/foo", "another nasty one");
-		writeTrashFile("foo", "troublesome little bugger");
-
-		try {
-			WorkDirCheckout workDirCheckout = new WorkDirCheckout(db, trash,
-					index, index);
-			workDirCheckout.checkout();
-			fail("Should have thrown exception");
-		} catch (CheckoutConflictException e) {
-			// all is well
-		}
-
-		WorkDirCheckout workDirCheckout = new WorkDirCheckout(db, trash, index,
-				index);
-		workDirCheckout.setFailOnConflict(false);
-		workDirCheckout.checkout();
-
-		assertTrue(new File(trash, "bar").isFile());
-		assertTrue(new File(trash, "foo/bar/baz/qux").isFile());
-
-		GitIndex index2 = new GitIndex(db);
-		recursiveDelete(new File(trash, "bar"));
-		recursiveDelete(new File(trash, "foo"));
-		index2.add(trash, writeTrashFile("bar/baz/qux/foo", "bar"));
-		writeTrashFile("bar/baz/qux/bar", "evil? I thought it said WEEVIL!");
-		index2.add(trash, writeTrashFile("foo", "lalala"));
-
-		workDirCheckout = new WorkDirCheckout(db, trash, index2, index);
-		workDirCheckout.setFailOnConflict(false);
-		workDirCheckout.checkout();
-
-		assertTrue(new File(trash, "bar").isFile());
-		assertTrue(new File(trash, "foo/bar/baz/qux").isFile());
-		assertNotNull(index2.getEntry("bar"));
-		assertNotNull(index2.getEntry("foo/bar/baz/qux"));
-		assertNull(index2.getEntry("bar/baz/qux/foo"));
-		assertNull(index2.getEntry("foo"));
-	}
-}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/WorkDirCheckout_ReadTreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/WorkDirCheckout_ReadTreeTest.java
deleted file mode 100644
index c41a04cc90..0000000000
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/WorkDirCheckout_ReadTreeTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.om>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.eclipse.jgit.lib;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * Test cases for ReadTree operations as implemented in WorkDirCheckout
- */
-public class WorkDirCheckout_ReadTreeTest extends ReadTreeTest {
-	private WorkDirCheckout wdc;
-	public void prescanTwoTrees(Tree head, Tree merge) throws IllegalStateException, IOException {
-		wdc = new WorkDirCheckout(db, db.getWorkTree(), head, db.getIndex(), merge);
-		wdc.prescanTwoTrees();
-	}
-
-	public void checkout() throws IOException {
-		GitIndex index = db.getIndex();
-		wdc = new WorkDirCheckout(db, db.getWorkTree(), theHead, index, theMerge);
-		wdc.checkout();
-		index.write();
-	}
-
-	public ArrayList<String> getRemoved() {
-		return wdc.getRemoved();
-	}
-
-	public HashMap<String, ObjectId> getUpdated() {
-		return wdc.updated;
-	}
-
-	public ArrayList<String> getConflicts() {
-		return wdc.getConflicts();
-	}
-}
-