Author: akazakov
Date: 2009-07-03 16:55:55 -0400 (Fri, 03 Jul 2009)
New Revision: 16381
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4545 Fixed
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
---
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2009-07-03
20:55:26 UTC (rev 16380)
+++
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2009-07-03
20:55:55 UTC (rev 16381)
@@ -20,7 +20,7 @@
*/
public class JobUtils {
- private static final long MAX_IDLE = 15*60*1000L;
+ private static final long MAX_IDLE = 20*60*1000L;
private static final long DEFAULT_DELAY = 500;
public static void waitForIdle() {
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 2009-07-03
20:55:26 UTC (rev 16380)
+++
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-07-03
20:55:55 UTC (rev 16381)
@@ -55,7 +55,7 @@
IMarker[] markers = resource.findMarkers(type, true, IResource.DEPTH_INFINITE);
for (int i = 0; i < markers.length; i++) {
String message = markers[i].getAttribute(IMarker.MESSAGE, "");
//$NON-NLS-1$
- if (message.matches(pattern)) {
+ if (message.matches(pattern) && markers[i].exists()) {
result.add(markers[i]);
}
}
@@ -115,7 +115,7 @@
int length = markers.length;
for(int i=0;i<markers.length;i++){
// System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE,
"")); //$NON-NLS-1$//$NON-NLS-2$
- if(filter!=null && !filter.accept(markers[i])) {
+ if(markers[i].exists() && (filter==null || filter.accept(markers[i]))) {
length--;
}
}
@@ -137,7 +137,7 @@
// System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE,
"")); //$NON-NLS-1$//$NON-NLS-2$
for(int i=0;i<markers.length;i++){
- if(filter==null || filter.accept(markers[i])) {
+ if(markers[i].exists() && (filter==null || filter.accept(markers[i]))) {
messages.add(markers[i].getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$
}
}
@@ -158,7 +158,7 @@
for(int i=0;i<markers.length;i++){
// System.out.println("Marker line number -
"+markers[i].getAttribute(IMarker.LINE_NUMBER, 0)); //$NON-NLS-1$
- if(filter==null || filter.accept(markers[i])) {
+ if(markers[i].exists() && (filter==null || filter.accept(markers[i]))) {
numbers.add(markers[i].getAttribute(IMarker.LINE_NUMBER, 0));
}
}