From 98b03a31b01b7fe12957ef238bdf0021198de2ff Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 19 May 2024 11:23:00 +0200 Subject: [PATCH] Enable most LocalTargetDefinitionTests in verification builds Don't disable LocalTargetDefinitionTests by default in verification builds, only disable those that fail. Some of the disabled tests should probably work even in verification builds and IDE JUnit Plugin tests, but that is left for later. And fix LocalTargetDefinitionTests.testDeleteCleansCaches() test-case that is current failing in I-builds. --- .../target/LocalTargetDefinitionTests.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java index 8e461f8748..4ecf2595b4 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java @@ -57,7 +57,6 @@ import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper; import org.eclipse.pde.ui.tests.PDETestCase; import org.eclipse.pde.ui.tests.PDETestsPlugin; -import org.junit.BeforeClass; import org.junit.Test; import org.osgi.framework.ServiceReference; @@ -71,11 +70,6 @@ */ public class LocalTargetDefinitionTests extends AbstractTargetTest { - @BeforeClass - public static void requireStandaloneEclipseSDKEnvironment() { - PDETestCase.assumeRunningInStandaloneEclipseSDK(); - } - public static final NameVersionDescriptor MULTI_VERSION_LOW_DESCRIPTION = new NameVersionDescriptor( "a.typical.bundle", "1.0.0.200907071058"); public static final NameVersionDescriptor MULTI_VERSION_HIGH_DESCRIPTION = new NameVersionDescriptor( @@ -153,6 +147,7 @@ public void testResetTargetPlatform() throws Exception { */ @Test public void testDefaultTargetPlatform() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); // the new way ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService().newProfileLocation(TargetPlatform.getDefaultLocation(), null); @@ -197,6 +192,7 @@ public void testRestrictedDefaultTargetPlatform() throws Exception { */ @Test public void testVersionRestrictedDefaultTargetPlatform() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService().newProfileLocation(TargetPlatform.getDefaultLocation(), null); definition.setTargetLocations(new ITargetLocation[] { container }); @@ -243,6 +239,7 @@ public void testVersionRestrictedDefaultTargetPlatform() throws Exception { */ @Test public void testMissingVersionRestrictedDefaultTargetPlatform() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService().newProfileLocation(TargetPlatform.getDefaultLocation(), null); NameVersionDescriptor[] restrictions = new NameVersionDescriptor[] { @@ -269,6 +266,7 @@ public void testMissingVersionRestrictedDefaultTargetPlatform() throws Exception */ @Test public void testEclipseHomeTargetPlatform() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); // the new way ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService().newProfileLocation("${eclipse_home}", null); @@ -291,6 +289,7 @@ public void testEclipseHomeTargetPlatform() throws Exception { */ @Test public void testEclipseHomeTargetPlatformAndConfigurationArea() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); // the new way ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService().newProfileLocation("${eclipse_home}", @@ -312,6 +311,7 @@ public void testEclipseHomeTargetPlatformAndConfigurationArea() throws Exception */ @Test public void testDirectoryBundleContainer() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService() .newDirectoryLocation(TargetPlatform.getDefaultLocation() + "/plugins"); @@ -327,6 +327,7 @@ public void testDirectoryBundleContainer() throws Exception { */ @Test public void testVariableDirectoryBundleContainer() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); ITargetDefinition definition = getNewTarget(); ITargetLocation container = getTargetService().newDirectoryLocation("${eclipse_home}/plugins"); definition.setTargetLocations(new ITargetLocation[] { container }); @@ -681,6 +682,7 @@ public void testArgumentsPluginsDirectory() throws Exception { */ @Test public void testArgumentsInstallDirectory() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); ITargetLocation installDirectory = getTargetService().newDirectoryLocation(TargetPlatform.getDefaultLocation()); String[] installArgs = installDirectory.getVMArguments(); assertNotNull("Install directory should have arguments", installArgs); @@ -702,6 +704,7 @@ public void testArgumentsFeatureContainer() throws Exception { */ @Test public void testArgumentsProfileContainer() throws Exception { + PDETestCase.assumeRunningInStandaloneEclipseSDK(); ITargetLocation profileContainer = getTargetService().newProfileLocation(TargetPlatform.getDefaultLocation(), null); String[] arguments = profileContainer.getVMArguments(); @@ -771,6 +774,9 @@ public void testArguments() throws Exception { @Test public void testDeleteCleansCaches() throws Exception { ITargetDefinition definition = getNewTarget(); + // dummy content to ensure the target is cached + ITargetLocation container = getTargetService().newProfileLocation(TargetPlatform.getDefaultLocation(), null); + definition.setTargetLocations(new ITargetLocation[] { container }); try { assertFalse(TargetPlatformHelper.getTargetDefinitionMap().containsKey(definition.getHandle())); definition.resolve(null);