Wait for DelayedSnapshotJob in AbstractJavaModelTests.deleteProject(), add more logging to test

This change adjsuts AbstractJavaModelTests.deleteProject()
to wait for the periodic workspace save job.

In addition, logging for JavaModelTests resource change event listener tests
is improved to better log events related to the sporadic test failures.

Fixes: eclipse-jdt#4958

Author: trancexpress

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java

@@ -2472,6 +2472,7 @@ protected void deleteProject(String projectName) throws CoreException {
 			project.open(null);
 		}
 		deleteResource(project);
+		waitForSnapShot();
 	}
 	protected void deleteProject(IJavaProject project) throws CoreException {
 		if (project.exists() && !project.isOpen()) { // force opening so that project can be deleted without logging (see bug 23629)
@@ -4215,19 +4216,32 @@ protected void makeJCLModular(IJavaProject javaProject) throws JavaModelExceptio
 	}
 
 	protected static void logDeltaEvent(IResourceChangeEvent event) {
+		StringBuilder s = new StringBuilder();
+		s.append("Logging resource change event");
+		s.append(System.lineSeparator());
+		s.append("type: ");
+		s.append(event.getType());
+		s.append(System.lineSeparator());
+		s.append("buildKind: ");
+		s.append(event.getBuildKind());
+		s.append(System.lineSeparator());
+		s.append("resource: ");
+		s.append(event.getResource());
+		s.append(System.lineSeparator());
+		s.append("source: " );
+		s.append(event.getSource());
 		IResourceDelta delta = event.getDelta();
 		if (delta != null) {
-			StringBuilder s = new StringBuilder();
-			s.append("Logging resource delta");
 			s.append(System.lineSeparator());
+			s.append("Delta:");
 			IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
 				@Override
 				public boolean visit(IResourceDelta d) throws CoreException {
+					s.append(System.lineSeparator());
 					s.append("\tkind: ");
 					s.append(d.getKind());
 					s.append(", resource: ");
 					s.append(d.getResource());
-					s.append(System.lineSeparator());
 					return true;
 				}
 			};
@@ -4240,12 +4254,12 @@ public boolean visit(IResourceDelta d) throws CoreException {
 		}
 	}
 
-	private static void logError(String errorMessage, CoreException e) {
+	protected static void logError(String errorMessage, CoreException e) {
 		logInfo(errorMessage);
 		e.printStackTrace(System.out);
 	}
 
-	private static void logInfo(String message) {
+	protected static void logInfo(String message) {
 		System.out.println(new SimpleDateFormat("HH:mm:ss.SSS").format(new Date()) + " " + message);
 	}
 }

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaModelTests.java

@@ -21,7 +21,6 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -59,7 +58,7 @@ public static Test suite() {
 
 @Override
 protected void setUp() throws Exception {
-	ResourcesPlugin.getWorkspace().addResourceChangeListener(LOG_RESOURCE_DELTA);
+	JavaCore.addPreProcessingResourceChangedListener(LOG_RESOURCE_DELTA, 255 /* all types */);
 	this.wasVerbose = JavaModelManager.VERBOSE;
 	JavaModelManager.VERBOSE = true;
 	super.setUp();
@@ -69,7 +68,7 @@ protected void setUp() throws Exception {
 protected void tearDown() throws Exception {
 	super.tearDown();
 	JavaModelManager.VERBOSE = this.wasVerbose;
-	ResourcesPlugin.getWorkspace().removeResourceChangeListener(LOG_RESOURCE_DELTA);
+	JavaCore.removePreProcessingResourceChangedListener(LOG_RESOURCE_DELTA);
 }
 
 public JavaModelTests(String name) {