[jboss-cvs] jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test ...
Marshall Culpepper
mculpepper at jboss.com
Wed Dec 20 14:56:43 EST 2006
User: mculpepper
Date: 06/12/20 14:56:43
Modified: core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test
AllTests.java PackagesEARTest.java
Log:
got rid of the working copies idea, and eliminated the model bridge as it was making things too complicated. package nodes now keep references to their parents and children, (just like delegates). there shouldn't be any need for synch as addChild/removeChild take care of all the details there. the way to create a package node that isn't attached to the model yet is:
pkg = PackagesCore.createDetachedPackage(project, true);
pkg.setXXX..
PackagesCore.attach(pkg, monitor);
Revision Changes Path
1.3 +1 -2 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AllTests.java 4 Dec 2006 22:21:28 -0000 1.2
+++ AllTests.java 20 Dec 2006 19:56:43 -0000 1.3
@@ -9,9 +9,8 @@
{
TestSuite suite = new TestSuite();
suite.addTest(new PackagesEARTest("testCorrectBinding"));
- suite.addTest(new PackagesEARTest("testModelBridge"));
+ suite.addTest(new PackagesEARTest("testModel"));
suite.addTest(new PackagesEARTest("testSave"));
- suite.addTest(new PackagesEARTest("testWorkingCopies"));
suite.addTest(new PackagesEARTest("testBuild"));
suite.addTest(new PackagesEARTest("testJARDefaultConfig"));
1.4 +23 -25 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PackagesEARTest.java 4 Dec 2006 22:21:28 -0000 1.3
+++ PackagesEARTest.java 20 Dec 2006 19:56:43 -0000 1.4
@@ -31,8 +31,6 @@
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;
@@ -41,7 +39,6 @@
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.IPackageWorkingCopy;
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.internal.xb.XMLBinding;
@@ -223,7 +220,7 @@
}
}
- public void testModelBridge ()
+ public void testModel ()
{
PackagesModel.instance().registerProject(testPackagesProject.getProject(), new NullProgressMonitor());
List packages = PackagesModel.instance().getProjectPackages(testPackagesProject.getProject());
@@ -235,7 +232,7 @@
assertEquals(earPackage.getProject(), testPackagesProject.getProject());
assertEquals(earPackage.getName(), "MyApp.ear");
assertEquals(earPackage.getNodeType(), IPackageNode.TYPE_PACKAGE);
- assertEquals(earPackage.getPackageType(), "j2ee.ear");
+// assertEquals(earPackage.getPackageType(), "j2ee.ear");
IPackageFolder earPackageFolders[] = earPackage.getFolders();
assertNotNull(earPackageFolders);
@@ -253,7 +250,7 @@
assertEquals(ejbJarPackage.getProject(), testPackagesProject.getProject());
assertEquals(ejbJarPackage.getName(), "MyEJBs.jar");
assertEquals(ejbJarPackage.getNodeType(), IPackageNode.TYPE_PACKAGE);
- assertEquals(ejbJarPackage.getPackageType(), "j2ee.ejbjar");
+// assertEquals(ejbJarPackage.getPackageType(), "j2ee.ejbjar");
IPackageFileSet ejbJarFilesets[] = ejbJarPackage.getFileSets();
IPackageFolder ejbJarFolders[] = ejbJarPackage.getFolders();
@@ -275,7 +272,7 @@
assertEquals(warPackage.getProject(), testPackagesProject.getProject());
assertEquals(warPackage.getName(), "MyApp.war");
assertEquals(warPackage.getNodeType(), IPackageNode.TYPE_PACKAGE);
- assertEquals(warPackage.getPackageType(), "j2ee.war");
+// assertEquals(warPackage.getPackageType(), "j2ee.war");
IPackageFolder[] warFolders = warPackage.getFolders();
assertNotNull(warFolders);
@@ -293,23 +290,6 @@
assertFileset(webInfFilesets[0], "descriptors", new String[] { "descriptors/web.xml","descriptors/jboss-web.xml"}, "*web.xml", null);
}
- public void testWorkingCopies ()
- {
- List packages = PackagesModel.instance().getProjectPackages(testPackagesProject.getProject());
- assertEquals(packages.size(), 1);
-
- IPackage pkg = (IPackage) packages.get(0);
- assertNotNull(pkg);
-
- IPackageWorkingCopy wc = pkg.createPackageWorkingCopy();
-
- wc.setName("MyApp2.ear");
- assertEquals(pkg.getName(), "MyApp.ear");
- wc.save();
- assertEquals(pkg.getName(), "MyApp2.ear");
-
- }
-
public void testSave()
{
StringWriter writer = new StringWriter();
@@ -332,7 +312,7 @@
IFile packageFile = pkg.getPackageFile();
assertTrue(packageFile.exists());
- assertEquals(packageFile.getName(), "MyApp2.ear");
+ assertEquals(packageFile.getName(), "MyApp.ear");
assertEquals(packageFile.getParent(), pkg.getDestinationContainer());
de.schlichtherle.io.File packageZipFile = new de.schlichtherle.io.File(packageFile.getRawLocation().toString());
@@ -388,4 +368,22 @@
assertTrue(jarFile.exists());
}
+
+ public void testDetachedNodes ()
+ {
+ NullProgressMonitor nullMonitor = new NullProgressMonitor();
+
+ IPackage detachedPackage = PackagesCore.createDetachedPackage(testPackagesProject.getProject(), true);
+
+ detachedPackage.setName("testPackagesProject.jar");
+ detachedPackage.setPackageType(PackagesCore.getPackageType(JARPackageType.TYPE_ID));
+
+ IPackageFileSet detachedFileset = PackagesCore.createDetachedPackageFileSet(testPackagesProject.getProject());
+ detachedPackage.addChild(detachedFileset);
+
+ IPackage[] packages = PackagesCore.getProjectPackages(testPackagesProject.getProject(), nullMonitor);
+ int index = Arrays.binarySearch(packages, detachedPackage);
+
+ assertTrue(index >= 0);
+ }
}
More information about the jboss-cvs-commits
mailing list