Author: rob.stryker(a)jboss.com
Date: 2008-01-30 21:10:13 -0500 (Wed, 30 Jan 2008)
New Revision: 6045
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/JEEClasspathContainerTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/ProjectRuntimeTest.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/ProjectRuntimeTest.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
Log:
In progress / transition. lots of changes. more to follow
Deleted:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java 2008-01-31
02:09:20 UTC (rev 6044)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java 2008-01-31
02:10:13 UTC (rev 6045)
@@ -1,107 +0,0 @@
-package org.jboss.ide.eclipse.as.classpath.test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.tools.common.test.util.TestProjectProvider;
-
-public class JEEClasspathContainerTest extends TestCase {
-
- private static final int ORIGINAL_ENTRIES = 3;
-
- private TestProjectProvider provider;
- private IProject project;
-
- protected void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null,
"basicwebproject", true);
- project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- }
-
-
- public void testJEE13ClasspathContainer() {
- testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3",
7);
- }
-
- public void testJEE14ClasspathContainer() {
- testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4",
8);
- }
-
- public void testJEE50ClasspathContainer() {
- testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.javaee-5.0",
1);
- }
-
-
- protected void testGenericClasspathContainer(String containerPath, int expectedEntries)
{
- try {
- IJavaProject jproject = JavaCore.create(project);
- IPath path = new Path(containerPath);
- verifyContainerEntries(path, jproject, expectedEntries);
- verifyRawClasspathCount(jproject, ORIGINAL_ENTRIES);
- verifyNotIncludedEntry(jproject, path);
- int beforeRawCount = jproject.getRawClasspath().length;
- int beforeResolvedCount = jproject.getResolvedClasspath(true).length;
- addContainer(jproject, path);
- assertEquals(beforeRawCount+1, jproject.getRawClasspath().length);
- assertEquals(beforeResolvedCount+expectedEntries,
jproject.getResolvedClasspath(true).length);
- beforeRawCount = jproject.getRawClasspath().length;
- beforeResolvedCount = jproject.getResolvedClasspath(true).length;
- removeContainer(jproject, path);
- assertEquals(beforeRawCount-1, jproject.getRawClasspath().length);
- assertEquals(beforeResolvedCount-expectedEntries,
jproject.getResolvedClasspath(true).length);
-
- } catch( JavaModelException jme ) {
- fail("Exception: " + jme.getMessage());
- } catch( CoreException ce ) {
- fail("Exception: " + ce.getMessage());
- }
-
- }
-
- protected void verifyContainerEntries(IPath path, IJavaProject jproject, int expected)
throws JavaModelException {
- IClasspathContainer cpc = JavaCore.getClasspathContainer(path, jproject);
- IClasspathEntry[] entries = cpc.getClasspathEntries();
- assertEquals("Received unexpected number of entries", expected,
entries.length );
- }
-
- protected void verifyRawClasspathCount(IJavaProject jproject, int count) throws
JavaModelException {
- IClasspathEntry[] projectEntry = jproject.getRawClasspath();
- assertEquals("Project should start with only 3 classpath entries", count,
projectEntry.length);
- }
-
- protected void verifyNotIncludedEntry(IJavaProject jproject, IPath path) throws
JavaModelException {
- IClasspathEntry[] projectEntry = jproject.getRawClasspath();
- for( int i = 0; i < projectEntry.length; i++ ) {
- if( projectEntry[i].getPath().toOSString().startsWith(path.toOSString())) {
- assertFalse("Project prematurely includes classpath", true);
- }
- }
- }
-
- protected void addContainer(IJavaProject jproject, IPath path) throws JavaModelException
{
- ArrayList tmp = new ArrayList();
- tmp.addAll(Arrays.asList(jproject.getRawClasspath()));
- tmp.add(JavaCore.newContainerEntry(path));
- jproject.setRawClasspath((IClasspathEntry[]) tmp.toArray(new
IClasspathEntry[tmp.size()]), null);
- }
-
- protected void removeContainer(IJavaProject jproject, IPath path) throws
JavaModelException {
- ArrayList tmp = new ArrayList();
- tmp.addAll(Arrays.asList(jproject.getRawClasspath()));
- tmp.remove(JavaCore.newContainerEntry(path));
- jproject.setRawClasspath((IClasspathEntry[]) tmp.toArray(new
IClasspathEntry[tmp.size()]), null);
- }
-}
Deleted:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/ProjectRuntimeTest.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/ProjectRuntimeTest.java 2008-01-31
02:09:20 UTC (rev 6044)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/ProjectRuntimeTest.java 2008-01-31
02:10:13 UTC (rev 6045)
@@ -1,91 +0,0 @@
-package org.jboss.ide.eclipse.as.classpath.test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.server.core.IRuntime;
-import org.jboss.ide.eclipse.as.test.ASTest;
-import org.jboss.ide.eclipse.as.test.util.ProjectRuntimeUtil;
-import org.jboss.tools.common.test.util.TestProjectProvider;
-
-public class ProjectRuntimeTest extends TestCase {
- private TestProjectProvider provider;
- private IProject project;
-
- protected void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null,
"basicwebproject", true);
- project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- }
-
- protected void tearDown() throws Exception {
- provider.dispose();
- }
-
- public void testProjectRuntime() {
- try {
- IJavaProject jp = JavaCore.create(project);
- verifyInitialClasspathEntries(jp);
-
- // lets try a runtime
- IRuntime createdRuntime = ProjectRuntimeUtil.createRuntime("runtime1",
ASTest.JBOSS_RUNTIME_42, ASTest.JBOSS_AS_HOME);
- ProjectRuntimeUtil.setTargetRuntime(createdRuntime, project);
- verifyPostRuntimeCPE(jp);
-
- ProjectRuntimeUtil.clearRuntime(project);
- verifyInitialClasspathEntries(jp);
-
- } catch( JavaModelException jme ) {
- jme.printStackTrace();
- fail(jme.getMessage());
- } catch( CoreException ce ) {
- ce.printStackTrace();
- fail(ce.getMessage());
- }
- }
-
- protected void verifyPostRuntimeCPE(IJavaProject jp) throws CoreException {
- IClasspathEntry[] entries = jp.getRawClasspath();
- assertEquals(3, entries.length);
- String[] acceptable = new String[] {
"org.eclipse.jst.server.core.container",
- "basicwebproject", "org.eclipse.jst.j2ee.internal.web.container"
};
- verifyClasspathEntries(entries, acceptable);
- }
-
- protected void verifyInitialClasspathEntries(IJavaProject jp) throws CoreException {
- IClasspathEntry[] entries = jp.getRawClasspath();
- assertEquals(2, entries.length);
-
- String[] acceptable = new String[] {
"org.eclipse.jst.j2ee.internal.web.container",
- "basicwebproject"};
- verifyClasspathEntries(entries, acceptable);
- }
-
- protected void verifyClasspathEntries(IClasspathEntry[] entries, String[]
acceptablePrefixes) {
- ArrayList list = new ArrayList(Arrays.asList(acceptablePrefixes));
- for( int i = 0; i < entries.length; i++ ) {
- if( list.contains(entries[i].getPath().segment(0)))
- list.remove(entries[i].getPath().segment(0));
- else
- fail("classpath contains unexpected entry: " + entries[i].getPath());
- }
-
- if( list.size() > 0 ) {
- String tmp = "Expected enties not found: ";
- for( int i = 0; i < list.size(); i++ ) {
- tmp += list.get(i) + ", ";
- }
- fail(tmp.substring(0, tmp.length() - 2));
- }
- }
-}
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2008-01-31
02:09:20 UTC (rev 6044)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2008-01-31
02:10:13 UTC (rev 6045)
@@ -1,7 +1,7 @@
package org.jboss.ide.eclipse.as.test;
-import org.jboss.ide.eclipse.as.classpath.test.ProjectRuntimeTest;
-import org.jboss.ide.eclipse.as.classpath.test.JEEClasspathContainerTest;
+import org.jboss.ide.eclipse.as.test.model.JEEClasspathContainerTest;
+import org.jboss.ide.eclipse.as.test.model.ProjectRuntimeTest;
import org.jboss.ide.eclipse.as.test.model.RuntimeServerModelTest;
import junit.framework.Test;
Copied:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/JEEClasspathContainerTest.java
(from rev 5678,
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/JEEClasspathContainerTest.java)
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/JEEClasspathContainerTest.java
(rev 0)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/JEEClasspathContainerTest.java 2008-01-31
02:10:13 UTC (rev 6045)
@@ -0,0 +1,107 @@
+package org.jboss.ide.eclipse.as.test.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JEEClasspathContainerTest extends TestCase {
+
+ private static final int ORIGINAL_ENTRIES = 3;
+
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null,
"basicwebproject", true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+
+ public void testJEE13ClasspathContainer() {
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3",
7);
+ }
+
+ public void testJEE14ClasspathContainer() {
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4",
8);
+ }
+
+ public void testJEE50ClasspathContainer() {
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.javaee-5.0",
1);
+ }
+
+
+ protected void testGenericClasspathContainer(String containerPath, int expectedEntries)
{
+ try {
+ IJavaProject jproject = JavaCore.create(project);
+ IPath path = new Path(containerPath);
+ verifyContainerEntries(path, jproject, expectedEntries);
+ verifyRawClasspathCount(jproject, ORIGINAL_ENTRIES);
+ verifyNotIncludedEntry(jproject, path);
+ int beforeRawCount = jproject.getRawClasspath().length;
+ int beforeResolvedCount = jproject.getResolvedClasspath(true).length;
+ addContainer(jproject, path);
+ assertEquals(beforeRawCount+1, jproject.getRawClasspath().length);
+ assertEquals(beforeResolvedCount+expectedEntries,
jproject.getResolvedClasspath(true).length);
+ beforeRawCount = jproject.getRawClasspath().length;
+ beforeResolvedCount = jproject.getResolvedClasspath(true).length;
+ removeContainer(jproject, path);
+ assertEquals(beforeRawCount-1, jproject.getRawClasspath().length);
+ assertEquals(beforeResolvedCount-expectedEntries,
jproject.getResolvedClasspath(true).length);
+
+ } catch( JavaModelException jme ) {
+ fail("Exception: " + jme.getMessage());
+ } catch( CoreException ce ) {
+ fail("Exception: " + ce.getMessage());
+ }
+
+ }
+
+ protected void verifyContainerEntries(IPath path, IJavaProject jproject, int expected)
throws JavaModelException {
+ IClasspathContainer cpc = JavaCore.getClasspathContainer(path, jproject);
+ IClasspathEntry[] entries = cpc.getClasspathEntries();
+ assertEquals("Received unexpected number of entries", expected,
entries.length );
+ }
+
+ protected void verifyRawClasspathCount(IJavaProject jproject, int count) throws
JavaModelException {
+ IClasspathEntry[] projectEntry = jproject.getRawClasspath();
+ assertEquals("Project should start with only 3 classpath entries", count,
projectEntry.length);
+ }
+
+ protected void verifyNotIncludedEntry(IJavaProject jproject, IPath path) throws
JavaModelException {
+ IClasspathEntry[] projectEntry = jproject.getRawClasspath();
+ for( int i = 0; i < projectEntry.length; i++ ) {
+ if( projectEntry[i].getPath().toOSString().startsWith(path.toOSString())) {
+ assertFalse("Project prematurely includes classpath", true);
+ }
+ }
+ }
+
+ protected void addContainer(IJavaProject jproject, IPath path) throws JavaModelException
{
+ ArrayList tmp = new ArrayList();
+ tmp.addAll(Arrays.asList(jproject.getRawClasspath()));
+ tmp.add(JavaCore.newContainerEntry(path));
+ jproject.setRawClasspath((IClasspathEntry[]) tmp.toArray(new
IClasspathEntry[tmp.size()]), null);
+ }
+
+ protected void removeContainer(IJavaProject jproject, IPath path) throws
JavaModelException {
+ ArrayList tmp = new ArrayList();
+ tmp.addAll(Arrays.asList(jproject.getRawClasspath()));
+ tmp.remove(JavaCore.newContainerEntry(path));
+ jproject.setRawClasspath((IClasspathEntry[]) tmp.toArray(new
IClasspathEntry[tmp.size()]), null);
+ }
+}
Copied:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/ProjectRuntimeTest.java
(from rev 6044,
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/classpath/test/ProjectRuntimeTest.java)
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/ProjectRuntimeTest.java
(rev 0)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/model/ProjectRuntimeTest.java 2008-01-31
02:10:13 UTC (rev 6045)
@@ -0,0 +1,91 @@
+package org.jboss.ide.eclipse.as.test.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.wst.server.core.IRuntime;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.jboss.ide.eclipse.as.test.util.ProjectRuntimeUtil;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class ProjectRuntimeTest extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.ide.eclipse.as.test", null,
"basicwebproject", true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testProjectRuntime() {
+ try {
+ IJavaProject jp = JavaCore.create(project);
+ verifyInitialClasspathEntries(jp);
+
+ // lets try a runtime
+ IRuntime createdRuntime = ProjectRuntimeUtil.createRuntime("runtime1",
ASTest.JBOSS_RUNTIME_42, ASTest.JBOSS_AS_HOME);
+ ProjectRuntimeUtil.setTargetRuntime(createdRuntime, project);
+ verifyPostRuntimeCPE(jp);
+
+ ProjectRuntimeUtil.clearRuntime(project);
+ verifyInitialClasspathEntries(jp);
+
+ } catch( JavaModelException jme ) {
+ jme.printStackTrace();
+ fail(jme.getMessage());
+ } catch( CoreException ce ) {
+ ce.printStackTrace();
+ fail(ce.getMessage());
+ }
+ }
+
+ protected void verifyPostRuntimeCPE(IJavaProject jp) throws CoreException {
+ IClasspathEntry[] entries = jp.getRawClasspath();
+ assertEquals(3, entries.length);
+ String[] acceptable = new String[] {
"org.eclipse.jst.server.core.container",
+ "basicwebproject", "org.eclipse.jst.j2ee.internal.web.container"
};
+ verifyClasspathEntries(entries, acceptable);
+ }
+
+ protected void verifyInitialClasspathEntries(IJavaProject jp) throws CoreException {
+ IClasspathEntry[] entries = jp.getRawClasspath();
+ assertEquals(2, entries.length);
+
+ String[] acceptable = new String[] {
"org.eclipse.jst.j2ee.internal.web.container",
+ "basicwebproject"};
+ verifyClasspathEntries(entries, acceptable);
+ }
+
+ protected void verifyClasspathEntries(IClasspathEntry[] entries, String[]
acceptablePrefixes) {
+ ArrayList list = new ArrayList(Arrays.asList(acceptablePrefixes));
+ for( int i = 0; i < entries.length; i++ ) {
+ if( list.contains(entries[i].getPath().segment(0)))
+ list.remove(entries[i].getPath().segment(0));
+ else
+ fail("classpath contains unexpected entry: " + entries[i].getPath());
+ }
+
+ if( list.size() > 0 ) {
+ String tmp = "Expected enties not found: ";
+ for( int i = 0; i < list.size(); i++ ) {
+ tmp += list.get(i) + ", ";
+ }
+ fail(tmp.substring(0, tmp.length() - 2));
+ }
+ }
+}