Author: akazakov Date: 2008-04-08 12:31:39 -0400 (Tue, 08 Apr 2008) New Revision: 7426 Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1950 Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2008-04-08 16:30:33 UTC (rev 7425) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2008-04-08 16:31:39 UTC (rev 7426) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.tests; +import java.util.ArrayList; +import java.util.List; + import junit.framework.TestCase; import org.eclipse.core.resources.IMarker; @@ -36,21 +39,27 @@ super(name); } - protected int findMarkerfLine(IResource resource, String type, String pattern) + protected int findMarkerLine(IResource resource, String type, String pattern) throws CoreException { int number = -1; - IMarker[] markers = new IMarker[0]; + IMarker[] markers = findMarkers(resource, type, pattern); + for (int i = 0; i < markers.length; i++) { + number = markers[i].getAttribute(IMarker.LINE_NUMBER, -1); + } - markers = resource.findMarkers(type, false, IResource.DEPTH_INFINITE); + return number; + } + protected IMarker[] findMarkers(IResource resource, String type, String pattern) throws CoreException { + List<IMarker> result = new ArrayList<IMarker>(); + IMarker[] markers = resource.findMarkers(type, false, IResource.DEPTH_INFINITE); for (int i = 0; i < markers.length; i++) { String message = markers[i].getAttribute(IMarker.MESSAGE, ""); if (message.matches(pattern)) { - number = markers[i].getAttribute(IMarker.LINE_NUMBER, -1); + result.add(markers[i]); } } - - return number; + return result.toArray(new IMarker[0]); } protected void assertMarkerIsCreated(IResource resource, MarkerData markerData) throws CoreException { @@ -60,7 +69,7 @@ protected void assertMarkerIsCreated(IResource resource, String type, String pattern, int expectedLine) throws CoreException { - int line = findMarkerfLine( + int line = findMarkerLine( resource, type, pattern); assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", @@ -70,6 +79,13 @@ expectedLine,line); } + protected void assertMarkerIsCreated(IResource resource, String type, String pattern) throws CoreException { + IMarker[] markers = findMarkers(resource, type, pattern); + + assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", + markers.length>0); + } + protected void assertMarkersIsCreated(IResource resource, MarkerData[] markersData) throws CoreException { for (MarkerData markerData : markersData) { assertMarkerIsCreated(resource, markerData);