[jbosstools-commits] JBoss Tools SVN: r36337 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch.

Author: rob.stryker(a)jboss.com Date: 2011-11-14 20:48:10 -0500 (Mon, 14 Nov 2011) New Revision: 36337 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/LaunchConfigTests.java Log: JBIDE-10175 - compile error in tests. feh. 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-11-15 00:04:21 UTC (rev 36336) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2011-11-15 01:48:10 UTC (rev 36337) @@ -10,24 +10,11 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.test.launch; -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; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7LaunchConfigProperties; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; /** @@ -44,21 +31,21 @@ public void testConfiguration() throws CoreException { ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createCustomConfigLocationLaunchConfig(mockServer); - - assertTrue(areProgramArgumentsSet(launchConfig)); - assertTrue(areVMArgumentsSet(launchConfig)); - assertTrue(isHostSet(launchConfig)); - assertTrue(isMainTypeSet(launchConfig)); - assertTrue(isWorkingDirectorySet(launchConfig)); - assertTrue(areEnvironmentVariablesSet(launchConfig)); - assertTrue(isClasspathSet(launchConfig)); - assertTrue(isClasspathProviderSet(launchConfig)); - assertTrue(isUseDefaultClasspathSet(launchConfig)); - assertTrue(isJreContainerSet(launchConfig)); - assertTrue(isConfigSet(launchConfig)); - assertTrue(isServerHomeSet(launchConfig)); - assertTrue(isEndorsedDirSet(launchConfig)); - assertTrue(isServerIdSet(launchConfig)); + JBossLaunchConfigProperties props = new JBossLaunchConfigProperties(); + assertTrue(props.areProgramArgumentsSet(launchConfig)); + assertTrue(props.areVMArgumentsSet(launchConfig)); + assertTrue(props.isHostSet(launchConfig)); + assertTrue(props.isMainTypeSet(launchConfig)); + assertTrue(props.isWorkingDirectorySet(launchConfig)); + assertTrue(props.areEnvironmentVariablesSet(launchConfig)); + assertTrue(props.isClasspathSet(launchConfig)); + assertTrue(props.isClasspathProviderSet(launchConfig)); + assertTrue(props.isUseDefaultClasspathSet(launchConfig)); + assertTrue(props.isJreContainerSet(launchConfig)); + assertTrue(props.isConfigSet(launchConfig)); + assertTrue(props.isServerHomeSet(launchConfig)); + assertTrue(props.isEndorsedDirSet(launchConfig)); + assertTrue(props.isServerIdSet(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-11-15 00:04:21 UTC (rev 36336) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2011-11-15 01:48:10 UTC (rev 36337) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.test.launch; -import static org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties.isServerHomeSet; - import java.util.List; import junit.framework.TestCase; @@ -23,6 +21,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.AbstractStartLaunchConfigurator; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator; +import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; /** @@ -117,17 +116,22 @@ protected String getDefaultVMArguments(IJBossServerRuntime runtime) { return null; } + + @Override + protected String getJavaLibraryPath(IJBossServerRuntime runtime) { + return null; + } }; public void testServerHomeIsNotSetIfNotCustomConfigLocation() throws CoreException { ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createNonCustomConfigLocationLaunchConfig(mockServer); - - assertFalse(isServerHomeSet(launchConfig)); + JBossLaunchConfigProperties props = new JBossLaunchConfigProperties(); + assertFalse(props.isServerHomeSet(launchConfig)); } public void testServerHomeIsSetIfCustomConfigLocation() throws CoreException { ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createCustomConfigLocationLaunchConfig(mockServer); - - assertTrue(isServerHomeSet(launchConfig)); + JBossLaunchConfigProperties props = new JBossLaunchConfigProperties(); + assertTrue(props.isServerHomeSet(launchConfig)); } }