From fabac90339eaf1d828b1c9d222a2486292fb04a7 Mon Sep 17 00:00:00 2001 From: Matt Casters Date: Sat, 12 Nov 2016 10:43:01 +0100 Subject: [PATCH] Hide test results dialog when running the step --- .../spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java | 2 +- .../spoon/xtpoint/ValidateTransUnitTestExtensionPoint.java | 4 +++- src/org/pentaho/di/dataset/steps/exectests/ExecuteTests.java | 5 +++++ src/org/pentaho/di/dataset/util/DataSetConst.java | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/org/pentaho/di/dataset/spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java b/src/org/pentaho/di/dataset/spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java index abbf442..d0bfedc 100644 --- a/src/org/pentaho/di/dataset/spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java +++ b/src/org/pentaho/di/dataset/spoon/xtpoint/ShowUnitTestMenuExtensionPoint.java @@ -186,7 +186,7 @@ protected void disableUnitTest(String unitTestName) { protected void switchUnitTest(TransUnitTest targetTest, TransMeta transMeta) { try { DataSetHelper.getInstance().detachUnitTest(); - DataSetHelper.getInstance().selectUnitTest(transMeta, targetTest); + DataSetHelper.selectUnitTest(transMeta, targetTest); } catch (Exception exception) { new ErrorDialog(Spoon.getInstance().getShell(), BaseMessages.getString(PKG, "ShowUnitTestMenuExtensionPoint.ErrorSwitchingUnitTest.Title"), diff --git a/src/org/pentaho/di/dataset/spoon/xtpoint/ValidateTransUnitTestExtensionPoint.java b/src/org/pentaho/di/dataset/spoon/xtpoint/ValidateTransUnitTestExtensionPoint.java index 76e0de2..e1ac4cd 100644 --- a/src/org/pentaho/di/dataset/spoon/xtpoint/ValidateTransUnitTestExtensionPoint.java +++ b/src/org/pentaho/di/dataset/spoon/xtpoint/ValidateTransUnitTestExtensionPoint.java @@ -81,8 +81,10 @@ public void callExtensionPoint( LogChannelInterface log, Object object ) throws } else { log.logBasic( "Unit test '"+unitTest.getName()+"' failed, "+errors+" errors detected, "+results.size()+" comments to report." ); + String dontShowResults = transMeta.getVariable(DataSetConst.VAR_DO_NOT_SHOW_UNIT_TEST_ERRORS, "N"); + final Spoon spoon = Spoon.getInstance(); - if (spoon!=null) { + if (spoon!=null && "N".equalsIgnoreCase(dontShowResults)) { spoon.getShell().getDisplay().asyncExec(new Runnable() { @Override public void run() { diff --git a/src/org/pentaho/di/dataset/steps/exectests/ExecuteTests.java b/src/org/pentaho/di/dataset/steps/exectests/ExecuteTests.java index 400d5f0..d446242 100644 --- a/src/org/pentaho/di/dataset/steps/exectests/ExecuteTests.java +++ b/src/org/pentaho/di/dataset/steps/exectests/ExecuteTests.java @@ -163,6 +163,11 @@ private TransMeta loadTestTransformation(TransUnitTest test) throws KettleExcept if (transMeta==null) { return null; } + + // Don't show to unit tests results dialog in case of errors + // + transMeta.setVariable(DataSetConst.VAR_DO_NOT_SHOW_UNIT_TEST_ERRORS, "Y"); + // Pass some data from the parent... // transMeta.setRepository(repository); diff --git a/src/org/pentaho/di/dataset/util/DataSetConst.java b/src/org/pentaho/di/dataset/util/DataSetConst.java index e59d524..9776ffb 100755 --- a/src/org/pentaho/di/dataset/util/DataSetConst.java +++ b/src/org/pentaho/di/dataset/util/DataSetConst.java @@ -59,7 +59,7 @@ public class DataSetConst { public static final String ATTR_STEP_TWEAK= "UnitTestStepTweak"; public static final String VAR_RUN_UNIT_TEST = "__UnitTest__"; - + public static final String VAR_DO_NOT_SHOW_UNIT_TEST_ERRORS = "__DontShowUnitTestErrors__"; public static final String ATTR_TRANS_SELECTED_UNIT_TEST_NAME = "SelectedUnitTest"; public static final String AREA_DRAWN_UNIT_ICON = "DrawnUnitTestIcon";