Bug 491070 - Intermittent test failures in FileBufferFunctions.* on
CentOS
Log full test names to the log and use appropriate, better assert
methods
Change-Id: I7a2de4905fd6df394c5fc7af40cc8842416db497
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
index 54a7e2c..09fdd46 100644
--- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
+++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
@@ -23,14 +23,21 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.resources.IProject;
@@ -93,6 +100,28 @@
return fPath;
}
+ @Rule
+ public TestFailReporter failReporter= new TestFailReporter();
+
+ public class TestFailReporter extends TestWatcher {
+
+ private static final String BUNDLE_ID= "org.eclipse.core.filebuffers.tests";
+
+ ILog log= Platform.getLog(Platform.getBundle(BUNDLE_ID));
+
+ @Override
+ protected void failed(Throwable e, Description description) {
+ IStatus status= new Status(IStatus.ERROR, BUNDLE_ID, "FAIL in " + description.toString(), e);
+ log.log(status);
+ }
+
+ @Override
+ protected void succeeded(Description description) {
+ IStatus status= new Status(IStatus.INFO, BUNDLE_ID, "PASS in " + description.toString());
+ log.log(status);
+ }
+ }
+
/*
* Tests getLocation.
*/
@@ -377,14 +406,14 @@
fManager.connect(fPath, LocationKind.NORMALIZE, null);
- assertTrue(listener.count == 1);
+ assertEquals(1, listener.count);
assertNotNull(listener.buffer);
IFileBuffer fileBuffer= fManager.getFileBuffer(fPath, LocationKind.NORMALIZE);
- assertTrue(listener.buffer == fileBuffer);
+ assertSame(fileBuffer, listener.buffer);
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
- assertTrue(listener.count == 0);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(0, listener.count);
+ assertSame(fileBuffer, listener.buffer);
} finally {
try {
@@ -428,14 +457,14 @@
IDocument document= fileBuffer.getDocument();
document.replace(0, 0, "prefix");
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isDirty);
fileBuffer.commit(null, true);
- assertTrue(listener.count == 2);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(2, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isDirty);
} finally {
@@ -479,14 +508,14 @@
IDocument document= fileBuffer.getDocument();
document.replace(0, 0, "prefix");
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isDirty);
fileBuffer.revert(null);
- assertTrue(listener.count == 2);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(2, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isDirty);
} finally {
@@ -536,10 +565,10 @@
fileBuffer.revert(null);
- assertTrue(listener.preCount == 1);
- assertTrue(listener.preBuffer == fileBuffer);
- assertTrue(listener.postCount == 1);
- assertTrue(listener.postBuffer == fileBuffer);
+ assertEquals(1, listener.preCount);
+ assertSame(fileBuffer, listener.preBuffer);
+ assertEquals(1, listener.postCount);
+ assertSame(fileBuffer, listener.postBuffer);
} finally {
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
@@ -585,10 +614,10 @@
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (modifyUnderlyingFile()) {
- assertTrue(listener.preCount == 1);
- assertTrue(listener.preBuffer == fileBuffer);
- assertTrue(listener.postCount == 1);
- assertTrue(listener.postBuffer == fileBuffer);
+ assertEquals(1, listener.preCount);
+ assertSame(fileBuffer, listener.preBuffer);
+ assertEquals(1, listener.postCount);
+ assertSame(fileBuffer, listener.postBuffer);
}
} finally {
@@ -632,8 +661,8 @@
fileBuffer.validateState(null, null);
if (isStateValidationSupported()) {
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isStateValidated);
}
@@ -679,8 +708,8 @@
fileBuffer.validateState(null, null);
if (isStateValidationSupported()) {
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isStateValidated);
}
@@ -726,8 +755,8 @@
fileBuffer.resetStateValidation();
if (isStateValidationSupported()) {
- assertTrue(listener.count == 2);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(2, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isStateValidated);
}
@@ -774,8 +803,8 @@
fileBuffer.resetStateValidation();
if (isStateValidationSupported()) {
- assertTrue(listener.count == 2);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(2, listener.count);
+ assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isStateValidated);
}
@@ -817,8 +846,8 @@
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (deleteUnderlyingFile()) {
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
}
} finally {
@@ -954,8 +983,8 @@
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (deleteUnderlyingFile()) {
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
}
} finally {
@@ -995,8 +1024,8 @@
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (moveUnderlyingFile() != null) {
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
}
} finally {
@@ -1038,8 +1067,8 @@
fileBuffer.validateState(null, null);
if (isStateValidationSupported()) {
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
}
} finally {
@@ -1081,8 +1110,8 @@
document.replace(0, 0, "prefix");
fileBuffer.revert(null);
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
} finally {
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
@@ -1124,8 +1153,8 @@
document.replace(0, 0, "prefix");
fileBuffer.commit(null, true);
- assertTrue(listener.count == 1);
- assertTrue(listener.buffer == fileBuffer);
+ assertEquals(1, listener.count);
+ assertSame(fileBuffer, listener.buffer);
} finally {
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
