[jboss-cvs] jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build ...
Marshall Culpepper
mculpepper at jboss.com
Wed Feb 28 11:38:12 EST 2007
User: mculpepper
Date: 07/02/28 11:38:12
Modified: core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build
IncrementalBuilderTest.java BuildTest.java
Log:
made the File objects for each JAR in the unit test member variables, added 2 new unit tests to test switching an exploded JAR to compressed, and testing if two overlapping filesets reference the same file, when one gets changed/deleted the overlapping files still exist in the package
Revision Changes Path
1.3 +248 -229 jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build/IncrementalBuilderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IncrementalBuilderTest.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/build/IncrementalBuilderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- IncrementalBuilderTest.java 27 Feb 2007 18:48:57 -0000 1.2
+++ IncrementalBuilderTest.java 28 Feb 2007 16:38:12 -0000 1.3
@@ -40,7 +40,9 @@
suite.addTest(new IncrementalBuilderTest("testSimpleJar_changeFilesetPattern_removeFile"));
suite.addTest(new IncrementalBuilderTest("testExplodedJar"));
suite.addTest(new IncrementalBuilderTest("testSimpleJar_changeToExploded"));
+ suite.addTest(new IncrementalBuilderTest("testSimpleJar_changeToCompressed"));
suite.addTest(new IncrementalBuilderTest("testBaseFile"));
+ suite.addTest(new IncrementalBuilderTest("testOverlappingFilesets"));
return suite;
}
@@ -102,7 +104,6 @@
assertTrue (refJar.getPackageFile().exists());
- File refJarFile = getPackageFile(refJar);
File libFolderFile = findFile(refJarFile, "lib");
assertNotNull(libFolderFile);
@@ -139,8 +140,7 @@
assertFalse(addedXML.exists());
- File jarFile = getPackageFile(simpleJar);
- File addedXMLFile = findFile(jarFile, "added.xml");
+ File addedXMLFile = findFile(simpleJarFile, "added.xml");
assertNull(addedXMLFile);
}
@@ -150,16 +150,15 @@
IFile nestedXMLFile = project.getFile(new Path("dir1/dir2/nested.xml"));
setContents(nestedXMLFile, nestedXml_contents);
- File jarFile = getPackageFile(simpleJar);
- File dir1 = findFile(jarFile, "dir1");
+ File dir1 = findFile(simpleJarFile, "dir1");
assertNull(dir1);
+ waitForAutoBuild();
simpleJarFileset.setIncludesPattern("**/*.xml");
+ ((PackageNodeImpl)simpleJarFileset).flagAsChanged();
- waitForAutoBuild();
-
- dir1 = findFile(jarFile, "dir1");
+ dir1 = findFile(simpleJarFile, "dir1");
assertNotNull(dir1);
assertEquals(dir1.getName(), "dir1");
@@ -176,14 +175,12 @@
public void testSimpleJar_changeFilesetPattern_removeFile ()
{
- File jarFile = getPackageFile(simpleJar);
-
simpleJarFileset.setIncludesPattern("*.xml");
((PackageNodeImpl)simpleJarFileset).flagAsChanged();
waitForAutoBuild();
- File dir1 = findFile(jarFile, "dir1");
+ File dir1 = findFile(simpleJarFile, "dir1");
assertNull(dir1);
}
@@ -191,32 +188,36 @@
{
PackageBuildDelegate.instance().buildSinglePackage(explodedJar, nullMonitor);
- File explodedJarFolder = getPackageFile(explodedJar);
-
- assertTrue(explodedJarFolder.exists());
- assertTrue(explodedJarFolder.getDelegate().isDirectory());
+ assertTrue(explodedJarFile.exists());
+ assertTrue(explodedJarFile.getDelegate().isDirectory());
}
public void testSimpleJar_changeToExploded ()
{
simpleJar.setExploded(true);
((PackageNodeImpl)simpleJar).flagAsChanged();
- waitForAutoBuild();
- File simpleJarFile = getPackageFile(simpleJar);
assertTrue(simpleJarFile.getDelegate().isDirectory());
}
+ public void testSimpleJar_changeToCompressed ()
+ {
+ simpleJar.setExploded(false);
+ ((PackageNodeImpl)simpleJar).flagAsChanged();
+
+ assertTrue(simpleJarFile.getDelegate().isFile());
+ }
+
public void testBaseFile ()
{
IPath projectPath = project.getFullPath();
- IPath filePath = projectPath.append("simple.jar").append("test.xml");
+ IPath filePath = projectPath.append("ref.jar").append("lib").append("simple.jar").append("test.xml");
IPath basePath = PackagesCore.getBaseFile(filePath);
assertEquals (basePath.segmentCount(), 2);
assertEquals (basePath.segment(0), project.getName());
- assertEquals (basePath.segment(1), "simple.jar");
+ assertEquals (basePath.segment(1), "ref.jar");
filePath = projectPath.append("exploded.jar").append("test.xml");
basePath = PackagesCore.getBaseFile(filePath);
@@ -226,4 +227,22 @@
assertEquals (basePath.segment(1), "exploded.jar");
assertEquals (basePath.segment(2), "test.xml");
}
+
+ public void testOverlappingFilesets ()
+ {
+ IPackageFileSet overlap = PackagesCore.createPackageFileSet(project);
+ overlap.setSourceContainer(project);
+ overlap.setIncludesPattern("test.xml");
+ simpleJar.addChild(overlap);
+
+ simpleJarFileset.setIncludesPattern("**/nested.xml");
+ ((PackageNodeImpl)simpleJarFileset).flagAsChanged();
+
+ File testXML = findFile (simpleJarFile, "test.xml");
+ assertNotNull(testXML);
+ assertTrue(testXML.exists());
+
+ simpleJar.removeChild(simpleJarFileset);
+ assertTrue(testXML.exists());
+ }
}
1.3 +228 -222 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BuildTest.java 27 Feb 2007 18:48:57 -0000 1.2
+++ BuildTest.java 28 Feb 2007 16:38:12 -0000 1.3
@@ -23,6 +23,7 @@
import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
import org.jboss.ide.eclipse.packages.core.model.types.JARPackageType;
import org.jboss.ide.eclipse.packages.core.project.build.PackageBuildDelegate;
+import org.jboss.ide.eclipse.packages.core.project.build.TruezipUtil;
import de.schlichtherle.io.File;
import de.schlichtherle.io.FileInputStream;
@@ -40,6 +41,7 @@
protected IFile testXmlFile;
protected IPackageFileSet simpleJarFileset, explodedJarFileset;
protected IPackageFolder libFolder;
+ protected File simpleJarFile, explodedJarFile, refJarFile;
protected static boolean initialized = false;
@@ -123,6 +125,10 @@
explodedJar = (IPackage) packages.get(2);
explodedJarFileset = explodedJar.getFileSets()[0];
}
+
+ simpleJarFile = TruezipUtil.getPackageFile(simpleJar);
+ refJarFile = TruezipUtil.getPackageFile(refJar);
+ explodedJarFile = TruezipUtil.getPackageFile(explodedJar);
}
/**
More information about the jboss-cvs-commits
mailing list