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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/02/28 18:23:40

  Modified:    core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build 
                        BuildTest.java
  Log:
  simpleJarRef wasn't being initialized correctly after initial setup, added a refresh() in waitForAutoBuild
  
  Revision  Changes    Path
  1.4       +16 -4     jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build/BuildTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuildTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build/BuildTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- BuildTest.java	28 Feb 2007 16:38:12 -0000	1.3
  +++ BuildTest.java	28 Feb 2007 23:23:40 -0000	1.4
  @@ -5,8 +5,11 @@
   import java.io.IOException;
   import java.util.List;
   
  +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.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.NullProgressMonitor;
  @@ -19,6 +22,7 @@
   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.IPackageReference;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
   import org.jboss.ide.eclipse.packages.core.model.types.JARPackageType;
  @@ -28,8 +32,6 @@
   import de.schlichtherle.io.File;
   import de.schlichtherle.io.FileInputStream;
   
  -import junit.framework.TestCase;
  -
   public class BuildTest extends TestCase {
   	protected IProject project;
   	protected IJavaProject javaProject;
  @@ -41,6 +43,7 @@
   	protected IFile testXmlFile;
   	protected IPackageFileSet simpleJarFileset, explodedJarFileset;
   	protected IPackageFolder libFolder;
  +	protected IPackageReference simpleJarRef;
   	protected File simpleJarFile, explodedJarFile, refJarFile;
   	
   	protected static boolean initialized = false;
  @@ -88,7 +91,8 @@
   			libFolder.setName("lib");
   			refJar.addChild(libFolder);
   			
  -			libFolder.addChild(simpleJar.createReference(false));
  +			simpleJarRef = simpleJar.createReference(false);
  +			libFolder.addChild(simpleJarRef);
   			
   			PackagesModel.instance().attach(refJar, nullMonitor);
   	
  @@ -118,6 +122,7 @@
   			List packages = PackagesModel.instance().getProjectPackages(project);
   			simpleJar = (IPackage) packages.get(0);
   			simpleJarFileset = simpleJar.getFileSets()[0];
  +			simpleJarRef = simpleJar.getReferences()[0];
   			
   			refJar = (IPackage) packages.get(1);
   			libFolder = refJar.getFolders()[0];
  @@ -134,7 +139,14 @@
   	/**
   	 * Wait for autobuild notification to occur
   	 */
  -	public static void waitForAutoBuild() {
  +	public void waitForAutoBuild() {
  +		
  +		try {
  +			project.refreshLocal(IResource.DEPTH_INFINITE, nullMonitor);
  +		} catch (CoreException e1) {
  +			fail(e1.getMessage());
  +		}
  +		
   		boolean wasInterrupted = false;
   		do {
   			try {