From 527e1de459dac8cd851bc3d2a62b19ed36a590e8 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 21 Feb 2014 20:40:53 +0100 Subject: [PATCH] runSingleTest(Runnable) extracted for parameterized tests --- .../LightQuickFixParameterizedTestCase.java | 12 +++------- .../LightPlatformCodeInsightTestCase.java | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java index e5b8772026d2..c8e17a9c96fc 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java @@ -44,18 +44,12 @@ public abstract class LightQuickFixParameterizedTestCase extends LightQuickFixTe @SuppressWarnings("JUnit4AnnotatedMethodInJUnit3TestCase") @Test public void runSingle() throws Throwable { - final Throwable[] throwables = new Throwable[1]; - - Runnable runnable = new Runnable() { + runSingleTest(new Runnable() { @Override public void run() { - try { - doSingleTest(myFileSuffix, myTestDataPath); - } - catch (Throwable e) { - throwables[0] = e; - } + doSingleTest(myFileSuffix, myTestDataPath); } + }); }; invokeTestRunnable(runnable); diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java index 3c6911e18dca..0b608f2a5fe2 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java @@ -747,4 +747,27 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest } } + protected void runSingleTest(Runnable testRunnable) throws Throwable { + final Throwable[] throwables = new Throwable[1]; + + Runnable runnable = new Runnable() { + @Override + public void run() { + try { + testRunnable.run(); + } + catch (Throwable e) { + throwables[0] = e; + } + } + }; + + invokeTestRunnable(runnable); + + if (throwables[0] != null) { + throw throwables[0]; + } + + } + }