Author: adietish Date: 2011-08-17 04:51:22 -0400 (Wed, 17 Aug 2011) New Revision: 33998 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/util/TestUtils.java Log: [JBIDE-9513] corrected 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-17 07:50:11 UTC (rev 33997) +++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-17 08:51:22 UTC (rev 33998) @@ -39,7 +39,7 @@ @Before public void setUp() throws Exception { Activator.getDefault().getRepositoryCache().clear(); - + this.testProject = new TestProject(true); this.project = testProject.getProject(); @@ -59,9 +59,10 @@ } private File createGitDir(TestProject testProject) throws IOException { - IPath workspaceRoot = project.getWorkspace().getRoot().getRawLocation(); -// IPath randomFolder = workspaceRoot.append(String.valueOf(System.currentTimeMillis())); -// File gitDir = new File(randomFolder.toFile(), Constants.DOT_GIT); + IPath workspaceRoot = project.getWorkspace().getRoot().getRawLocation(); + // IPath randomFolder = + // workspaceRoot.append(String.valueOf(System.currentTimeMillis())); + // File gitDir = new File(randomFolder.toFile(), Constants.DOT_GIT); File gitDir = new File(workspaceRoot.toFile(), Constants.DOT_GIT); if (gitDir.exists()) { // guard @@ -87,13 +88,13 @@ public void commitsFileInProject() throws Exception { IFile file = testUtils.addFileToProject( testProject.getProject(), - "sub/a.txt", "some text"); - resources.add(testProject.getProject().getFolder("sub")); + "a.txt", "some text"); + resources.add(file); new AddToIndexOperation(resources).execute(null); EgitUtils.commit(testProject.getProject()); - - testUtils.assertRepositoryContainsFiles(repository, new String[]{file.toString()}); + + testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) }); } } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-17 07:50:11 UTC (rev 33997) +++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-17 08:51:22 UTC (rev 33998) @@ -26,6 +26,7 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -252,5 +253,10 @@ } return map; } + + public String getRepositoryPath(IResource resource) { + String fullPath = resource.getFullPath().toString(); + return fullPath.substring(1, fullPath.length()); + } }