Author: dgolovin
Date: 2010-11-15 15:12:28 -0500 (Mon, 15 Nov 2010)
New Revision: 26586
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared
fix for junit test errors. filtering of .svn folders restored because of tycho behavior.
It returns local source folder as bundle location in tests and thus projects imported from
file system with .svn files.
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-11-15
19:47:48 UTC (rev 26585)
+++
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-11-15
20:12:28 UTC (rev 26586)
@@ -272,9 +272,16 @@
.getFullPath(), source, zipStrProvider , overwrite);
importOp.setFilesToImport(zipStrProvider.getChildren(source));
} else {
+ ImportProvider importProvider = new ImportProvider();
+
+ // need to remove from imported project "svn" files
+ List<String> unimportedFiles = new ArrayList<String>();
+ unimportedFiles.add(".svn"); //$NON-NLS-1$
+
+ importProvider.setUnimportedFiles(unimportedFiles);
// create import operation
importOp = new ImportOperation(project
- .getFullPath(), new File(path), FileSystemStructureProvider.INSTANCE, overwrite);
+ .getFullPath(), new File(path), importProvider, overwrite);
}
// import files just to project folder ( without old structure )