Repeat access to reveal more leak scenarios

Author: basilevs

tests/org.eclipse.rcptt.core.tests/src/org/eclipse/rcptt/core/tests/NoErrorsInLog.java

@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.rcptt.core.tests;
 
+import java.util.Arrays;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.ILogListener;
@@ -37,6 +39,13 @@ public NoErrorsInLog(Class<?> clazzToWatchLogFor) {
 		this.log = Platform.getLog(FrameworkUtil.getBundle(clazzToWatchLogFor));
 		this.statusLog = new MultiStatus("org.eclipse.rcptt.tesla.swt.test", 0, "Errors in the error log", null);
 	}
+	
+	public void assertNoErrors() {
+		synchronized (statusLog) {
+			checkErrors();
+		}
+	}
+	
 	@Override
 	protected void before() throws Throwable {
 		super.before();
@@ -48,11 +57,19 @@ protected void after() {
 		System.gc(); // Detect leaks with org.eclipse.rcptt.core.persistence.LeakDetector
 		log.removeLogListener(listener);
 		synchronized (statusLog) {
-			if (statusLog.matches(IStatus.ERROR)) {
-				throw new AssertionError(new CoreException(statusLog));
-			}
+			checkErrors();
 		}
 		super.after();
 	}
 
+	private void checkErrors() throws AssertionError {
+		if (statusLog.matches(IStatus.ERROR)) {
+			Arrays.stream(statusLog.getChildren()).filter(s -> s.matches(IStatus.ERROR)).map(s -> s.getException())
+					.filter(RuntimeException.class::isInstance).map(RuntimeException.class::cast).forEach(e -> {
+						throw e;
+					});
+			throw new AssertionError(new CoreException(statusLog));
+		}
+	}
+
 }

tests/org.eclipse.rcptt.core.tests/src/org/eclipse/rcptt/internal/core/model/Q7NamedElementTest.java

@@ -10,12 +10,16 @@
  *******************************************************************************/
 package org.eclipse.rcptt.internal.core.model;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.function.Consumer;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -54,17 +58,40 @@ public void before() throws CoreException {
 	}
 
 	@Test
-	public void noResourceleaks() throws CoreException, IOException {
-		try (InputStream is = getClass().getResourceAsStream("testcase.test")) {
-			TESTCASE_FILE.create(is, IFile.REPLACE|IFile.FORCE, null);
-		}
-		IFile previousFile = TESTCASE_FILE;
-		for (int i = 0; i < 10000; i++) {
-			IFile currentFile = PROJECT.getFile("t"+i+".test");
-			previousFile.move(currentFile.getFullPath(), true, false, null);
-			previousFile = currentFile;
-			ITestCase testcase = (ITestCase) RcpttCore.create(currentFile);
-			Assert.assertEquals("_-dqP0BOHEeOQfY3L4mNcSA", testcase.getID());
+	public void noResourceleaksID() {
+		noResourceleaks(testcase -> Assert.assertEquals("_-dqP0BOHEeOQfY3L4mNcSA", testcase.getID()));
+	}
+	
+	@Test
+	public void noResourceleaksExists() {
+		noResourceleaks(testcase -> assertTrue(testcase.exists()));
+	}
+
+	
+	private interface ThrowingConsumer<T> {
+		void accept(T data) throws Exception;
+	}
+	
+	public void noResourceleaks(ThrowingConsumer<ITestCase> action) {
+		try {
+			try (InputStream is = getClass().getResourceAsStream("testcase.test")) {
+				TESTCASE_FILE.create(is, IFile.REPLACE|IFile.FORCE, null);
+			}
+			IFile previousFile = TESTCASE_FILE;
+			for (int i = 0; i < 1000; i++) {
+				IFile currentFile = PROJECT.getFile("t"+i+".test");
+				previousFile.move(currentFile.getFullPath(), true, false, null);
+				previousFile = currentFile;
+				ITestCase testcase = (ITestCase) RcpttCore.create(currentFile);
+				action.accept(testcase);
+				if ( i % 2 == 0) {
+					action.accept(testcase); // sometimes single access does not cause leak
+				}
+				System.gc(); // Detect leaks with org.eclipse.rcptt.core.persistence.LeakDetector
+				NO_ERRORS.assertNoErrors();
+			}
+		} catch (Exception e) {
+			throw new AssertionError(e);
 		}
 	}