From a67e18af40af61f527553ac9018996b9d53d5745 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 16 Feb 2017 11:14:41 +0100 Subject: [PATCH] [New] Added RuntimeMock.doServiceAssertResult() --- .../execution/StartActivityExecutionServiceTest.java | 8 ++++---- .../java/li/strolch/testbase/runtime/RuntimeMock.java | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java b/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java index 6ebd30acf..853dc7e54 100644 --- a/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java @@ -45,7 +45,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock { arg.realm = "execution"; arg.locator = activityLoc; - doService(cert, svc, arg); + doServiceAssertResult(cert, svc, arg); try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) { Action action = tx.findElement(activityLoc.append("produce")); @@ -72,7 +72,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock { arg.realm = "execution"; arg.locator = activityLoc; - doService(cert, svc, arg); + doServiceAssertResult(cert, svc, arg); try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) { Action action; @@ -148,7 +148,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock { arg.realm = "execution"; arg.locator = activityLoc; - doService(cert, svc, arg); + doServiceAssertResult(cert, svc, arg); try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) { Action action; @@ -187,7 +187,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock { arg.realm = "execution"; arg.locator = activityLoc; - doService(cert, svc, arg); + doServiceAssertResult(cert, svc, arg); Thread.sleep(1000L); diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java b/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java index 783bbfd93..3beb3b1c4 100644 --- a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java +++ b/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java @@ -175,6 +175,12 @@ public class RuntimeMock { public U doService(Certificate certificate, Service service, T argument) { U result = getServiceHandler().doService(certificate, service, argument); + return result; + } + + public U doServiceAssertResult(Certificate certificate, + Service service, T argument) { + U result = getServiceHandler().doService(certificate, service, argument); assertServiceResult(ServiceResultState.SUCCESS, result); return result; }