[jbosstools-commits] JBoss Tools SVN: r37338 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests.
Author: akazakov
Date: 2011-12-14 20:22:59 -0500 (Wed, 14 Dec 2011)
New Revision: 37338
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2011-12-15
01:19:00 UTC (rev 37337)
+++
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2011-12-15
01:22:59 UTC (rev 37338)
@@ -151,6 +151,23 @@
List<Integer> lines = findMarkerLines(
resource, type, errorMessage, pattern);
+ StringBuffer expectedString = new StringBuffer();
+ StringBuffer realString = new StringBuffer();
+ int j = 1;
+ for (int line : lines) {
+ realString.append(line);
+ if(lines.size()>j++) {
+ realString.append(", ");
+ }
+ }
+ j = 1;
+ for (int expected : expectedLines) {
+ expectedString.append(expected);
+ if(expectedLines.length>j++) {
+ expectedString.append(", ");
+ }
+ }
+
if(lines.isEmpty()) {
IMarker[] allMarkers = findMarkers(resource, null, ".*", true);
StringBuffer sb = new StringBuffer("Marker matches the '");
//$NON-NLS-1$
@@ -168,26 +185,10 @@
fail(sb.toString());
}
- assertEquals("Wrong number of found marker matches the '" + errorMessage
+ "' pattern", //$NON-NLS-1$//$NON-NLS-2$
+ assertEquals("Wrong number of found marker matches the '" + errorMessage
+ "' pattern. Expected the pattern at the following lines <" +
expectedString + "> but was at <" + realString + ">.",
//$NON-NLS-1$//$NON-NLS-2$
expectedLines.length, lines.size());
- StringBuffer expectedString = new StringBuffer();
- StringBuffer realString = new StringBuffer();
- int i = 1;
for (int line : lines) {
- realString.append(line);
- if(lines.size()>i++) {
- realString.append(", ");
- }
- }
- i = 1;
- for (int expected : expectedLines) {
- expectedString.append(expected);
- if(expectedLines.length>i++) {
- expectedString.append(", ");
- }
- }
- for (int line : lines) {
boolean found = false;
for (int expected : expectedLines) {
if(line==expected) {