[jboss-cvs] jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test ...

[Marshall Culpepper]

  User: mculpepper
  Date: 07/02/21 14:39:06

  Modified:    core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test 
                        PackagesEARTest.java
  Log:
  made startup of the earTest static (like the build test), and fixed a bug in the model test
  
  Revision  Changes    Path
  1.7       +45 -23    jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/PackagesEARTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesEARTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/PackagesEARTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PackagesEARTest.java	15 Feb 2007 22:51:32 -0000	1.6
  +++ PackagesEARTest.java	21 Feb 2007 19:39:06 -0000	1.7
  @@ -21,7 +21,6 @@
    */
   package org.jboss.ide.eclipse.packages.test;
   
  -import java.io.File;
   import java.io.StringWriter;
   import java.util.Arrays;
   import java.util.List;
  @@ -30,11 +29,13 @@
   import junit.framework.TestCase;
   
   import org.eclipse.core.resources.IFile;
  +import org.eclipse.core.resources.IProject;
   import org.eclipse.core.resources.IResource;
  -import org.eclipse.core.runtime.IPath;
  +import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.NullProgressMonitor;
   import org.eclipse.core.runtime.Path;
   import org.eclipse.jdt.core.IJavaProject;
  +import org.eclipse.jdt.core.JavaCore;
   import org.jboss.ide.eclipse.core.test.util.JavaProjectHelper;
   import org.jboss.ide.eclipse.core.test.util.TestFileUtil;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
  @@ -53,11 +54,14 @@
   import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
   import org.jboss.ide.eclipse.packages.core.model.types.JARPackageType;
   
  +import de.schlichtherle.io.File;
  +
   public class PackagesEARTest extends TestCase {
   
   	private IJavaProject testPackagesProject;
   	private XbPackages packagesElement;
   	private String testPackagesProjectRoot;
  +	private static boolean initialized = false;
   	
   	public PackagesEARTest (String testName)
   	{
  @@ -65,6 +69,8 @@
   	}
   	
   	protected void setUp() throws Exception {
  +		if (!initialized)
  +		{
   		testPackagesProject = JavaProjectHelper.createJavaProject(
   			"testPackagesProject", new String[] { "/src" }, "/bin");
   		
  @@ -74,9 +80,14 @@
   	   TestFileUtil.copyDirectory (new File(testPackagesProjectRoot), testPackagesProject.getProject().getLocation().toFile(), true);
   	   testPackagesProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
   	   
  +		} else {
  +			
  +			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("testPackagesProject");
  +			testPackagesProject = JavaCore.create(project);
  +		}
  +
   	   packagesElement = XMLBinding.unmarshal(
   				testPackagesProject.getProject().getFile(PackagesModel.PROJECT_PACKAGES_FILE).getContents(), new NullProgressMonitor());
  -	   
   	}
   	
   	public void testCorrectBinding ()
  @@ -226,8 +237,11 @@
   	
   	public void testModel ()
   	{
  -//		PackagesModel.instance().registerProject(testPackagesProject.getProject(), new NullProgressMonitor());
   		List packages = PackagesModel.instance().getProjectPackages(testPackagesProject.getProject());
  +		if (packages == null) {
  +			PackagesModel.instance().registerProject(testPackagesProject.getProject(), new NullProgressMonitor());
  +			packages = PackagesModel.instance().getProjectPackages(testPackagesProject.getProject());
  +		}
   		
   		assertNotNull(packages);
   		assertEquals(packages.size(), 3);
  @@ -307,6 +321,7 @@
   	{
   		NullProgressMonitor nullMonitor = new NullProgressMonitor();
   		List packages = PackagesModel.instance().getProjectPackages(testPackagesProject.getProject());
  +		assertNotNull(packages);
   		assertTrue(packages.size() > 0);
   		
   		IPackage pkg = (IPackage) packages.get(0);
  @@ -319,25 +334,31 @@
   		assertEquals(packageFile.getName(), "MyApp.ear");
   		assertEquals(packageFile.getParent(), pkg.getDestinationContainer());
   		
  -		de.schlichtherle.io.File packageZipFile = new de.schlichtherle.io.File(packageFile.getRawLocation().toString());
  +		File packageZipFile = new File(packageFile.getRawLocation().toString());
   		assertTrue(packageZipFile.exists());
   		
  -		File[] children = packageZipFile.listFiles();
  +		File[] children = (File[]) packageZipFile.listFiles();
   		assertEquals(children.length, 2);
  +		File metaInfFolder = null, packagesFolder = null;
   		
  -		File packagesFolder = children[0];
  -		File metaInfFolder = children[1];
  +		for (int i = 0; i < 2; i++)
  +		{
  +			if (children[i].getName().equals("META-INF"))
  +				metaInfFolder = children[i];
  +			else if (children[i].getName().equals("packages"))
  +				packagesFolder = children[i];
  +		}
   		
  -		assertEquals(metaInfFolder.getName(), "META-INF");
  -		assertEquals(packagesFolder.getName(), "packages");
  +		assertNotNull(metaInfFolder);
  +		assertNotNull(packagesFolder);
   		
  -		children = metaInfFolder.listFiles();
  +		children = (File[]) metaInfFolder.listFiles();
   		assertEquals(children.length, 1);
   		
   		File applicationXml = children[0];
   		assertEquals(applicationXml.getName(), "application.xml");
   		
  -		children = packagesFolder.listFiles();
  +		children = (File []) packagesFolder.listFiles();
   		assertEquals(children.length, 2);
   		
   	}
  @@ -366,6 +387,7 @@
   //			fail(e.getMessage());
   //		}
   		
  +		PackagesCore.attach(jar, nullMonitor);
   		PackagesCore.buildPackage(jar, nullMonitor);
   		
   		IFile jarFile = jar.getPackageFile();
  @@ -407,7 +429,7 @@
   		List packages = PackagesModel.instance().getProjectPackages(testPackagesProject.getProject());
   		
   		assertNotNull(packages);
  -		assertEquals(packages.size(), 3);
  +		assertEquals(packages.size(), 4);
   		
   		IPackage testRef = (IPackage) packages.get(1);
   		IPackage testRef2 = (IPackage) packages.get(2);