[jboss-cvs] jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test ...
Marshall Culpepper
mculpepper at jboss.com
Fri Feb 23 09:42:13 EST 2007
User: mculpepper
Date: 07/02/23 09:42:13
Modified: core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test
NewProjectTest.java PackagesBuildTest.java
AllTests.java PackagesEARTest.java
Log:
re-organized tests into test suites, and added 2 new build tests for exploded packages
Revision Changes Path
1.3 +11 -6 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewProjectTest.java 4 Dec 2006 22:21:28 -0000 1.2
+++ NewProjectTest.java 23 Feb 2007 14:42:13 -0000 1.3
@@ -6,25 +6,21 @@
import java.io.IOException;
import java.util.List;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
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 {
@@ -35,6 +31,15 @@
super(name);
}
+ public static Test suite ()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new NewProjectTest("testXbConsistency"));
+ suite.addTest(new NewProjectTest("testEclipseModelConsistency"));
+
+ return suite;
+ }
+
public void setUp () throws Exception
{
newProject = JavaProjectHelper.createJavaProject("newProject", new String[] { "src" }, "/bin");
1.4 +55 -2 jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/PackagesBuildTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackagesBuildTest.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/tests/org.jboss.ide.eclipse.packages.test/src/org/jboss/ide/eclipse/packages/test/PackagesBuildTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PackagesBuildTest.java 21 Feb 2007 19:38:33 -0000 1.3
+++ PackagesBuildTest.java 23 Feb 2007 14:42:13 -0000 1.4
@@ -5,7 +5,9 @@
import java.io.IOException;
import java.util.List;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -40,9 +42,9 @@
private PackageBuildDelegate buildDelegate;
private NullProgressMonitor nullMonitor = new NullProgressMonitor();
- private IPackage simpleJar, refJar;
+ private IPackage simpleJar, refJar, explodedJar;
private IFile testXmlFile;
- private IPackageFileSet simpleJarFileset;
+ private IPackageFileSet simpleJarFileset, explodedJarFileset;
private IPackageFolder libFolder;
private static boolean initialized = false;
@@ -52,6 +54,20 @@
super(testName);
}
+ public static Test suite ()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new PackagesBuildTest("testSimpleJar_buildWithAPI"));
+ suite.addTest(new PackagesBuildTest("testSimpleJar_changeFile"));
+ suite.addTest(new PackagesBuildTest("testSimpleJar_addFile"));
+ suite.addTest(new PackagesBuildTest("testSimpleJar_removeFile"));
+ suite.addTest(new PackagesBuildTest("testSimpleJar_changeFilesetPattern_addFile"));
+ suite.addTest(new PackagesBuildTest("testSimpleJar_changeFilesetPattern_removeFile"));
+ suite.addTest(new PackagesBuildTest("testExplodedJar"));
+ suite.addTest(new PackagesBuildTest("testSimpleJar_changeToExploded"));
+ return suite;
+ }
+
protected void setUp() throws Exception {
if (!initialized)
{
@@ -89,6 +105,20 @@
PackagesModel.instance().attach(refJar, nullMonitor);
+ explodedJar = PackagesCore.createDetachedPackage(project, true);
+ explodedJar.setName("exploded.jar");
+ explodedJar.setExploded(true);
+ explodedJar.setPackageType(PackagesCore.getPackageType(JARPackageType.TYPE_ID));
+ explodedJar.setDestinationContainer(project);
+
+ explodedJarFileset = PackagesCore.createDetachedPackageFileSet(project);
+ explodedJarFileset.setIncludesPattern("*.xml");
+ explodedJarFileset.setSourceProject(project);
+
+ explodedJar.addChild(explodedJarFileset);
+
+ PackagesModel.instance().attach(explodedJar, nullMonitor);
+
initialized = true;
} else{
@@ -104,6 +134,9 @@
refJar = (IPackage) packages.get(1);
libFolder = refJar.getFolders()[0];
+
+ explodedJar = (IPackage) packages.get(2);
+ explodedJarFileset = explodedJar.getFileSets()[0];
}
}
@@ -348,4 +381,24 @@
File dir1 = findFile(jarFile, "dir1");
assertNull(dir1);
}
+
+ public void testExplodedJar ()
+ {
+ PackageBuildDelegate.instance().buildSinglePackage(explodedJar, nullMonitor);
+
+ File explodedJarFolder = getPackageFile(explodedJar);
+
+ assertTrue(explodedJarFolder.exists());
+ assertTrue(explodedJarFolder.getDelegate().isDirectory());
+ }
+
+ public void testSimpleJar_changeToExploded ()
+ {
+ simpleJar.setExploded(true);
+ ((PackageNodeImpl)simpleJar).flagAsChanged();
+ waitForBuilder();
+
+ File simpleJarFile = getPackageFile(simpleJar);
+ assertTrue(simpleJarFile.getDelegate().isDirectory());
+ }
}
1.7 +3 -17 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AllTests.java 21 Feb 2007 19:37:43 -0000 1.6
+++ AllTests.java 23 Feb 2007 14:42:13 -0000 1.7
@@ -8,24 +8,10 @@
public static Test suite()
{
TestSuite suite = new TestSuite();
- suite.addTest(new PackagesEARTest("testCorrectBinding"));
- suite.addTest(new PackagesEARTest("testModel"));
- suite.addTest(new PackagesEARTest("testSave"));
- suite.addTest(new PackagesEARTest("testBuild"));
- suite.addTest(new PackagesEARTest("testJARDefaultConfig"));
- suite.addTest(new PackagesEARTest("testPathAppend"));
- suite.addTest(new PackagesEARTest("testPackageReference"));
- suite.addTest(new PackagesEARTest("testProperties"));
+ suite.addTestSuite(PackagesEARTest.class);
+ suite.addTestSuite(NewProjectTest.class);
+ suite.addTestSuite(PackagesBuildTest.class);
- suite.addTest(new NewProjectTest("testXbConsistency"));
- suite.addTest(new NewProjectTest("testEclipseModelConsistency"));
-
- suite.addTest(new PackagesBuildTest("testSimpleJar_buildWithAPI"));
- suite.addTest(new PackagesBuildTest("testSimpleJar_changeFile"));
- suite.addTest(new PackagesBuildTest("testSimpleJar_addFile"));
- suite.addTest(new PackagesBuildTest("testSimpleJar_removeFile"));
- suite.addTest(new PackagesBuildTest("testSimpleJar_changeFilesetPattern_addFile"));
- suite.addTest(new PackagesBuildTest("testSimpleJar_changeFilesetPattern_removeFile"));
return suite;
}
}
1.8 +16 -18 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PackagesEARTest.java 21 Feb 2007 19:39:06 -0000 1.7
+++ PackagesEARTest.java 23 Feb 2007 14:42:13 -0000 1.8
@@ -26,7 +26,9 @@
import java.util.List;
import java.util.Properties;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -68,6 +70,20 @@
super(testName);
}
+ public static Test suite ()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new PackagesEARTest("testCorrectBinding"));
+ suite.addTest(new PackagesEARTest("testModel"));
+ suite.addTest(new PackagesEARTest("testSave"));
+ suite.addTest(new PackagesEARTest("testBuild"));
+ suite.addTest(new PackagesEARTest("testJARDefaultConfig"));
+ suite.addTest(new PackagesEARTest("testPathAppend"));
+ suite.addTest(new PackagesEARTest("testPackageReference"));
+ suite.addTest(new PackagesEARTest("testProperties"));
+ return suite;
+ }
+
protected void setUp() throws Exception {
if (!initialized)
{
@@ -395,24 +411,6 @@
}
- 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);
- }
-
public void testPathAppend ()
{
String sPath = "Project1/filesystem/C:/Users/Marshall/.vimrc";
More information about the jboss-cvs-commits
mailing list