[53750] Allow custom launch configurations for proxy vms. Also moved beaninfo.ui into jem.ui and got rid of the plugin.
diff --git a/tests/org.eclipse.jem.tests/.project b/tests/org.eclipse.jem.tests/.project index 9763402..5e88ca7 100644 --- a/tests/org.eclipse.jem.tests/.project +++ b/tests/org.eclipse.jem.tests/.project
@@ -7,7 +7,6 @@ <project>org.eclipse.ant.core</project> <project>org.eclipse.core.boot</project> <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> <project>org.eclipse.core.runtime.compatibility</project> <project>org.eclipse.emf.ecore</project> <project>org.eclipse.jdt.core</project>
diff --git a/tests/org.eclipse.jem.tests/build.properties b/tests/org.eclipse.jem.tests/build.properties index 908dbb8..7b67e82 100644 --- a/tests/org.eclipse.jem.tests/build.properties +++ b/tests/org.eclipse.jem.tests/build.properties
@@ -13,3 +13,4 @@ javatests.jar source.vm/tests.jar = vm_tests/ source.javatests.jar = javatests/ +src.includes = proxy.jars
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java index c017960..48af22d 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java
@@ -11,17 +11,15 @@ *******************************************************************************/ /* * $RCSfile: ProxySuite.java,v $ - * $Revision: 1.3 $ $Date: 2004/02/03 23:18:13 $ + * $Revision: 1.4 $ $Date: 2004/03/04 16:13:39 $ */ -import java.util.List; +import junit.framework.TestSuite; import org.eclipse.core.runtime.CoreException; -import org.eclipse.jem.internal.proxy.core.*; -import org.eclipse.jem.internal.proxy.core.IConfigurationContributor; -import org.eclipse.jem.tests.JavaTestsPlugin; -import org.eclipse.jdt.launching.VMRunnerConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import junit.framework.TestSuite; +import org.eclipse.jem.internal.proxy.core.*; +import org.eclipse.jem.tests.JavaTestsPlugin; /** * @author richkulp @@ -81,11 +79,11 @@ */ public static IConfigurationContributor getProxySuiteContributor() { return new IConfigurationContributor() { - public void contributeClasspaths(List classpaths, IClasspathContributionController controller) throws CoreException { - controller.contributeClasspath(ProxyPlugin.getPlugin().localizeFromPlugin(JavaTestsPlugin.getPlugin(), "vm/tests.jar"), classpaths, 0); + public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException { + controller.contributeClasspath(JavaTestsPlugin.getPlugin(), "vm/tests.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, false); } - public void contributeToConfiguration(VMRunnerConfiguration config) { + public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) { } public void contributeToRegistry(ProxyFactoryRegistry registry) {
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java index d273882..d909219 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java
@@ -11,24 +11,18 @@ *******************************************************************************/ /* * $RCSfile: ASTParserSuite.java,v $ - * $Revision: 1.3 $ $Date: 2004/02/03 23:18:13 $ + * $Revision: 1.4 $ $Date: 2004/03/04 16:13:39 $ */ +import junit.extensions.TestSetup; +import junit.framework.*; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.*; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import junit.extensions.TestSetup; -import junit.framework.*; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.jem.internal.proxy.core.*; -import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry; -import org.eclipse.jem.internal.proxy.core.ProxyPlugin; import org.eclipse.jem.tests.JavaProjectUtil; import org.eclipse.jem.tests.JavaTestsPlugin; import org.eclipse.jem.tests.proxy.ProxySuite; @@ -102,7 +96,7 @@ // the remote proxy expression evaluation. We are really testing AST->ParseTree->BeanProxy. If any expression // type errors show up (i.e. the proxy expression itself is not working correctly). Then that should be fixed // and a junit test in the proxy suite should be created instead. - registry = ProxyPlugin.getPlugin().startImplementation( + registry = ProxyLaunchSupport.startImplementation( project, "JUnit Parse Tree Test", new IConfigurationContributor[] { ProxySuite.getProxySuiteContributor()},
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java index be53dcd..f9114a9 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java
@@ -10,7 +10,7 @@ *******************************************************************************/ /* * $RCSfile: ASTTreeInitStringParserTestHelper.java,v $ - * $Revision: 1.4 $ $Date: 2004/02/04 17:08:19 $ + * $Revision: 1.5 $ $Date: 2004/03/04 16:13:39 $ */ package org.eclipse.jem.tests.proxy.initParser.tree; @@ -66,7 +66,7 @@ */ public void testInitString(String aString, Object expectedResult, boolean throwsException, boolean equalsOnly) throws Throwable { String testClass = MessageFormat.format(TEMPLATE_CLASS, new Object[] {aString}); - CompilationUnit cu = project != null ? AST.parseCompilationUnit(testClass.toCharArray(), "TEMPLATE.java", project) : AST.parseCompilationUnit(testClass.toCharArray()); + CompilationUnit cu = project != null ? AST.parseCompilationUnit(testClass.toCharArray(), "TEMPLATE.java", project, null, null) : AST.parseCompilationUnit(testClass.toCharArray()); // This is the only method that is called from both init string and parse allocation. So we can be assume that // it is a straight init string. In that case we can go ahead and do regular proxy init string parsing to // get a proxy to pass into the parse testing. @@ -91,7 +91,7 @@ importLines.append(";\n"); } String testClass = MessageFormat.format(TEMPLATE_CLASS_IMPORTS, new Object[] {importLines, aString}); - CompilationUnit cu = project != null ? AST.parseCompilationUnit(testClass.toCharArray(), "TEMPLATE.java", project) : AST.parseCompilationUnit(testClass.toCharArray()); + CompilationUnit cu = project != null ? AST.parseCompilationUnit(testClass.toCharArray(), "TEMPLATE.java", project, null, null) : AST.parseCompilationUnit(testClass.toCharArray()); testInitString(aString, cu, expectedResult, throwsException, equalsOnly); }
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java index 1ad8250..57f21a5 100644 --- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java +++ b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: RemoteProxySuite.java,v $ - * $Revision: 1.2 $ $Date: 2003/10/27 17:32:36 $ + * $Revision: 1.3 $ $Date: 2004/03/04 16:13:39 $ */ import java.net.URL; @@ -48,7 +48,7 @@ public ProxyFactoryRegistry getRegistry() throws CoreException { if (registry == null) { registry = - ProxyPlugin.getPlugin().startImplementation( + ProxyLaunchSupport.startImplementation( project, "JUnit Remote Proxy Test", new IConfigurationContributor[] { ProxySuite.getProxySuiteContributor()},