Move the set constructor function to a Sets utility class, allowing the tests to compile in parallel. Change-Id: Id6fac2533fab8d423f949c892f199af2491a450btags/v3.2.0.201311130903-m3
@@ -1340,7 +1340,7 @@ public class MergeCommandTest extends RepositoryTestCase { | |||
assertNull(db.readMergeCommitMsg()); | |||
Status stat = git.status().call(); | |||
assertEquals(StatusCommandTest.set("file2", "file3"), stat.getAdded()); | |||
assertEquals(Sets.of("file2", "file3"), stat.getAdded()); | |||
} | |||
@Test | |||
@@ -1396,7 +1396,7 @@ public class MergeCommandTest extends RepositoryTestCase { | |||
assertNull(db.readMergeCommitMsg()); | |||
Status stat = git.status().call(); | |||
assertEquals(StatusCommandTest.set("file3"), stat.getAdded()); | |||
assertEquals(Sets.of("file3"), stat.getAdded()); | |||
} | |||
@Test | |||
@@ -1450,7 +1450,7 @@ public class MergeCommandTest extends RepositoryTestCase { | |||
assertEquals("\nConflicts:\n\tfile2\n", db.readMergeCommitMsg()); | |||
Status stat = git.status().call(); | |||
assertEquals(StatusCommandTest.set("file2"), stat.getConflicting()); | |||
assertEquals(Sets.of("file2"), stat.getConflicting()); | |||
} | |||
@Test |
@@ -0,0 +1,56 @@ | |||
/* | |||
* Copyright (C) 2011, Christian Halstrick <christian.halstrick@sap.com> | |||
* 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 java.util.HashSet; | |||
import java.util.Set; | |||
class Sets { | |||
static <T> Set<T> of(T... elements) { | |||
Set<T> ret = new HashSet<T>(); | |||
for (T element : elements) | |||
ret.add(element); | |||
return ret; | |||
} | |||
} |
@@ -48,8 +48,6 @@ import static org.junit.Assert.assertTrue; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.util.HashSet; | |||
import java.util.Set; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.NoFilepatternException; | |||
@@ -82,12 +80,12 @@ public class StatusCommandTest extends RepositoryTestCase { | |||
writeTrashFile("c", "content of c"); | |||
git.add().addFilepattern("a").addFilepattern("b").call(); | |||
Status stat = git.status().call(); | |||
assertEquals(set("a", "b"), stat.getAdded()); | |||
assertEquals(Sets.of("a", "b"), stat.getAdded()); | |||
assertEquals(0, stat.getChanged().size()); | |||
assertEquals(0, stat.getMissing().size()); | |||
assertEquals(0, stat.getModified().size()); | |||
assertEquals(0, stat.getRemoved().size()); | |||
assertEquals(set("c"), stat.getUntracked()); | |||
assertEquals(Sets.of("c"), stat.getUntracked()); | |||
git.commit().setMessage("initial").call(); | |||
writeTrashFile("a", "modified content of a"); | |||
@@ -96,12 +94,12 @@ public class StatusCommandTest extends RepositoryTestCase { | |||
git.add().addFilepattern("a").addFilepattern("d").call(); | |||
writeTrashFile("a", "again modified content of a"); | |||
stat = git.status().call(); | |||
assertEquals(set("d"), stat.getAdded()); | |||
assertEquals(set("a"), stat.getChanged()); | |||
assertEquals(Sets.of("d"), stat.getAdded()); | |||
assertEquals(Sets.of("a"), stat.getChanged()); | |||
assertEquals(0, stat.getMissing().size()); | |||
assertEquals(set("b", "a"), stat.getModified()); | |||
assertEquals(Sets.of("b", "a"), stat.getModified()); | |||
assertEquals(0, stat.getRemoved().size()); | |||
assertEquals(set("c"), stat.getUntracked()); | |||
assertEquals(Sets.of("c"), stat.getUntracked()); | |||
git.add().addFilepattern(".").call(); | |||
git.commit().setMessage("second").call(); | |||
@@ -122,8 +120,8 @@ public class StatusCommandTest extends RepositoryTestCase { | |||
assertEquals(0, stat.getChanged().size()); | |||
assertEquals(0, stat.getMissing().size()); | |||
assertEquals(0, stat.getModified().size()); | |||
assertEquals(set("a"), stat.getRemoved()); | |||
assertEquals(set("a"), stat.getUntracked()); | |||
assertEquals(Sets.of("a"), stat.getRemoved()); | |||
assertEquals(Sets.of("a"), stat.getUntracked()); | |||
git.commit().setMessage("t").call(); | |||
writeTrashFile("sub/a", "sub-file"); | |||
@@ -153,25 +151,18 @@ public class StatusCommandTest extends RepositoryTestCase { | |||
// filter on an existing file | |||
stat = git.status().addPath("a").call(); | |||
assertEquals(set("a"), stat.getModified()); | |||
assertEquals(Sets.of("a"), stat.getModified()); | |||
// filter on an existing folder | |||
stat = git.status().addPath("D").call(); | |||
assertEquals(set("D/b", "D/D/d"), stat.getModified()); | |||
assertEquals(Sets.of("D/b", "D/D/d"), stat.getModified()); | |||
// filter on an existing folder and file | |||
stat = git.status().addPath("D/D").addPath("a").call(); | |||
assertEquals(set("a", "D/D/d"), stat.getModified()); | |||
assertEquals(Sets.of("a", "D/D/d"), stat.getModified()); | |||
// do not filter at all | |||
stat = git.status().call(); | |||
assertEquals(set("a", "D/b", "D/D/d"), stat.getModified()); | |||
} | |||
public static Set<String> set(String... elements) { | |||
Set<String> ret = new HashSet<String>(); | |||
for (String element : elements) | |||
ret.add(element); | |||
return ret; | |||
assertEquals(Sets.of("a", "D/b", "D/D/d"), stat.getModified()); | |||
} | |||
} |