Add test case for recursive marker content generator extensions #2193

Author: travkin79

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkerSupportViewTest.java

@@ -142,15 +142,23 @@ public void markerContentGeneratorExtensionLoaded() throws Exception {
 
 		MarkerField[] allFields = descriptor.getAllFields();
 
-		boolean foundAdditionalFieldRegisteredViaExtension = false;
+		boolean foundAdditionalField1 = false;
+		boolean foundRecursivelyAddedField2 = false;
 		for (MarkerField field : allFields) {
 			if (ProblemKeyMarkerField.class.equals(field.getClass())) {
-				foundAdditionalFieldRegisteredViaExtension = true;
-				break;
+				if ("Problem Key".equals(field.getName())) {
+					foundAdditionalField1 = true;
+				}
+
+				if ("Problem Key V2".equals(field.getName())) {
+					foundRecursivelyAddedField2 = true;
+				}
 			}
 		}
 		assertTrue("MarkerFields from marker content generator extensions not loaded.",
-				foundAdditionalFieldRegisteredViaExtension);
+				foundAdditionalField1);
+		assertTrue("MarkerField not loaded from recursive marker content generator extension.",
+				foundRecursivelyAddedField2);
 
 		MarkerType markerTypeFromExtension = descriptor.getType("org.eclipse.ui.tests.markers.artificial.problem");
 		assertNotNull("Marker type from marker content generator extensions not loaded.", markerTypeFromExtension);

tests/org.eclipse.ui.tests/plugin.xml

@@ -3417,6 +3417,11 @@
               id="org.eclipse.ui.tests.markerField.problemKey"
               name="Problem Key">
         </markerField>
+        <markerField
+              class="org.eclipse.ui.tests.markers.ProblemKeyMarkerField"
+              id="org.eclipse.ui.tests.markerField.problemKeyV2"
+              name="Problem Key V2">
+        </markerField>
         <markerContentGenerator
               id="org.eclipse.ui.tests.additionalProblemMarkerContentGenerator"
               name="Additional Problem Marker Content Generator">
@@ -3441,6 +3446,20 @@
         <markerContentGeneratorExtension
               generatorId="org.eclipse.ui.ide.allMarkersGenerator"
               id="org.eclipse.ui.tests.additionalProblemMarkerContentGenerator">
+        </markerContentGeneratorExtension>
+        <markerContentGenerator
+              id="org.eclipse.ui.tests.additionalProblemMarkerContentGenerator2"
+              name="Additional Problem Marker Content Generator 2">
+           <markerFieldReference
+                 id="org.eclipse.ui.tests.markerField.problemKeyV2">
+           </markerFieldReference>
+           <markerTypeReference
+                 id="org.eclipse.ui.tests.markers.static.analysis.problem">
+           </markerTypeReference>
+        </markerContentGenerator>
+        <markerContentGeneratorExtension
+              generatorId="org.eclipse.ui.tests.additionalProblemMarkerContentGenerator"
+              id="org.eclipse.ui.tests.additionalProblemMarkerContentGenerator2">
         </markerContentGeneratorExtension>       
    </extension>
    <extension