Un-ignored existing CLI tests which run just fine on Java 7+
Change-Id: I5ef334a49fb2d88d5e856b443687f3dcb126a77a Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
This commit is contained in:
parent
c59d86c0a7
commit
888f08b048
|
@ -46,14 +46,10 @@
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
|
||||||
import java.lang.Exception;
|
|
||||||
import java.lang.String;
|
|
||||||
|
|
||||||
import org.eclipse.jgit.api.Git;
|
import org.eclipse.jgit.api.Git;
|
||||||
import org.eclipse.jgit.dircache.DirCache;
|
import org.eclipse.jgit.dircache.DirCache;
|
||||||
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
|
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class AddTest extends CLIRepositoryTestCase {
|
public class AddTest extends CLIRepositoryTestCase {
|
||||||
|
@ -66,14 +62,12 @@ public void setUp() throws Exception {
|
||||||
git = new Git(db);
|
git = new Git(db);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore("args4j exit()s on error instead of throwing, JVM goes down")
|
|
||||||
@Test
|
@Test
|
||||||
public void testAddNothing() throws Exception {
|
public void testAddNothing() throws Exception {
|
||||||
assertEquals("fatal: Argument \"filepattern\" is required", //
|
assertEquals("fatal: Argument \"filepattern\" is required", //
|
||||||
execute("git add")[0]);
|
execute("git add")[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore("args4j exit()s for --help, too")
|
|
||||||
@Test
|
@Test
|
||||||
public void testAddUsage() throws Exception {
|
public void testAddUsage() throws Exception {
|
||||||
execute("git add --help");
|
execute("git add --help");
|
||||||
|
|
|
@ -52,17 +52,15 @@
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.lang.Object;
|
|
||||||
import java.lang.String;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.Callable;
|
import java.util.concurrent.Callable;
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipInputStream;
|
import java.util.zip.ZipInputStream;
|
||||||
|
@ -71,9 +69,7 @@
|
||||||
import org.eclipse.jgit.dircache.DirCache;
|
import org.eclipse.jgit.dircache.DirCache;
|
||||||
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
|
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
|
||||||
import org.eclipse.jgit.lib.FileMode;
|
import org.eclipse.jgit.lib.FileMode;
|
||||||
import org.eclipse.jgit.pgm.CLIGitCommand;
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class ArchiveTest extends CLIRepositoryTestCase {
|
public class ArchiveTest extends CLIRepositoryTestCase {
|
||||||
|
@ -89,7 +85,6 @@ public void setUp() throws Exception {
|
||||||
emptyTree = db.resolve("HEAD^{tree}").abbreviate(12).name();
|
emptyTree = db.resolve("HEAD^{tree}").abbreviate(12).name();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore("Some versions of java.util.zip refuse to write an empty ZIP")
|
|
||||||
@Test
|
@Test
|
||||||
public void testEmptyArchive() throws Exception {
|
public void testEmptyArchive() throws Exception {
|
||||||
byte[] result = CLIGitCommand.rawExecute(
|
byte[] result = CLIGitCommand.rawExecute(
|
||||||
|
|
Loading…
Reference in New Issue