Merge branch 'master' into QuickFix_addSpace

Author: nburnwal09

build/org.eclipse.pde.build.tests/test-sdk.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse SDK" uid="org.eclipse.sdk.test.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.37.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.test.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.37.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -21,27 +21,25 @@
       </win>
    </launcher>
 
+   <plugins>
+      <!-- Needed by org.eclipse.pde.build.internal.tests.p2.PublishingTests.testBug329162() -->
+      <plugin id="org.eclipse.osgi.source"/>
+      <!-- Needed by org.eclipse.pde.build.internal.tests.SourceTests.testBug290828() -->
+      <plugin id="org.eclipse.team.core.source"/>
+   </plugins>
+
    <features>
       <feature id="org.eclipse.platform"/>
-      <feature id="org.eclipse.platform.source"/>
       <feature id="org.eclipse.jdt"/>
-      <feature id="org.eclipse.jdt.source"/>
-      <!-- PDE must be installed as a root so it can be updated -->
       <feature id="org.eclipse.pde" installMode="root"/>
-      <feature id="org.eclipse.pde.source"/>
       <feature id="org.eclipse.pde.spies"/>
-      <feature id="org.eclipse.pde.spies.source"/>
       <feature id="org.eclipse.help"/>
-      <feature id="org.eclipse.help.source"/>
       <feature id="org.eclipse.jdt.astview.feature"/>
       <feature id="org.eclipse.jdt.jeview.feature"/>
       <feature id="org.eclipse.jdt.bcoview.feature"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.equinox.p2.user.ui.source"/>
       <feature id="org.eclipse.e4.core.tools.feature"/>
-      <feature id="org.eclipse.e4.core.tools.feature.source"/>
       <feature id="org.eclipse.tips.feature"/>
-      <feature id="org.eclipse.tips.feature.source"/>
       <feature id="org.eclipse.test"/>
    </features>
 

ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PDE JUnit Tests
 Bundle-SymbolicName: org.eclipse.pde.ui.tests; singleton:=true
-Bundle-Version: 3.13.100.qualifier
+Bundle-Version: 3.13.200.qualifier
 Bundle-ClassPath: tests.jar
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.pde.ui,

ui/org.eclipse.pde.ui.tests/pom.xml

@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.ui.tests</artifactId>
-  <version>3.13.100-SNAPSHOT</version>
+  <version>3.13.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionResolutionTests.java

@@ -425,14 +425,20 @@ public void testSourceBundleRecognition() throws Exception {
 		PDETestCase.assumeRunningInStandaloneEclipseSDK();
 
 		ITargetDefinition definition = getNewTarget();
+		String defaultLocation = TargetPlatform.getDefaultLocation();
 
-		ITargetLocation directoryContainer = getTargetService().newDirectoryLocation(TargetPlatform.getDefaultLocation() + "/plugins");
+		ITargetLocation directoryContainer = getTargetService().newDirectoryLocation(defaultLocation + "/plugins");
 
-		ITargetLocation profileContainer = getTargetService().newProfileLocation(TargetPlatform.getDefaultLocation(), null);
+		ITargetLocation profileContainer = getTargetService().newProfileLocation(defaultLocation, null);
 
-		ITargetLocation featureContainer = getTargetService().newFeatureLocation(TargetPlatform.getDefaultLocation(), "org.eclipse.jdt", null);
+		String featureWithCorrespondingSourceFeature = "org.eclipse.equinox.p2.core.feature";
 
-		ITargetLocation featureContainer2 = getTargetService().newFeatureLocation(TargetPlatform.getDefaultLocation(), "org.eclipse.jdt.source", null);
+		ITargetLocation featureContainer = getTargetService().newFeatureLocation(defaultLocation,
+				featureWithCorrespondingSourceFeature,
+				null);
+
+		ITargetLocation featureContainer2 = getTargetService().newFeatureLocation(defaultLocation,
+				featureWithCorrespondingSourceFeature + ".source", null);
 
 		definition.setTargetLocations(new ITargetLocation[]{directoryContainer, profileContainer, featureContainer, featureContainer2});
 		definition.resolve(null);
@@ -464,4 +470,5 @@ public void testSourceBundleRecognition() throws Exception {
 		}
 	}
 
+
 }