Merge "Fix tests for Ant task "git-clone""
This commit is contained in:
commit
dd1e66e1d7
|
@ -45,6 +45,7 @@
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.apache.tools.ant.BuildException;
|
import org.apache.tools.ant.BuildException;
|
||||||
import org.apache.tools.ant.DefaultLogger;
|
import org.apache.tools.ant.DefaultLogger;
|
||||||
|
@ -60,13 +61,17 @@ public class GitCloneTaskTest extends LocalDiskRepositoryTestCase {
|
||||||
|
|
||||||
private GitCloneTask task;
|
private GitCloneTask task;
|
||||||
private Project project;
|
private Project project;
|
||||||
|
private File dest;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() {
|
public void before() throws IOException {
|
||||||
project = new Project();
|
project = new Project();
|
||||||
|
project.init();
|
||||||
enableLogging();
|
enableLogging();
|
||||||
project.addTaskDefinition("git-clone", GitCloneTask.class);
|
project.addTaskDefinition("git-clone", GitCloneTask.class);
|
||||||
task = (GitCloneTask) project.createTask("git-clone");
|
task = (GitCloneTask) project.createTask("git-clone");
|
||||||
|
dest = createTempFile();
|
||||||
|
task.setDest(dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = BuildException.class)
|
@Test(expected = BuildException.class)
|
||||||
|
@ -97,8 +102,6 @@ public void shouldCloneAValidGitRepository() throws Exception {
|
||||||
FileRepository repo = createBareRepository();
|
FileRepository repo = createBareRepository();
|
||||||
File directory = repo.getDirectory();
|
File directory = repo.getDirectory();
|
||||||
task.setUri("file://" + directory);
|
task.setUri("file://" + directory);
|
||||||
File dest = createTempFile();
|
|
||||||
task.setDest(dest);
|
|
||||||
task.execute();
|
task.execute();
|
||||||
|
|
||||||
assertTrue(RepositoryCache.FileKey.isGitRepository(new File(dest, ".git"), FS.DETECTED));
|
assertTrue(RepositoryCache.FileKey.isGitRepository(new File(dest, ".git"), FS.DETECTED));
|
||||||
|
@ -110,8 +113,6 @@ public void shouldCreateABareCloneOfAValidGitRepository() throws Exception {
|
||||||
File directory = repo.getDirectory();
|
File directory = repo.getDirectory();
|
||||||
task.setUri("file://" + directory);
|
task.setUri("file://" + directory);
|
||||||
task.setBare(true);
|
task.setBare(true);
|
||||||
File dest = createTempFile();
|
|
||||||
task.setDest(dest);
|
|
||||||
task.execute();
|
task.execute();
|
||||||
|
|
||||||
assertTrue(RepositoryCache.FileKey.isGitRepository(dest, FS.DETECTED));
|
assertTrue(RepositoryCache.FileKey.isGitRepository(dest, FS.DETECTED));
|
||||||
|
|
Loading…
Reference in New Issue