From: Sweidan Omar Date: Tue, 18 Jan 2022 22:55:14 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=8c447d8d8a68817b26f7360ac0e8fdad872db5f5;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32777 --- diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunnableAction.java similarity index 83% rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunnableAction.java index d9a9b9fa..d71d9034 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunnableAction.java @@ -4,7 +4,7 @@ import user.commons.JobStatus; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; -public class ExecuteRunableAction implements IJobStatusAction { +public class ExecuteRunnableAction implements IJobStatusAction { @Override public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) { jobRuntime.setStatus(JobStatus.WAIT_EXECUTOR); diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunnableAction.java similarity index 86% rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunableAction.java rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunnableAction.java index 988623dd..4522c675 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunableAction.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunnableAction.java @@ -6,7 +6,7 @@ import user.commons.JobStatus; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; -public class FinishRunableAction implements IJobStatusAction { +public class FinishRunnableAction implements IJobStatusAction { @Override public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) { // jobs.remove(job.getJobId()); diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunnableAction.java similarity index 80% rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunableAction.java rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunnableAction.java index 49881039..e8e9ac2c 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunableAction.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunnableAction.java @@ -4,7 +4,7 @@ import user.commons.JobStatus; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; -public class MessageRunableAction implements IJobStatusAction { +public class MessageRunnableAction implements IJobStatusAction { @Override public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) { diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunnableAction.java similarity index 82% rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunableAction.java rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunnableAction.java index a05f6a3b..7b66f8f7 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunableAction.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunnableAction.java @@ -4,7 +4,7 @@ import user.commons.JobStatus; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; -public class SuspendRunableAction implements IJobStatusAction { +public class SuspendRunnableAction implements IJobStatusAction { @Override public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) { diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunableActionTest.java deleted file mode 100644 index 3dc47a16..00000000 --- a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunableActionTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package user.jobengine.server.actions; - -import org.jmock.Expectations; -import org.junit.Test; - -import user.commons.JobStatus; - -public class CancelRunableActionTest extends ActionTest { - - @Test - public void testProcessAction() throws Exception { - // Fixture - final IJobStatusAction sut = new CancelRunableAction(); - context.checking(new Expectations() {{ - one (jobRuntime).setStatus(JobStatus.CANCELED); - one (jobRuntime).setDescription("Canceled by user"); - one (jobRuntime).reset(); - one (jobEngine).removeFromRunQueue(jobRuntime); - }}); - - // Exercise, Verify - sut.processAction(jobEngine, jobRuntime); - } -} diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunnableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunnableActionTest.java new file mode 100644 index 00000000..7b12a76e --- /dev/null +++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunnableActionTest.java @@ -0,0 +1,26 @@ +package user.jobengine.server.actions; + +import org.jmock.Expectations; +import org.junit.Test; + +import user.commons.JobStatus; + +public class CancelRunnableActionTest extends ActionTest { + + @Test + public void testProcessAction() throws Exception { + // Fixture + final IJobStatusAction sut = new CancelRunnableAction(); + context.checking(new Expectations() { + { + one(jobRuntime).setStatus(JobStatus.CANCELED); + one(jobRuntime).setDescription("Canceled by user"); + one(jobRuntime).reset(); + one(jobEngine).removeFromRunQueue(jobRuntime); + } + }); + + // Exercise, Verify + sut.processAction(jobEngine, jobRuntime); + } +} diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunnableActionTest.java similarity index 79% rename from server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunableActionTest.java rename to server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunnableActionTest.java index f1c76ab0..6e41b4e5 100644 --- a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunableActionTest.java +++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunnableActionTest.java @@ -5,12 +5,12 @@ import org.junit.Test; import user.commons.JobStatus; -public class ExecuteRunableActionTest extends ActionTest { +public class ExecuteRunnableActionTest extends ActionTest { @Test public void testProcessAction() throws Exception { // Fixture - final IJobStatusAction sut = new ExecuteRunableAction(); + final IJobStatusAction sut = new ExecuteRunnableAction(); context.checking(new Expectations() {{ one (jobRuntime).setStatus(JobStatus.WAIT_EXECUTOR); one (jobRuntime).saveStack(); diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunnableActionTest.java similarity index 82% rename from server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunableActionTest.java rename to server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunnableActionTest.java index 1a6243c8..1c5c9d99 100644 --- a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunableActionTest.java +++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunnableActionTest.java @@ -7,12 +7,12 @@ import org.junit.Test; import user.commons.JobStatus; -public class FinishRunableActionTest extends ActionTest { +public class FinishRunnableActionTest extends ActionTest { @Test public void testProcessAction() throws Exception { // Fixture - IJobStatusAction sut = new FinishRunableAction(); + IJobStatusAction sut = new FinishRunnableAction(); context.checking(new Expectations() {{ one (jobRuntime).setFinished(with(any(Timestamp.class))); one (jobRuntime).setStatus(JobStatus.FINISHED);