From 56f9a29fc3d208bb1a0e9476b9d67dc372098e70 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 28 Apr 2009 13:24:22 +0000 Subject: [PATCH] Replace executable by runnable git-svn-id: https://svn.argeo.org/slc/trunk@2390 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/lib/detached/DetachedAdminTask.java | 6 ++---- .../org/argeo/slc/osgiboot/Activator.java | 10 ++++------ .../java/org/argeo/slc/deploy/Deployment.java | 6 +----- .../org/argeo/slc/execution/Executable.java | 7 ------- .../argeo/slc/execution/ExecutionFlow.java | 2 +- .../org/argeo/slc/test/ExecutableTestRun.java | 3 +-- .../argeo/slc/ant/deploy/SlcDeployTask.java | 2 +- .../org/argeo/slc/ant/test/SlcTestTask.java | 2 +- .../AbstractSpringExecutionModule.java | 2 +- .../core/execution/DefaultExecutionFlow.java | 19 ++++++++++--------- .../slc/core/execution/ExecutionAspect.java | 2 +- .../execution/tasks/CloseTestResultTask.java | 5 ++--- .../argeo/slc/core/execution/tasks/Echo.java | 5 ++--- .../execution/tasks/OverrideContextAware.java | 6 ++---- .../core/execution/tasks/SlcManagerTask.java | 5 ++--- .../slc/core/execution/tasks/SystemCall.java | 5 ++--- .../argeo/slc/core/test/SimpleTestRun.java | 2 +- .../deploy/HttpdApplicationDeployment.java | 2 +- .../support/deploy/HttpdServerDeployment.java | 2 +- .../support/deploy/db/DbUnitDeployment.java | 2 +- .../AbstractExecutionFlowTestCase.java | 2 +- .../execution/BasicExecutionFlowTest.java | 18 +++++++++--------- 22 files changed, 47 insertions(+), 68 deletions(-) delete mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/Executable.java diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedAdminTask.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedAdminTask.java index 8fd0bcfd0..ab6c2ad16 100644 --- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedAdminTask.java +++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedAdminTask.java @@ -1,6 +1,5 @@ package org.argeo.slc.lib.detached; -import java.util.Map; import java.util.Properties; import java.util.UUID; @@ -10,16 +9,15 @@ import org.argeo.slc.SlcException; import org.argeo.slc.detached.DetachedAnswer; import org.argeo.slc.detached.DetachedClient; import org.argeo.slc.detached.DetachedRequest; -import org.argeo.slc.execution.Executable; -public class DetachedAdminTask implements Executable { +public class DetachedAdminTask implements Runnable { private final static Log log = LogFactory.getLog(DetachedAdminTask.class); private String action; private DetachedClient client; private Properties properties; - public void execute() { + public void run() { // Prepare and send request DetachedRequest request = new DetachedRequest(UUID.randomUUID() .toString()); diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java index 78d6024f9..6d5a6ed02 100644 --- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java +++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java @@ -34,7 +34,7 @@ public class Activator implements BundleActivator { public void start(BundleContext bundleContext) throws Exception { try { info("SLC OSGi bootstrap starting..."); -// installUrls(bundleContext, getDevLocationsUrls()); + // installUrls(bundleContext, getDevLocationsUrls()); installUrls(bundleContext, getLocationsUrls()); @@ -329,20 +329,18 @@ public class Activator implements BundleActivator { } } + /** Key is location */ protected static Map getInstalledBundles( BundleContext bundleContext) { Map installedBundles = new HashMap(); for (Bundle bundle : bundleContext.getBundles()) { - String key = bundle.getSymbolicName(); - if (key == null) { - key = bundle.getLocation(); - } - installedBundles.put(key, bundle); + installedBundles.put(bundle.getLocation(), bundle); } return installedBundles; } + /** Key is symbolic name */ protected static Map getBundles(BundleContext bundleContext) { Map installedBundles = new HashMap(); for (Bundle bundle : bundleContext.getBundles()) diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java index 13d393136..74be42ab0 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java @@ -1,9 +1,8 @@ package org.argeo.slc.deploy; import org.argeo.slc.build.Distribution; -import org.argeo.slc.execution.Executable; -public interface Deployment extends Executable{ +public interface Deployment extends Runnable{ public DeployedSystem getDeployedSystem(); public void setTargetData(TargetData targetData); @@ -11,7 +10,4 @@ public interface Deployment extends Executable{ public void setDeploymentData(DeploymentData deploymentData); public void setDistribution(Distribution distribution); - - public void execute(); - } diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/Executable.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/Executable.java deleted file mode 100644 index bc804bdf1..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/Executable.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.argeo.slc.execution; - -/** Any object which can perform processing */ -public interface Executable { - /** Executes the actions specified by the object */ - public void execute(); -} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java index ea568116b..c2d109960 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java @@ -1,7 +1,7 @@ package org.argeo.slc.execution; -public interface ExecutionFlow extends Executable { +public interface ExecutionFlow extends Runnable { public Object getParameter(String key); public Boolean isSetAsParameter(String key); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java index 37843d183..f18196a49 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java @@ -1,8 +1,7 @@ package org.argeo.slc.test; -import org.argeo.slc.execution.Executable; /** A test run that can be executed */ -public interface ExecutableTestRun extends TestRun, Executable { +public interface ExecutableTestRun extends TestRun, Runnable { } diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java index 8ea4d28e2..4bfd675a9 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java @@ -41,7 +41,7 @@ public class SlcDeployTask extends SAwareTask { log.trace("Overrides target data"); } - deployment.execute(); + deployment.run(); } /** diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java index 66a416c6e..730ae9485 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java @@ -112,7 +112,7 @@ public class SlcTestTask extends SAwareTask { } try { - ((ExecutableTestRun) testRun).execute(); + ((ExecutableTestRun) testRun).run(); } catch (RuntimeException e) { if (result != null) { SimpleResultPart errorPart = new SimpleResultPart( diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java index 1cac123a8..1bbf16821 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java @@ -109,7 +109,7 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule, .convertValues(executionFlowDescriptor)); ExecutionFlow flow = (ExecutionFlow) applicationContext.getBean( executionFlowDescriptor.getName(), ExecutionFlow.class); - flow.execute(); + flow.run(); } public void setApplicationContext(ApplicationContext applicationContext) diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java index f2c26f225..16105e241 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java @@ -10,7 +10,6 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRegistry; -import org.argeo.slc.execution.Executable; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionSpec; import org.argeo.slc.execution.ExecutionSpecAttribute; @@ -32,7 +31,7 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, private final ExecutionSpec executionSpec; private String name = null; private Map parameters = new HashMap(); - private List executables = new ArrayList(); + private List executables = new ArrayList(); private String path; private StructureRegistry registry = new TreeSRegistry(); @@ -93,15 +92,15 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, } - public void execute() { - for (Executable executable : executables) { - executable.execute(); + public void run() { + for (Runnable executable : executables) { + executable.run(); } } public void afterPropertiesSet() throws Exception { if (path != null) { - for (Executable executable : executables) { + for (Runnable executable : executables) { if (executable instanceof StructureAware) { ((StructureAware) executable).notifyCurrentPath( registry, new TreeSPath(path)); @@ -114,7 +113,7 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, this.name = name; } - public void setExecutables(List executables) { + public void setExecutables(List executables) { this.executables = executables; } @@ -144,8 +143,10 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean, Object paramValue = parameters.get(parameterName); if (specAttr instanceof ResourceSpecAttribute) { // deal with resources - Resource resource = resourceLoader.getResource(paramValue.toString()); - return ((ResourceSpecAttribute) specAttr).convertResource(resource); + Resource resource = resourceLoader.getResource(paramValue + .toString()); + return ((ResourceSpecAttribute) specAttr) + .convertResource(resource); } else { return paramValue; } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java index a352c89ba..c2abfed27 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java @@ -43,7 +43,7 @@ public class ExecutionAspect { executionContext.leaveFlow(executionFlow); } - @Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.execute())") + @Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.run())") public void flowExecution() { } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java index f6992cd32..e117a6989 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java @@ -1,12 +1,11 @@ package org.argeo.slc.core.execution.tasks; -import org.argeo.slc.execution.Executable; import org.argeo.slc.test.TestResult; -public class CloseTestResultTask implements Executable { +public class CloseTestResultTask implements Runnable { private TestResult testResult; - public void execute() { + public void run() { testResult.close(); } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java index eeead3888..5c9328990 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java @@ -2,15 +2,14 @@ package org.argeo.slc.core.execution.tasks; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.execution.Executable; -public class Echo implements Executable { +public class Echo implements Runnable { private final static Log defaultLog = LogFactory.getLog(Echo.class); private Log log; private String message; - public void execute() { + public void run() { log().info(message); } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java index e48cb8141..bb095684d 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java @@ -2,11 +2,9 @@ package org.argeo.slc.core.execution.tasks; import org.argeo.slc.SlcException; import org.argeo.slc.core.test.context.SimpleContextAware; -import org.argeo.slc.core.test.context.SimpleParentContextAware; -import org.argeo.slc.execution.Executable; import org.argeo.slc.test.context.ContextAware; -public class OverrideContextAware implements Executable { +public class OverrideContextAware implements Runnable { private ContextAware source; @@ -23,7 +21,7 @@ public class OverrideContextAware implements Executable { } - public void execute() { + public void run() { // override values if(source.getValues() != null) for(String key : source.getValues().keySet()) { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java index c14c629da..4da708cb0 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java @@ -6,13 +6,12 @@ import java.util.UUID; import org.argeo.slc.SlcException; import org.argeo.slc.deploy.DeployedSystem; import org.argeo.slc.deploy.DeployedSystemManager; -import org.argeo.slc.execution.Executable; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionRelated; import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.structure.StructureRegistry; -public class SlcManagerTask implements Executable, SlcExecutionRelated { +public class SlcManagerTask implements Runnable, SlcExecutionRelated { private String uuid; private String slcExecutionUuid; private String slcExecutionStepUuid; @@ -20,7 +19,7 @@ public class SlcManagerTask implements Executable, SlcExecutionRelated { private String action; private DeployedSystemManager manager; - public final void execute() { + public final void run() { uuid = UUID.randomUUID().toString(); executeActions(StructureRegistry.ALL); } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java index f5a9db5ca..574e21d9e 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SystemCall.java @@ -16,9 +16,8 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; -import org.argeo.slc.execution.Executable; -public class SystemCall implements Executable { +public class SystemCall implements Runnable { // TODO: specify environment variables private final Log log = LogFactory.getLog(getClass()); @@ -37,7 +36,7 @@ public class SystemCall implements Executable { private Map> osCommands = new HashMap>(); private Map osCmds = new HashMap(); - public void execute() { + public void run() { try { if (log.isTraceEnabled()) { log.debug("os.name=" + System.getProperty("os.name")); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java index b01e103ea..86b35323b 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java @@ -37,7 +37,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun, private TestResult testResult; /** Executes the underlying test definition. */ - public void execute() { + public void run() { uuid = UUID.randomUUID().toString(); if (testResult != null) testResult.notifyTestRun(this); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java index 32100b8b8..f72fe2da1 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java @@ -23,7 +23,7 @@ public class HttpdApplicationDeployment implements Deployment { private DeployEnvironment deployEnvironment; - public void execute() { + public void run() { try { deployEnvironment.unpackTo(distribution, targetData .getTargetRootLocation(), null); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java index 2abcc6d0e..0f22a88eb 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java @@ -9,7 +9,7 @@ import org.argeo.slc.deploy.TargetData; public class HttpdServerDeployment implements Deployment { private HttpdServerTargetData targetData; - public void execute() { + public void run() { // TODO Auto-generated method stub } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java index 64eb3091c..b6b8de343 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java @@ -25,7 +25,7 @@ public class DbUnitDeployment implements Deployment { private DbUnitDeploymentData deploymentData; private DbModel dbModel; - public void execute() { + public void run() { try { IDatabaseTester databaseTester = new DataSourceDatabaseTester( mxDatabase.getDataSource()); diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java index 365971add..a54107126 100644 --- a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java +++ b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java @@ -41,7 +41,7 @@ public abstract class AbstractExecutionFlowTestCase extends TestCase { protected void configureAndExecuteSlcFlow(String applicationContextSuffix, String beanName) { ConfigurableApplicationContext applicationContext = createApplicationContext(applicationContextSuffix); ExecutionFlow executionFlow = (ExecutionFlow) applicationContext.getBean(beanName); - executionFlow.execute(); + executionFlow.run(); applicationContext.close(); } diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/BasicExecutionFlowTest.java b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/BasicExecutionFlowTest.java index 57ccfa355..ae0a1fd58 100644 --- a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/BasicExecutionFlowTest.java +++ b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/BasicExecutionFlowTest.java @@ -25,7 +25,7 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { public void testSpecOverriding() throws Exception { ConfigurableApplicationContext applicationContext = createApplicationContext("specOverriding.xml"); - ((ExecutionFlow) applicationContext.getBean("flow2")).execute(); + ((ExecutionFlow) applicationContext.getBean("flow2")).run(); SimpleTestResult res = (SimpleTestResult) applicationContext .getBean("myTestResult"); validateTestResult(res); @@ -33,12 +33,12 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { public void testMultipleFlows() throws Exception { ConfigurableApplicationContext applicationContext = createApplicationContext("multipleFlow.xml"); - ((ExecutionFlow) applicationContext.getBean("flow1")).execute(); + ((ExecutionFlow) applicationContext.getBean("flow1")).run(); SimpleTestResult res = (SimpleTestResult) applicationContext .getBean("myTestResult"); validateTestResult(res); res.getParts().clear(); - ((ExecutionFlow) applicationContext.getBean("flow2")).execute(); + ((ExecutionFlow) applicationContext.getBean("flow2")).run(); validateTestResult(res, TestStatus.FAILED); applicationContext.close(); } @@ -51,7 +51,7 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { */ public void testPlaceHolders() throws Exception { ConfigurableApplicationContext applicationContext = createApplicationContext("placeHolders.cascading.xml"); - ((ExecutionFlow) applicationContext.getBean("flowA")).execute(); + ((ExecutionFlow) applicationContext.getBean("flowA")).run(); validateTestResult((SimpleTestResult) applicationContext .getBean("myTestResult")); applicationContext.close(); @@ -80,7 +80,7 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { executionParameters.put("p8", "e8"); executionContext.addVariables(executionParameters); - ((ExecutionFlow) applicationContext.getBean("flowA")).execute(); + ((ExecutionFlow) applicationContext.getBean("flowA")).run(); validateTestResult((SimpleTestResult) applicationContext .getBean("myTestResult")); applicationContext.close(); @@ -100,7 +100,7 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { executionParameters.put("p6", "e6"); executionContext.addVariables(executionParameters); - ((ExecutionFlow) applicationContext.getBean("flowA")).execute(); + ((ExecutionFlow) applicationContext.getBean("flowA")).run(); validateTestResult((SimpleTestResult) applicationContext .getBean("myTestResult")); applicationContext.close(); @@ -138,7 +138,7 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { ConfigurableApplicationContext applicationContext = createApplicationContext("listSetMap.xml"); ExecutionFlow executionFlow = (ExecutionFlow) applicationContext .getBean("myFlow"); - executionFlow.execute(); + executionFlow.run(); validateTestResult((SimpleTestResult) applicationContext .getBean("myTestResult")); @@ -152,12 +152,12 @@ public class BasicExecutionFlowTest extends AbstractExecutionFlowTestCase { public void testListSetMapMultipleFlows() throws Exception { ConfigurableApplicationContext applicationContext = createApplicationContext("listSetMapMultipleFlow.xml"); - ((ExecutionFlow) applicationContext.getBean("flow1")).execute(); + ((ExecutionFlow) applicationContext.getBean("flow1")).run(); SimpleTestResult res = (SimpleTestResult) applicationContext .getBean("myTestResult"); validateTestResult(res); res.getParts().clear(); - ((ExecutionFlow) applicationContext.getBean("flow2")).execute(); + ((ExecutionFlow) applicationContext.getBean("flow2")).run(); validateTestResult(res, TestStatus.FAILED); applicationContext.close(); } -- 2.39.2