[jbosstools-commits] JBoss Tools SVN: r7027 - in trunk/core/tests/org.jboss.ide.eclipse.archives.test: src/org/jboss/ide/eclipse/archives/test/model and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-03-19 22:59:05 -0400 (Wed, 19 Mar 2008)
New Revision: 7027

Modified:
   trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
   trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java
Log:
Applying Dennis's patch to my test case ;) 

Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF	2008-03-20 02:41:51 UTC (rev 7026)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF	2008-03-20 02:59:05 UTC (rev 7027)
@@ -8,6 +8,6 @@
  org.junit,
  org.jboss.ide.eclipse.archives.core,
  org.eclipse.core.resources,
- org.jboss.tools.common.test
+ org.jboss.tools.tests
 Eclipse-LazyStart: true
 Bundle-ClassPath: archivestest.jar

Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java	2008-03-20 02:41:51 UTC (rev 7026)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java	2008-03-20 02:59:05 UTC (rev 7027)
@@ -44,7 +44,7 @@
 import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackage;
 import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages;
 import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
-import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.ResourcesUtils;
 
 /**
  * @author rob.stryker <rob.stryker at redhat.com>
@@ -482,15 +482,13 @@
 	}
 	
 	// should clash, same destinations
-	public void testArchiveClashingArchiveInModel() {
+	public void testArchiveClashingArchiveInModel() throws Exception {
 		// copy a project
-		TestProjectProvider provider = null;
-		try {
-			provider = new TestProjectProvider("org.jboss.ide.eclipse.archives.test", "/inputs/projects/basicwebproject", "basicwebproject", true); 
-			IProject proj = provider.getProject();
-			proj.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-		} catch( CoreException ce ) { fail(); }
+		IProject proj = null;
+		proj = ResourcesUtils.importProject("org.jboss.ide.eclipse.archives.test", "/inputs/projects/basicwebproject");
+		proj.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
 
+
 		ArchiveModelNode model = createEmptyModelNode();
 		IArchive root = createArchive("root.war", "basicwebproject");
 		IArchive root2 = createArchive("root.war", "basicwebproject");
@@ -503,7 +501,7 @@
 			return;
 		} finally {
 			try {
-				provider.dispose();
+				proj.delete(false, true, null);
 			} catch( CoreException ce ) {fail();}
 		}
 	}