Author: adietish Date: 2011-07-04 16:37:22 -0400 (Mon, 04 Jul 2011) New Revision: 32594 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/.project trunk/as/tests/org.jboss.ide.eclipse.as.test/.settings/ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java Log: [JBIDE-9215] adapted tests to api changes Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/.project =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/.project 2011-07-04 20:32:42 UTC (rev 32593) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/.project 2011-07-04 20:37:22 UTC (rev 32594) @@ -25,8 +25,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/.settings ___________________________________________________________________ Added: svn:ignore + org.eclipse.m2e.core.prefs Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2011-07-04 20:32:42 UTC (rev 32593) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2011-07-04 20:37:22 UTC (rev 32594) @@ -10,20 +10,20 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.test.launch; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.areEnvironmentVariablesSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.areProgramArgumentsSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.areVMArgumentsSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isClasspathProviderSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isClasspathSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isConfigSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isDefaultClasspathSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isEndorsedDirSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isHostSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isJreContainerSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isMainTypeSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isServerHomeSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isServerIdSet; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isWorkingDirectorySet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.areEnvironmentVariablesSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.areProgramArgumentsSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.areVMArgumentsSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isClasspathProviderSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isClasspathSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isConfigSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isUseDefaultClasspathSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isEndorsedDirSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isHostSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isJreContainerSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isMainTypeSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerHomeSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerIdSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isWorkingDirectorySet; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; @@ -53,7 +53,7 @@ assertTrue(areEnvironmentVariablesSet(launchConfig)); assertTrue(isClasspathSet(launchConfig)); assertTrue(isClasspathProviderSet(launchConfig)); - assertTrue(isDefaultClasspathSet(launchConfig)); + assertTrue(isUseDefaultClasspathSet(launchConfig)); assertTrue(isJreContainerSet(launchConfig)); assertTrue(isConfigSet(launchConfig)); assertTrue(isServerHomeSet(launchConfig)); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java 2011-07-04 20:32:42 UTC (rev 32593) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigConfiguratorFactory.java 2011-07-04 20:37:22 UTC (rev 32594) @@ -14,7 +14,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossStartupConfigurator; +import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartupConfigurator; /** * @author André Dietisheim @@ -23,7 +23,7 @@ public static ILaunchConfigurationWorkingCopy createCustomConfigLocationLaunchConfig(IServer mockServer) throws CoreException { MockLaunchConfigWorkingCopy launchConfig = new MockLaunchConfigWorkingCopy(); - JBossStartupConfigurator configurator = new JBossStartupConfigurator(mockServer) { + LocalJBossStartupConfigurator configurator = new LocalJBossStartupConfigurator(mockServer) { @Override protected boolean isCustomConfigLocation(IJBossServerRuntime runtime) { return false; @@ -35,7 +35,7 @@ public static MockLaunchConfigWorkingCopy createNonCustomConfigLocationLaunchConfig(IServer server) throws CoreException { MockLaunchConfigWorkingCopy launchConfig = new MockLaunchConfigWorkingCopy(); - new JBossStartupConfigurator(server).configure(launchConfig); + new LocalJBossStartupConfigurator(server).configure(launchConfig); return launchConfig; } } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-07-04 20:32:42 UTC (rev 32593) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-07-04 20:37:22 UTC (rev 32594) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.test.launch; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.JBossRuntimeLaunchConfigUtils.isServerHomeSet; +import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerHomeSet; import java.util.List; @@ -21,8 +21,8 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractStartupConfigurator; -import org.jboss.ide.eclipse.as.core.server.internal.launch.ILaunchConfigConfigurator; +import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.AbstractStartupConfigurator; +import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; /** @@ -46,7 +46,7 @@ ILaunchConfigConfigurator mockConfigurator = new MockConfigurator(mockServer) { @Override - protected void doConfigure(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException { + protected void doConfigure(ILaunchConfigurationWorkingCopy launchConfig, JBossServer jbossServer, IJBossServerRuntime jbossRuntime) throws CoreException { /** * should only be called once */