Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-01-21 17:33:10 +0000
committervladt2011-01-21 19:14:57 +0000
commita6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33 (patch)
tree9500b1f52875d0c7ee086bfd4d80b65bc70421ec /org.eclipse.m2e.tests.common
parent98d1f94dc3681c6cbc82ead5be0298f2e53af938 (diff)
downloadm2e-core-a6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33.tar.gz
m2e-core-a6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33.tar.xz
m2e-core-a6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33.zip
MNGECLIPSE-2746 - Moved setting marker attributes into LifecycleMappingProblemInfo
Diffstat (limited to 'org.eclipse.m2e.tests.common')
-rw-r--r--org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java
index 8b4823ff..61acb416 100644
--- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java
+++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java
@@ -237,6 +237,7 @@ public class WorkspaceHelpers {
List<IMarker> errorMarkers = WorkspaceHelpers.findErrorMarkers(project);
Assert.assertNotNull(errorMarkers);
Assert.assertEquals(WorkspaceHelpers.toString(errorMarkers), 1, errorMarkers.size());
+ assertLifecycleIdErrorMarkerAttributes(errorMarkers.get(0), lifecycleId);
}
public static void assertConfiguratorErrorMarkerAttributes(IProject project, String configuratorId)
@@ -252,6 +253,7 @@ public class WorkspaceHelpers {
List<IMarker> errorMarkers = WorkspaceHelpers.findErrorMarkers(project);
Assert.assertNotNull(errorMarkers);
Assert.assertEquals(WorkspaceHelpers.toString(errorMarkers), 1, errorMarkers.size());
+ assertLifecyclePackagingErrorMarkerAttributes(errorMarkers.get(0), packagingType);
}
public static void assertLifecycleIdErrorMarkerAttributes(IMarker marker, String lifecycleId) {
@@ -262,10 +264,10 @@ public class WorkspaceHelpers {
}
public static void assertConfiguratorErrorMarkerAttributes(IMarker marker, String configuratorId) {
- Assert.assertEquals("Marker's ConfiguratorID", configuratorId,
- marker.getAttribute(IMavenConstants.MARKER_ATTR_CONFIGURATOR_ID, null));
Assert.assertEquals("Marker's editor hint", IMavenConstants.EDITOR_HINT_MISSING_CONFIGURATOR,
marker.getAttribute(IMavenConstants.MARKER_ATTR_EDITOR_HINT, null));
+ Assert.assertEquals("Marker's ConfiguratorID", configuratorId,
+ marker.getAttribute(IMavenConstants.MARKER_ATTR_CONFIGURATOR_ID, null));
}
public static void assertLifecyclePackagingErrorMarkerAttributes(IMarker marker, String packagingType) {

Back to the top