Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-10-14 08:41:20 -0400
committerEike Stepper2013-10-14 08:41:20 -0400
commit632884c15c9e7ae97940cb3949585954d981ccf8 (patch)
tree4a259cc6587ca62c4193ab9d178c03ab76f6ae74 /plugins/org.eclipse.net4j.tests/src/org
parent2ec08800feb6d88615bcd48c3db279542de28cd2 (diff)
downloadcdo-632884c15c9e7ae97940cb3949585954d981ccf8.tar.gz
cdo-632884c15c9e7ae97940cb3949585954d981ccf8.tar.xz
cdo-632884c15c9e7ae97940cb3949585954d981ccf8.zip
[419356] Handle exception during asynchronous queries in result order
https://bugs.eclipse.org/bugs/show_bug.cgi?id=419356
Diffstat (limited to 'plugins/org.eclipse.net4j.tests/src/org')
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java26
1 files changed, 23 insertions, 3 deletions
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index b5b9ce191e..b073c1c0dc 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -143,6 +143,11 @@ public abstract class AbstractOMTest extends TestCase
return null;
}
+ protected boolean logSetUpAndTearDown()
+ {
+ return false;
+ }
+
@Override
public void setUp() throws Exception
{
@@ -165,21 +170,36 @@ public abstract class AbstractOMTest extends TestCase
IOUtil.OUT().println("*******************************************************"); //$NON-NLS-1$
}
+ if (!logSetUpAndTearDown())
+ {
+ disableConsole();
+ }
+
super.setUp();
doSetUp();
- if (!SUPPRESS_OUTPUT)
+ if (!SUPPRESS_OUTPUT && logSetUpAndTearDown())
{
IOUtil.OUT().println();
IOUtil.OUT().println("------------------------ START ------------------------"); //$NON-NLS-1$
}
+
+ enableConsole();
}
@Override
public void tearDown() throws Exception
{
- enableConsole();
- if (!SUPPRESS_OUTPUT)
+ if (logSetUpAndTearDown())
+ {
+ enableConsole();
+ }
+ else
+ {
+ disableConsole();
+ }
+
+ if (!SUPPRESS_OUTPUT && logSetUpAndTearDown())
{
IOUtil.OUT().println("------------------------- END -------------------------"); //$NON-NLS-1$
IOUtil.OUT().println();

Back to the top