[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 11:38:49

  Modified:    core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build 
                        FileOpsTest.java
  Log:
  forgot to look in the "lib" folder from the ref.jar
  
  Revision  Changes    Path
  1.2       +61 -68    jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build/FileOpsTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FileOpsTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build/FileOpsTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FileOpsTest.java	26 Feb 2007 19:19:00 -0000	1.1
  +++ FileOpsTest.java	28 Feb 2007 16:38:49 -0000	1.2
  @@ -5,6 +5,7 @@
   
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   import org.jboss.ide.eclipse.packages.core.project.build.BuildFileOperations;
  +import org.jboss.ide.eclipse.packages.core.project.build.TruezipUtil;
   
   import de.schlichtherle.io.ArchiveException;
   import de.schlichtherle.io.File;
  @@ -36,18 +37,12 @@
   	public void testRemoveFile ()
   	{
   		ops.removeFileFromFilesets(testXmlFile, new IPackageFileSet[] { simpleJarFileset });
  -		File simpleJarFile = getPackageFile(simpleJar);
  -		
  -		try {
  -			File.update(simpleJarFile);
  -		} catch (ArchiveException e) {
  -			fail(e.getMessage());
  -		}
  -		
  -		File refJarFile = getPackageFile(refJar);
  +		TruezipUtil.umount(simpleJar);
   		
   		assertNull(findFile(simpleJarFile, "test.xml"));
  -		File simpleJarInRefJar = findFile(refJarFile, "simple.jar");
  +		
  +		File libFile = findFile(refJarFile, "lib");
  +		File simpleJarInRefJar = findFile(libFile, "simple.jar");
   		
   		assertNull(findFile(simpleJarInRefJar, "test.xml"));
   	}
  @@ -56,11 +51,9 @@
   	{
   		ops.updateFileInFilesets(testXmlFile, new IPackageFileSet[] { simpleJarFileset }, false);
   		
  -		File simpleJarFile = getPackageFile(simpleJar);
  -		File refJarFile = getPackageFile(refJar);
  -		
   		assertNotNull(findFile(simpleJarFile, "test.xml"));
  -		File simpleJarInRefJar = findFile(refJarFile, "simple.jar");
  +		File libFile = findFile(refJarFile, "lib");
  +		File simpleJarInRefJar = findFile(libFile, "simple.jar");
   		
   		assertNotNull(findFile(simpleJarInRefJar, "test.xml"));
   	}