*** empty log message ***I20031120

3 files changed, 26 insertions, 4 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestLogListener.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestLogListener.java
index a912fa449..ad874ffd7 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestLogListener.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestLogListener.java
@@ -26,7 +26,6 @@ public class CVSTestLogListener implements ILogListener {
 	 * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String)
 	 */
 	public void logging(IStatus status, String plugin) {
-		if (!CVSTestSetup.FAIL_IF_EXCEPTION_LOGGED) return;
 		List pluginErrors = (List)errors.get(plugin);
 		if (pluginErrors == null) {
 			pluginErrors = new ArrayList();
@@ -36,7 +35,6 @@ public class CVSTestLogListener implements ILogListener {
 	}
 
 	public void checkErrors() throws CoreException {
-		if (!CVSTestSetup.FAIL_IF_EXCEPTION_LOGGED) return;
 		if (errors.isEmpty()) return;
 		List allErrors = new ArrayList();
 		for (Iterator iter = errors.values().iterator(); iter.hasNext();) {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java
index 7a58f9e04..30bb1bb0c 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CVSTestSetup.java
@@ -170,7 +170,7 @@ public class CVSTestSetup extends TestSetup {
 		}
 		CVSProviderPlugin.getPlugin().setCompressionLevel(COMPRESSION_LEVEL);
 		// Add a log listener so we can ensure that nothing is logged during a test
-		if (CVSTestSetup.FAIL_IF_EXCEPTION_LOGGED && logListener == null) {
+		if (logListener == null) {
 			logListener = new CVSTestLogListener();
 			Platform.addLogListener(logListener);
 		}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index 1d3dbfb64..d27db61cc 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -30,6 +30,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -805,7 +806,16 @@ public class EclipseTest extends EclipseWorkspaceTest {
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (CVSTestSetup.logListener != null) {
-			CVSTestSetup.logListener.checkErrors();
+			try {
+				CVSTestSetup.logListener.checkErrors();
+			} catch (CoreException e) {
+				if (CVSTestSetup.FAIL_IF_EXCEPTION_LOGGED) {
+					fail("Exception written to log: ", e);
+				} else {
+					// Write the log to standard out so it can be more easily seen
+					write(e.getStatus(), 0);
+				}
+			}
 		}
 	}
 
@@ -841,5 +851,19 @@ public class EclipseTest extends EclipseWorkspaceTest {
 		return false;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.tests.harness.EclipseWorkspaceTest#ensureDoesNotExistInWorkspace(org.eclipse.core.resources.IResource)
+	 */
+	public void ensureDoesNotExistInWorkspace(IResource resource) {
+		// Overridden to change how the workspace is deleted on teardown
+		if (resource.getType() == IResource.ROOT) {
+			// Delete each project individually
+			IProject[] projects = ((IWorkspaceRoot)resource).getProjects();
+			ensureDoesNotExistInWorkspace(projects);
+		} else {
+			super.ensureDoesNotExistInWorkspace(resource);
+		}
+	}
+
 }