[jbosstools-commits] JBoss Tools SVN: r7000 - trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-03-18 20:04:06 -0400 (Tue, 18 Mar 2008)
New Revision: 7000

Modified:
   trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java
Log:
Fixed last test

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-18 23:37:09 UTC (rev 6999)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java	2008-03-19 00:04:06 UTC (rev 7000)
@@ -23,6 +23,9 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
@@ -41,6 +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;
 
 /**
  * @author rob.stryker <rob.stryker at redhat.com>
@@ -479,16 +483,29 @@
 	
 	// should clash, same destinations
 	public void testArchiveClashingArchiveInModel() {
+		// 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(); }
+
 		ArchiveModelNode model = createEmptyModelNode();
-		IArchive root = createArchive("root.war", "blah");
-		IArchive root2 = createArchive("root.war", "blah");
+		IArchive root = createArchive("root.war", "basicwebproject");
+		IArchive root2 = createArchive("root.war", "basicwebproject");
+		
 		try {
 			model.addChild(root);
 			model.addChild(root2);
+			fail();
 		} catch( ArchivesModelException ame ) {
 			return;
+		} finally {
+			try {
+				provider.dispose();
+			} catch( CoreException ce ) {fail();}
 		}
-		fail();
 	}
 	
 	// Should not clash, different destinations