Bug 547532 - fixed test compilation warnings
They were introduced after disabling test fails due revert for bug
549110
Change-Id: I171662075e5ef1ed9bbef23e2469b39884146989
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java
index fe225fc..0cf28db 100644
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java
@@ -19,7 +19,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Shell;
@@ -84,10 +83,10 @@
}
}.waitForCondition(textWidget.getDisplay(), 2000));
DisplayHelper.sleep(textWidget.getDisplay(), 1000);
- int referenceIndex = textWidget.getText().indexOf("reference");
- Rectangle referenceBounds = textWidget.getTextBounds(referenceIndex, referenceIndex);
- Rectangle annotatedCharactedBounds = textWidget.getTextBounds(annotationIndex, annotationIndex);
// XXX disabled due bug 549110
- // Assert.assertTrue("Annotation didn't shift target character to the right, it most likely replaced the tab instead of expanding it", referenceBounds.x < annotatedCharactedBounds.x);
+// int referenceIndex = textWidget.getText().indexOf("reference");
+// Rectangle referenceBounds = textWidget.getTextBounds(referenceIndex, referenceIndex);
+// Rectangle annotatedCharactedBounds = textWidget.getTextBounds(annotationIndex, annotationIndex);
+// Assert.assertTrue("Annotation didn't shift target character to the right, it most likely replaced the tab instead of expanding it", referenceBounds.x < annotatedCharactedBounds.x);
}
}
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java
index 7bb8463..3cea6ca 100644
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java
@@ -26,7 +26,6 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Shell;
@@ -141,11 +140,11 @@
}
}.waitForCondition(textWidget.getDisplay(), 2000));
DisplayHelper.sleep(textWidget.getDisplay(), 1000);
- Rectangle textBounds= textWidget.getTextBounds(0, textWidget.getText().length() - 1);
- int supposedMostRightPaintedPixel = textBounds.x + textBounds.width - 1;
- int mostRightPaintedPixel= getMostRightPaintedPixel(textWidget);
// XXX disabled due bug 549110
- // Assert.assertEquals(supposedMostRightPaintedPixel, mostRightPaintedPixel, 1.5); // use double comparison with delta to tolerate variation from a system to the other
+// Rectangle textBounds= textWidget.getTextBounds(0, textWidget.getText().length() - 1);
+// int supposedMostRightPaintedPixel = textBounds.x + textBounds.width - 1;
+// int mostRightPaintedPixel= getMostRightPaintedPixel(textWidget);
+// Assert.assertEquals(supposedMostRightPaintedPixel, mostRightPaintedPixel, 1.5); // use double comparison with delta to tolerate variation from a system to the other
}
public int getMostRightPaintedPixel(StyledText widget) {
