From 7d380e9c5e1602e0938792869c4fcba88fd0dc2f Mon Sep 17 00:00:00 2001 From: Abhishek Bhatnagar Date: Tue, 24 May 2011 14:45:05 -0400 Subject: [PATCH] Add CleanCommandTest and fix CleanCommand Bug: 334767 Change-Id: I0a836451ceb668f943b1f353dc65420157810b23 Signed-off-by: Chris Aniszczyk --- .../eclipse/jgit/api/CleanCommandTest.java | 116 ++++++++++++++++++ .../org/eclipse/jgit/api/CleanCommand.java | 11 +- 2 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java new file mode 100644 index 000000000..760acbb57 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2011, Abhishek Bhatnagar + * 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.api; + +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.Set; +import java.util.TreeSet; + +import org.eclipse.jgit.errors.NoWorkTreeException; +import org.eclipse.jgit.lib.RepositoryTestCase; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests for CleanCommand + */ +public class CleanCommandTest extends RepositoryTestCase { + private Git git; + + @Before + public void setUp() throws Exception { + super.setUp(); + git = new Git(db); + + // create test files + writeTrashFile("File1.txt", "Hello world"); + writeTrashFile("File2.txt", "Delete Me"); + writeTrashFile("File3.txt", "Delete Me"); + + // add and commit first file + git.add().addFilepattern("File1.txt").call(); + git.commit().setMessage("Initial commit").call(); + } + + @Test + public void testClean() throws NoWorkTreeException, IOException { + // create status + StatusCommand command = git.status(); + Status status = command.call(); + Set files = status.getUntracked(); + assertTrue(files.size() > 0); + + // run clean + Set cleanedFiles = git.clean().call(); + + status = git.status().call(); + files = status.getUntracked(); + + assertTrue(files.size() == 0); + assertTrue(cleanedFiles.contains("File2.txt")); + assertTrue(cleanedFiles.contains("File3.txt")); + } + + @Test + public void testCleanWithPaths() throws NoWorkTreeException, IOException { + // create status + StatusCommand command = git.status(); + Status status = command.call(); + Set files = status.getUntracked(); + assertTrue(files.size() > 0); + + // run clean with setPaths + Set paths = new TreeSet(); + paths.add("File3.txt"); + Set cleanedFiles = git.clean().setPaths(paths).call(); + + status = git.status().call(); + files = status.getUntracked(); + assertTrue(files.size() == 1); + assertTrue(cleanedFiles.contains("File3.txt")); + assertTrue(!cleanedFiles.contains("File2.txt")); + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java index a3c8e5c93..d0d40c467 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java @@ -47,6 +47,7 @@ import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.Set; +import java.util.TreeSet; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.lib.Repository; @@ -79,15 +80,15 @@ public class CleanCommand extends GitCommand> { * @return a set of strings representing each file cleaned. */ public Set call() { - Set files = Collections.emptySet(); + Set files = new TreeSet(); try { StatusCommand command = new StatusCommand(repo); Status status = command.call(); - files = status.getUntracked(); - - for (String file : files) { - if (paths.isEmpty() || paths.contains(file)) + for (String file : status.getUntracked()) { + if (paths.isEmpty() || paths.contains(file)) { FileUtils.delete(new File(repo.getWorkTree(), file)); + files.add(file); + } } } catch (IOException e) { throw new JGitInternalException(e.getMessage(), e);