Browse Source

Merge "Fix tests for Ant task "git-clone""

tags/v2.0.0.201206130900-r
Christian Halstrick 12 years ago
parent
commit
dd1e66e1d7

+ 6
- 5
org.eclipse.jgit.ant.test/src/org/eclipse/jgit/ant/tasks/GitCloneTaskTest.java View File

@@ -45,6 +45,7 @@ package org.eclipse.jgit.ant.tasks;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.IOException;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DefaultLogger;
@@ -60,13 +61,17 @@ public class GitCloneTaskTest extends LocalDiskRepositoryTestCase {

private GitCloneTask task;
private Project project;
private File dest;

@Before
public void before() {
public void before() throws IOException {
project = new Project();
project.init();
enableLogging();
project.addTaskDefinition("git-clone", GitCloneTask.class);
task = (GitCloneTask) project.createTask("git-clone");
dest = createTempFile();
task.setDest(dest);
}

@Test(expected = BuildException.class)
@@ -97,8 +102,6 @@ public class GitCloneTaskTest extends LocalDiskRepositoryTestCase {
FileRepository repo = createBareRepository();
File directory = repo.getDirectory();
task.setUri("file://" + directory);
File dest = createTempFile();
task.setDest(dest);
task.execute();

assertTrue(RepositoryCache.FileKey.isGitRepository(new File(dest, ".git"), FS.DETECTED));
@@ -110,8 +113,6 @@ public class GitCloneTaskTest extends LocalDiskRepositoryTestCase {
File directory = repo.getDirectory();
task.setUri("file://" + directory);
task.setBare(true);
File dest = createTempFile();
task.setDest(dest);
task.execute();

assertTrue(RepositoryCache.FileKey.isGitRepository(dest, FS.DETECTED));

Loading…
Cancel
Save