[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/15 17:52:16

  Modified:    core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test 
                        PackagesBuildTest.java
  Log:
  initial implementation of testing a reference.. only implemented in changeFile() for now
  
  Revision  Changes    Path
  1.2       +47 -7     jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/PackagesBuildTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesBuildTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/PackagesBuildTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- PackagesBuildTest.java	9 Feb 2007 19:12:53 -0000	1.1
  +++ PackagesBuildTest.java	15 Feb 2007 22:52:16 -0000	1.2
  @@ -22,6 +22,7 @@
   import org.jboss.ide.eclipse.packages.core.model.AbstractPackagesBuildListener;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
  +import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackageBuildDelegate;
  @@ -39,9 +40,10 @@
   	private PackageBuildDelegate buildDelegate;
   	private NullProgressMonitor nullMonitor = new NullProgressMonitor();
   	
  -	private IPackage simpleJar;
  +	private IPackage simpleJar, refJar;
   	private IFile testXmlFile;
   	private IPackageFileSet simpleJarFileset;
  +	private IPackageFolder libFolder;
   	
   	private static boolean initialized = false;
   	
  @@ -73,6 +75,20 @@
   			simpleJar.addChild(simpleJarFileset);
   			
   			PackagesModel.instance().attach(simpleJar, nullMonitor);
  +
  +			refJar = PackagesCore.createDetachedPackage(project, true);
  +			refJar.setName("ref.jar");
  +			refJar.setPackageType(PackagesCore.getPackageType(JARPackageType.TYPE_ID));
  +			refJar.setDestinationContainer(project);
  +			
  +			libFolder = PackagesCore.createDetachedFolder(project);
  +			libFolder.setName("lib");
  +			refJar.addChild(libFolder);
  +			
  +			libFolder.addChild(simpleJar.createReference(false));
  +			
  +			PackagesModel.instance().attach(refJar, nullMonitor);
  +			
   			initialized = true;
   		} else{
   			
  @@ -84,7 +100,10 @@
   			
   			List packages = PackagesModel.instance().getProjectPackages(project);
   			simpleJar = (IPackage) packages.get(0);
  -			simpleJarFileset = (IPackageFileSet) simpleJar.getChildren(IPackageNode.TYPE_PACKAGE_FILESET)[0];
  +			simpleJarFileset = simpleJar.getFileSets()[0];
  +			
  +			refJar = (IPackage) packages.get(1);
  +			libFolder = refJar.getFolders()[0];
   		}
   	}
   	
  @@ -153,7 +172,7 @@
   		return new de.schlichtherle.io.File(pkg.getPackageFile().getRawLocation().toFile());
   	}
   	
  -	private File findFile (de.schlichtherle.io.File jarFile, String name)
  +	private File findFile (File jarFile, String name)
   	{
   		File subFiles[] = jarFile.listFiles();
   		assertNotNull(subFiles);
  @@ -215,14 +234,22 @@
   	
   	private void waitForBuilder ()
   	{
  +		long timeout = 1000 * 20;
  +		long wait = 0;
  +		
   		//	 wait for incremental builder to finish
   		try {
   			Thread.sleep(1000 * 3);
  -			while (PackageBuildDelegate.isBuilding())
  +			while (PackageBuildDelegate.isBuilding() && wait < timeout)
   			{
  -				Thread.sleep(300);
  +				Thread.sleep(100);
  +				wait += 100;
  +			}
  +			if (wait > timeout) {
  +				fail("Timed out ("+(timeout/1000)+"s) waiting for builder");
   			}
   		} catch (InterruptedException e) {
  +			e.printStackTrace();
   			fail(e.getMessage());
   		}	
   	}
  @@ -234,6 +261,20 @@
   		waitForBuilder();
   		
   		assertTestXmlContents(testXml_newContents);
  +		
  +		assertTrue (refJar.getPackageFile().exists());
  +		
  +		de.schlichtherle.io.File refJarFile = getPackageFile(refJar);
  +		File libFolderFile = findFile(refJarFile, "lib");
  +		assertNotNull(libFolderFile);
  +		
  +		File nestedSimpleJarFile = findFile(libFolderFile, "simple.jar");
  +		assertNotNull(nestedSimpleJarFile);
  +		
  +		File nestedTestXmlFile = findFile(nestedSimpleJarFile, "test.xml");
  +		assertNotNull(nestedTestXmlFile);
  +		
  +		assertFileContents(nestedTestXmlFile, testXml_newContents);
   	}
   	
   	public void testSimpleJar_addFile ()
  @@ -294,5 +335,4 @@
   		
   		assertFileContents (nestedXMLFile2, nestedXml_contents);
   	}
  -	
   }