[jboss-cvs] jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test ...
Marshall Culpepper
mculpepper at jboss.com
Mon Dec 4 17:21:28 EST 2006
User: mculpepper
Date: 06/12/04 17:21:28
Modified: core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test
NewProjectTest.java AllTests.java
PackagesEARTest.java
Log:
moved the testJARDefaultConfig unit test to the PackagesEARTest where there are some actual java files that are compiled into classes so we can test the jar package type
Revision Changes Path
1.2 +7 -0 jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/NewProjectTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewProjectTest.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/NewProjectTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewProjectTest.java 6 Nov 2006 21:38:13 -0000 1.1
+++ NewProjectTest.java 4 Dec 2006 22:21:28 -0000 1.2
@@ -10,15 +10,21 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.jboss.ide.eclipse.core.test.util.JavaProjectHelper;
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.PackagesCore;
+import org.jboss.ide.eclipse.packages.core.model.internal.PackageBuildDelegate;
import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XMLBinding;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackages;
+import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
+import org.jboss.ide.eclipse.packages.core.model.types.JARPackageType;
public class NewProjectTest extends TestCase {
@@ -93,4 +99,5 @@
IPackage pkg = (IPackage) packages.get(0);
assertEquals(pkg.getName(), "test.jar");
}
+
}
1.2 +1 -1 jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/AllTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AllTests.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/AllTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AllTests.java 6 Nov 2006 21:38:13 -0000 1.1
+++ AllTests.java 4 Dec 2006 22:21:28 -0000 1.2
@@ -13,10 +13,10 @@
suite.addTest(new PackagesEARTest("testSave"));
suite.addTest(new PackagesEARTest("testWorkingCopies"));
suite.addTest(new PackagesEARTest("testBuild"));
+ suite.addTest(new PackagesEARTest("testJARDefaultConfig"));
suite.addTest(new NewProjectTest("testXbConsistency"));
suite.addTest(new NewProjectTest("testEclipseModelConsistency"));
-
return suite;
}
}
1.3 +60 -1 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PackagesEARTest.java 8 Nov 2006 19:54:42 -0000 1.2
+++ PackagesEARTest.java 4 Dec 2006 22:21:28 -0000 1.3
@@ -31,6 +31,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.jboss.ide.eclipse.core.test.util.JavaProjectHelper;
@@ -38,7 +40,6 @@
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.IPackageFolderWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
import org.jboss.ide.eclipse.packages.core.model.IPackageWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
@@ -48,6 +49,8 @@
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbFolder;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackages;
+import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
+import org.jboss.ide.eclipse.packages.core.model.types.JARPackageType;
public class PackagesEARTest extends TestCase {
@@ -122,6 +125,7 @@
assertNull(ejbJar.getRef(), null);
assertNull(ejbJar.getToDir());
assertEquals(metaInfFiles.getFile(), "descriptors/application.xml");
+ assertTrue(metaInfFiles.isInWorkspace());
assertEquals(ejbJar.getFileSets().size(), 1);
assertEquals(ejbJar.getFolders().size(), 1);
@@ -328,5 +332,60 @@
IFile packageFile = pkg.getPackageFile();
assertTrue(packageFile.exists());
+ assertEquals(packageFile.getName(), "MyApp2.ear");
+ assertEquals(packageFile.getParent(), pkg.getDestinationContainer());
+
+ de.schlichtherle.io.File packageZipFile = new de.schlichtherle.io.File(packageFile.getRawLocation().toString());
+ assertTrue(packageZipFile.exists());
+
+ File[] children = packageZipFile.listFiles();
+ assertEquals(children.length, 2);
+
+ File packagesFolder = children[0];
+ File metaInfFolder = children[1];
+
+ assertEquals(metaInfFolder.getName(), "META-INF");
+ assertEquals(packagesFolder.getName(), "packages");
+
+ children = metaInfFolder.listFiles();
+ assertEquals(children.length, 1);
+
+ File applicationXml = children[0];
+ assertEquals(applicationXml.getName(), "application.xml");
+
+ children = packagesFolder.listFiles();
+ assertEquals(children.length, 2);
+
+ }
+
+ public void testJARDefaultConfig ()
+ {
+ NullProgressMonitor nullMonitor = new NullProgressMonitor();
+ IPackageType jarPackageType = PackagesCore.getPackageType(JARPackageType.TYPE_ID);
+
+ assertTrue(jarPackageType instanceof JARPackageType);
+
+ IPackage jar = jarPackageType.createDefaultConfiguration(testPackagesProject.getProject(), nullMonitor);
+
+ assertEquals(jar.getName(), "testPackagesProject.jar");
+ assertEquals(jar.getPackageType(), jarPackageType);
+ IPackageFileSet filesets[] = jar.getFileSets();
+
+ assertEquals(filesets.length, 1);
+ IPackageFileSet classes = filesets[0];
+
+ assertEquals(classes.getIncludesPattern(), "**/*");
+
+// try {
+// testPackagesProject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, nullMonitor);
+// } catch (CoreException e) {
+// fail(e.getMessage());
+// }
+
+ PackagesCore.buildPackage(jar, nullMonitor);
+
+ IFile jarFile = jar.getPackageFile();
+ assertTrue(jarFile.exists());
+
}
}
More information about the jboss-cvs-commits
mailing list