Author: adietish Date: 2011-08-18 09:07:28 -0400 (Thu, 18 Aug 2011) New Revision: 34047 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java Log: [JBIDE-9513] implemented push test Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-18 13:07:18 UTC (rev 34046) +++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-18 13:07:28 UTC (rev 34047) @@ -2,6 +2,8 @@ import java.io.File; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; @@ -12,8 +14,10 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.op.AddToIndexOperation; +import org.eclipse.egit.core.op.CloneOperation; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.SystemReader; import org.jboss.ide.eclipse.as.egit.core.EgitUtils; @@ -35,6 +39,7 @@ private Repository repository; private TestProject testProject; private IProject project; + private File clonedRepositoryFile; @Before public void setUp() throws Exception { @@ -44,12 +49,30 @@ this.project = testProject.getProject(); createMockSystemReader(); + this.gitDir = createGitDir(testProject); this.testRepository = new TestRepository(gitDir); this.repository = testRepository.getRepository(); testRepository.connect(project); + + TestProject testProject2 = new TestProject(true); + // File gitDir2 = createGitDir(testProject2); + // TestRepository testRepository2 = new TestRepository(gitDir2); + // Repository repository2 = testRepository.getRepository(); + + this.clonedRepositoryFile = cloneRepository(repository); } + private File cloneRepository(Repository repository) throws URISyntaxException, InvocationTargetException, + InterruptedException { + URIish uri = new URIish("file:///" + repository.getDirectory().toString()); + String repoParent = repository.getDirectory().getParent(); + File clonedRepository = new File("clonedRepository" + String.valueOf(System.currentTimeMillis()), repoParent); + CloneOperation clop = new CloneOperation(uri, true, null, clonedRepository, "refs/heads/master", "origin", 0); + clop.run(null); + return clonedRepository; + } + private void createMockSystemReader() { MockSystemReader mockSystemReader = new MockSystemReader(); SystemReader.setInstance(mockSystemReader); @@ -82,6 +105,10 @@ if (gitDir.exists()) { FileUtils.delete(gitDir, FileUtils.RECURSIVE | FileUtils.RETRY); } + + if (clonedRepositoryFile.exists()) { + FileUtils.delete(clonedRepositoryFile, FileUtils.RECURSIVE | FileUtils.RETRY); + } } @Test @@ -92,14 +119,22 @@ resources.add(file); new AddToIndexOperation(resources).execute(null); - EgitUtils.commit(testProject.getProject()); + EgitUtils.commit(testProject.getProject(), null); testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) }); } @Test - public void canPushRepoToAntoherRepo() { -// EgitUtils.push(project, destinationRepository) + public void canPushRepoToAntoherRepo() throws Exception { + IFile file = testUtils.addFileToProject( + testProject.getProject(), + "a.txt", "some text"); + resources.add(file); + new AddToIndexOperation(resources).execute(null); + + EgitUtils.push(testProject.getProject(), null); + + testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) }); } - + }