From bb75e9176af5ca6c70e4f0e933f6d748a19b3451 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 28 Aug 2019 10:43:11 +0300 Subject: [PATCH] Fixed typo from string returned from Rename.renameNode gitlab #367 Change-Id: I5524ae8c3133968a4819045fc2556439b5aa3526 --- .../db/testing/base/SCLScriptTestBase.java | 34 +++++++++++-------- .../simantics/db/testing/common/TestBase.java | 2 +- .../scl/Simantics/Rename.scl | 4 +-- .../src/org/simantics/modeling/Rename.java | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/bundles/org.simantics.db.testing/src/org/simantics/db/testing/base/SCLScriptTestBase.java b/bundles/org.simantics.db.testing/src/org/simantics/db/testing/base/SCLScriptTestBase.java index 26e916fc1..1ea9e6a54 100644 --- a/bundles/org.simantics.db.testing/src/org/simantics/db/testing/base/SCLScriptTestBase.java +++ b/bundles/org.simantics.db.testing/src/org/simantics/db/testing/base/SCLScriptTestBase.java @@ -19,21 +19,24 @@ import org.simantics.scl.osgi.SCLOsgi; import org.simantics.scl.osgi.internal.Activator; import org.simantics.scl.osgi.internal.ServiceBasedModuleSourceRepository; import org.simantics.scl.osgi.internal.ServiceBasedTestRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import gnu.trove.map.hash.THashMap; /** * Utilizies {@link TestRepository} for collecting SCL tests from bundles * - * @author Jani - * + * @author Jani Simomaa */ public class SCLScriptTestBase extends FreshDatabaseTest { + private static final Logger LOGGER = LoggerFactory.getLogger(SCLScriptTestBase.class); + private Map testRunnables = new THashMap(); - + @Rule public TestName testName = new TestName(); - + /** * Constructor that initially searches for all SCL test scripts and stores * them into a Map for later access @@ -47,14 +50,14 @@ public class SCLScriptTestBase extends FreshDatabaseTest { testRunnables.put(runnable.getName(), runnable); } } - + /** * Simplest method for running a SCL test */ protected void test() { test(-1); } - + /** * Executes a test case with given timeout as seconds. When time runs out one * can assume a deadlock has happened. The process is killed after the timeout @@ -65,7 +68,7 @@ public class SCLScriptTestBase extends FreshDatabaseTest { protected void test(int timeout) { testImpl(timeout); } - + /** * Executes a test case with given timeout as seconds * @@ -75,25 +78,26 @@ public class SCLScriptTestBase extends FreshDatabaseTest { SCLOsgi.SOURCE_REPOSITORY = new ServiceBasedModuleSourceRepository(Activator.getContext()); SCLOsgi.MODULE_REPOSITORY = new ModuleRepository(SCLOsgi.SOURCE_REPOSITORY); SCLOsgi.TEST_REPOSITORY = new ServiceBasedTestRepository(Activator.getContext()); - + String testName = resolveTestName(); TestRunnable runnable = testRunnables.get(testName); - + if (timeout > -1) { Timer timer = new Timer(); timer.schedule(new TimerTask() { @Override public void run() { + LOGGER.info("Watchdog will kill this test process because it has been executing for over {} seconds", timeout); //$NON-NLS-1$ String processName = ManagementFactory.getRuntimeMXBean().getName(); - System.out.println("PID: " + processName); + LOGGER.info("Test Process Name: {}", processName); //$NON-NLS-1$ String PID = processName.split("@")[0]; String command = "taskkill /F /PID " + PID; - System.out.println("Command: " + command); + LOGGER.info("Running command to kill test process: {}", command); //$NON-NLS-1$ try { Runtime.getRuntime().exec(command); } catch (IOException e) { - e.printStackTrace(); + LOGGER.error("Failed to kill process that ran over its execution time limit of {} seconds", timeout, e); } } @@ -101,7 +105,7 @@ public class SCLScriptTestBase extends FreshDatabaseTest { try { runnable.run(); } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Failed to run test {} runnable {}", testName, runnable, e); } finally { timer.cancel(); } @@ -109,11 +113,11 @@ public class SCLScriptTestBase extends FreshDatabaseTest { try { runnable.run(); } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Failed to run test {} runnable {}", testName, runnable, e); } } } - + /** * Resolves the full test name based on the names of classes that extends this * SCLScriptTestBase class.

diff --git a/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/TestBase.java b/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/TestBase.java index 06fc784a2..73e6ff8f1 100644 --- a/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/TestBase.java +++ b/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/TestBase.java @@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory; * * @author Marko Luukkainen */ -public abstract class TestBase /*extends TestCase*/ { +public abstract class TestBase { private static final Logger LOGGER = LoggerFactory.getLogger(TestBase.class); public static final boolean DEBUG = Configuration.get().debug; public static final String ROOT_LIBRARY_URI = "http:/"; diff --git a/bundles/org.simantics.modeling/scl/Simantics/Rename.scl b/bundles/org.simantics.modeling/scl/Simantics/Rename.scl index cb048e037..e7667ed87 100644 --- a/bundles/org.simantics.modeling/scl/Simantics/Rename.scl +++ b/bundles/org.simantics.modeling/scl/Simantics/Rename.scl @@ -11,7 +11,7 @@ importJava "org.simantics.modeling.Rename" where Example: > renameNode resource "NewName" - "Succesfully renamed oldName to NewName" + "Successfully renamed oldName to NewName" or error if failed """ @@ -26,7 +26,7 @@ Renames the given `entity` with the given `newName` and returns Example: > renameMBNode entity "NewName" - "Succesfully renamed oldName to NewName" + "Successfully renamed oldName to NewName" or error if failed """ diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/Rename.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/Rename.java index 5d8543d21..0c5007ba5 100644 --- a/bundles/org.simantics.modeling/src/org/simantics/modeling/Rename.java +++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/Rename.java @@ -29,7 +29,7 @@ public class Rename { CommentMetadata cm = graph.getMetadata(CommentMetadata.class); graph.addMetadata(cm.add("Renamed node " + nodeName + ", resource " + node + ", to " + newName)); - return "Succesfully renamed "+ nodeName + " to " + newName; + return "Successfully renamed "+ nodeName + " to " + newName; } } -- 2.43.2