Author: adietish Date: 2011-08-24 11:13:39 -0400 (Wed, 24 Aug 2011) New Revision: 34229 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java Log: [JBIDE-9575] implementing test for push to remote by name Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java 2011-08-24 15:08:34 UTC (rev 34228) +++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestRepository.java 2011-08-24 15:13:39 UTC (rev 34229) @@ -68,6 +68,8 @@ String workdirPrefix; + private File gitDir; + /** * Creates a new test repository * @@ -79,15 +81,22 @@ tmpRepository.create(); tmpRepository.close(); // use repository instance from RepositoryCache! - repository = Activator.getDefault().getRepositoryCache().lookupRepository(gitDir); + this.gitDir = gitDir; + this.repository = Activator.getDefault().getRepositoryCache().lookupRepository(gitDir); + this.workdirPrefix = getWorkdirPrefix(repository); + workdirPrefix = workdirPrefix.replace('\\', '/'); + if (!workdirPrefix.endsWith("/")) //$NON-NLS-1$ + workdirPrefix += "/"; //$NON-NLS-1$ + } + + private String getWorkdirPrefix(Repository repository) { + String workdirPrefix = repository.getWorkTree().getAbsolutePath(); try { workdirPrefix = repository.getWorkTree().getCanonicalPath(); } catch (IOException err) { - workdirPrefix = repository.getWorkTree().getAbsolutePath(); + // ignore; } - workdirPrefix = workdirPrefix.replace('\\', '/'); - if (!workdirPrefix.endsWith("/")) //$NON-NLS-1$ - workdirPrefix += "/"; //$NON-NLS-1$ + return workdirPrefix; } /** @@ -560,4 +569,8 @@ SystemReader.setInstance(mockSystemReader); mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY, ceilingPath.toOSString()); } + + public File getGitDir() { + return gitDir; + } }