From b7b9d63e7937afad60748339987eacb1a46f4885 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 22 Sep 2016 21:06:57 +0200 Subject: [PATCH] [Major] Refactored services to use generic Arguments were applicable --- .../RemoveActivityCollectionCommand.java | 86 +++++++++++++++++++ .../strolch/service/AddActivityService.java | 3 +- .../li/strolch/service/AddOrderService.java | 3 +- .../strolch/service/AddResourceService.java | 3 +- .../li/strolch/service/ClearModelService.java | 3 +- .../li/strolch/service/LocatorArgument.java | 9 ++ .../strolch/service/LocatorListArgument.java | 11 +++ .../RemoveActivityCollectionService.java | 60 +++++++++++++ .../service/RemoveActivityService.java | 14 +-- .../service/RemoveOrderCollectionService.java | 11 +-- .../strolch/service/RemoveOrderService.java | 14 +-- .../RemoveResourceCollectionService.java | 11 +-- .../service/RemoveResourceService.java | 14 +-- .../service/StrolchElementArgument.java | 9 ++ .../service/UpdateActivityService.java | 3 +- .../strolch/service/UpdateOrderService.java | 3 +- .../service/UpdateResourceService.java | 3 +- .../service/XmlExportModelService.java | 3 +- .../service/XmlImportModelService.java | 2 +- .../parameter/AddParameterService.java | 3 +- .../parameter/RemoveParameterService.java | 15 ++-- .../parameter/SetParameterService.java | 3 +- ...egeAddOrReplacePrivilegeOnRoleService.java | 3 +- ...ivilegeRemovePrivilegeFromRoleService.java | 3 +- .../roles/PrivilegeRemoveRoleService.java | 3 +- .../roles/PrivilegeUpdateRoleService.java | 3 +- .../users/PrivilegeAddRoleToUserService.java | 3 +- .../users/PrivilegeAddUserService.java | 3 +- .../users/PrivilegeRemoveUserService.java | 3 +- .../users/PrivilegeSetUserLocaleService.java | 3 +- .../PrivilegeSetUserPasswordService.java | 3 +- .../users/PrivilegeSetUserStateService.java | 3 +- .../users/PrivilegeUpdateUserService.java | 3 +- .../RemoveActivityCollectionCommandTest.java | 74 ++++++++++++++++ .../command/plan/AssignActionTest.java | 2 + .../strolch/command/plan/PlanActionTest.java | 1 + .../command/plan/PlanActivityTest.java | 1 + .../strolch/command/plan/ShiftActionTest.java | 2 + .../service/RemoveActivityServiceTest.java | 3 +- .../RemoveOrderCollectionServiceTest.java | 7 +- .../service/RemoveOrderServiceTest.java | 7 +- .../RemoveResourceCollectionServiceTest.java | 7 +- .../service/RemoveResourceServiceTest.java | 7 +- .../parameter/RemoveParameterServiceTest.java | 12 +-- .../resources/svctest/data/Activities.xml | 44 ++++++++++ 45 files changed, 382 insertions(+), 104 deletions(-) create mode 100644 li.strolch.service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java create mode 100644 li.strolch.service/src/main/java/li/strolch/service/LocatorArgument.java create mode 100644 li.strolch.service/src/main/java/li/strolch/service/LocatorListArgument.java create mode 100644 li.strolch.service/src/main/java/li/strolch/service/RemoveActivityCollectionService.java create mode 100644 li.strolch.service/src/main/java/li/strolch/service/StrolchElementArgument.java create mode 100644 li.strolch.service/src/test/java/li/strolch/command/RemoveActivityCollectionCommandTest.java diff --git a/li.strolch.service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java b/li.strolch.service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java new file mode 100644 index 000000000..b745ff2ea --- /dev/null +++ b/li.strolch.service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java @@ -0,0 +1,86 @@ +/* + * Copyright 2013 Robert von Burg + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package li.strolch.command; + +import java.text.MessageFormat; +import java.util.List; + +import li.strolch.agent.api.ActivityMap; +import li.strolch.agent.api.ComponentContainer; +import li.strolch.exception.StrolchException; +import li.strolch.model.activity.Activity; +import li.strolch.persistence.api.StrolchTransaction; +import li.strolch.service.api.Command; +import li.strolch.utils.dbc.DBC; + +/** + * @author Robert von Burg + */ +public class RemoveActivityCollectionCommand extends Command { + + private List activities; + + /** + * @param tx + */ + public RemoveActivityCollectionCommand(ComponentContainer container, StrolchTransaction tx) { + super(container, tx); + } + + /** + * @param activities + * the activities to set + */ + public void setActivities(List activities) { + this.activities = activities; + } + + @Override + public void validate() { + DBC.PRE.assertNotNull("Activity list may not be null!", this.activities); + } + + @Override + public void doCommand() { + + for (Activity activity : this.activities) { + tx().lock(activity); + } + + ActivityMap activityMap = tx().getActivityMap(); + for (Activity activity : this.activities) { + if (!activityMap.hasElement(tx(), activity.getType(), activity.getId())) { + String msg = "The Activity {0} can not be removed as it does not exist!"; + msg = MessageFormat.format(msg, activity.getLocator()); + throw new StrolchException(msg); + } + } + + activityMap.removeAll(tx(), this.activities); + } + + @Override + public void undo() { + if (this.activities != null && !this.activities.isEmpty() && tx().isRollingBack()) { + ActivityMap activityMap = tx().getActivityMap(); + for (Activity activity : this.activities) { + if (!activityMap.hasElement(tx(), activity.getType(), activity.getId())) { + activityMap.add(tx(), activity); + } + } + } + } +} diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddActivityService.java b/li.strolch.service/src/main/java/li/strolch/service/AddActivityService.java index 4e8f29033..ccc0b6f07 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/AddActivityService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/AddActivityService.java @@ -21,6 +21,7 @@ import li.strolch.persistence.api.StrolchTransaction; import li.strolch.service.api.AbstractService; import li.strolch.service.api.ServiceArgument; import li.strolch.service.api.ServiceResult; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg @@ -31,7 +32,7 @@ public class AddActivityService extends AbstractService @@ -31,7 +32,7 @@ public class AddOrderService extends AbstractService @@ -31,7 +32,7 @@ public class AddResourceService extends AbstractService locators; +} diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityCollectionService.java b/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityCollectionService.java new file mode 100644 index 000000000..64d4dcd94 --- /dev/null +++ b/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityCollectionService.java @@ -0,0 +1,60 @@ +/* + * Copyright 2013 Robert von Burg + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package li.strolch.service; + +import java.util.ArrayList; +import java.util.List; + +import li.strolch.command.RemoveActivityCollectionCommand; +import li.strolch.model.Locator; +import li.strolch.model.activity.Activity; +import li.strolch.persistence.api.StrolchTransaction; +import li.strolch.service.api.AbstractService; +import li.strolch.service.api.ServiceResult; + +/** + * @author Robert von Burg + */ +public class RemoveActivityCollectionService extends AbstractService { + + private static final long serialVersionUID = 1L; + + @Override + protected ServiceResult getResultInstance() { + return new ServiceResult(); + } + + @Override + protected ServiceResult internalDoService(LocatorListArgument arg) { + + try (StrolchTransaction tx = openTx(arg.realm)) { + + List activities = new ArrayList<>(arg.locators.size()); + for (Locator locator : arg.locators) { + Activity resource = tx.findElement(locator); + activities.add(resource); + } + + RemoveActivityCollectionCommand command = new RemoveActivityCollectionCommand(getContainer(), tx); + command.setActivities(activities); + + tx.addCommand(command); + tx.commitOnClose(); + } + + return ServiceResult.success(); + } +} diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityService.java b/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityService.java index 4787a9631..623a9364f 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityService.java @@ -16,27 +16,26 @@ package li.strolch.service; import li.strolch.command.RemoveActivityCommand; -import li.strolch.model.Locator; import li.strolch.model.activity.Activity; import li.strolch.persistence.api.StrolchTransaction; import li.strolch.service.api.AbstractService; -import li.strolch.service.api.ServiceArgument; import li.strolch.service.api.ServiceResult; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg */ -public class RemoveActivityService extends AbstractService { +public class RemoveActivityService extends AbstractService { private static final long serialVersionUID = 1L; @Override protected ServiceResult getResultInstance() { - return new ServiceResult(); + return new ServiceResult(ServiceResultState.FAILED); } @Override - protected ServiceResult internalDoService(RemoveActivityArg arg) { + protected ServiceResult internalDoService(LocatorArgument arg) { try (StrolchTransaction tx = openTx(arg.realm)) { @@ -51,9 +50,4 @@ public class RemoveActivityService extends AbstractService */ -public class RemoveOrderCollectionService extends - AbstractService { +public class RemoveOrderCollectionService extends AbstractService { private static final long serialVersionUID = 1L; @@ -40,7 +38,7 @@ public class RemoveOrderCollectionService extends } @Override - protected ServiceResult internalDoService(RemoveOrderCollectionArg arg) { + protected ServiceResult internalDoService(LocatorListArgument arg) { try (StrolchTransaction tx = openTx(arg.realm)) { @@ -59,9 +57,4 @@ public class RemoveOrderCollectionService extends return ServiceResult.success(); } - - public static class RemoveOrderCollectionArg extends ServiceArgument { - private static final long serialVersionUID = 1L; - public List locators; - } } diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveOrderService.java b/li.strolch.service/src/main/java/li/strolch/service/RemoveOrderService.java index e109909bb..f26263f06 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/RemoveOrderService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/RemoveOrderService.java @@ -16,27 +16,26 @@ package li.strolch.service; import li.strolch.command.RemoveOrderCommand; -import li.strolch.model.Locator; import li.strolch.model.Order; import li.strolch.persistence.api.StrolchTransaction; import li.strolch.service.api.AbstractService; -import li.strolch.service.api.ServiceArgument; import li.strolch.service.api.ServiceResult; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg */ -public class RemoveOrderService extends AbstractService { +public class RemoveOrderService extends AbstractService { private static final long serialVersionUID = 1L; @Override protected ServiceResult getResultInstance() { - return new ServiceResult(); + return new ServiceResult(ServiceResultState.FAILED); } @Override - protected ServiceResult internalDoService(RemoveOrderArg arg) { + protected ServiceResult internalDoService(LocatorArgument arg) { try (StrolchTransaction tx = openTx(arg.realm)) { @@ -51,9 +50,4 @@ public class RemoveOrderService extends AbstractService */ -public class RemoveResourceCollectionService extends - AbstractService { +public class RemoveResourceCollectionService extends AbstractService { private static final long serialVersionUID = 1L; @@ -40,7 +38,7 @@ public class RemoveResourceCollectionService extends } @Override - protected ServiceResult internalDoService(RemoveResourceCollectionArg arg) { + protected ServiceResult internalDoService(LocatorListArgument arg) { try (StrolchTransaction tx = openTx(arg.realm)) { @@ -59,9 +57,4 @@ public class RemoveResourceCollectionService extends return ServiceResult.success(); } - - public static class RemoveResourceCollectionArg extends ServiceArgument { - private static final long serialVersionUID = 1L; - public List locators; - } } diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveResourceService.java b/li.strolch.service/src/main/java/li/strolch/service/RemoveResourceService.java index 6085565bd..865d5e28d 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/RemoveResourceService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/RemoveResourceService.java @@ -16,27 +16,26 @@ package li.strolch.service; import li.strolch.command.RemoveResourceCommand; -import li.strolch.model.Locator; import li.strolch.model.Resource; import li.strolch.persistence.api.StrolchTransaction; import li.strolch.service.api.AbstractService; -import li.strolch.service.api.ServiceArgument; import li.strolch.service.api.ServiceResult; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg */ -public class RemoveResourceService extends AbstractService { +public class RemoveResourceService extends AbstractService { private static final long serialVersionUID = 1L; @Override protected ServiceResult getResultInstance() { - return new ServiceResult(); + return new ServiceResult(ServiceResultState.FAILED); } @Override - protected ServiceResult internalDoService(RemoveResourceArg arg) { + protected ServiceResult internalDoService(LocatorArgument arg) { try (StrolchTransaction tx = openTx(arg.realm)) { @@ -51,9 +50,4 @@ public class RemoveResourceService extends AbstractService @@ -31,7 +32,7 @@ public class UpdateActivityService extends AbstractService @@ -31,7 +32,7 @@ public class UpdateOrderService extends AbstractService @@ -31,7 +32,7 @@ public class UpdateResourceService extends AbstractService @@ -33,7 +34,7 @@ public class AddParameterService extends AbstractService */ -public class RemoveParameterService extends AbstractService { +public class RemoveParameterService extends AbstractService { private static final long serialVersionUID = 1L; @Override protected ServiceResult getResultInstance() { - return new ServiceResult(); + return new ServiceResult(ServiceResultState.FAILED); } @Override - protected ServiceResult internalDoService(RemoveParameterArg arg) { + protected ServiceResult internalDoService(LocatorArgument arg) { try (StrolchTransaction tx = openTx(arg.realm)) { @@ -52,9 +52,4 @@ public class RemoveParameterService extends AbstractService @@ -32,7 +33,7 @@ public class SetParameterService extends AbstractService @@ -33,7 +34,7 @@ public class PrivilegeAddOrReplacePrivilegeOnRoleService @Override protected PrivilegeRoleResult getResultInstance() { - return new PrivilegeRoleResult(); + return new PrivilegeRoleResult(ServiceResultState.FAILED); } @Override diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java index 7a5eb4ed0..5aa812c11 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java @@ -22,6 +22,7 @@ import li.strolch.privilege.handler.PrivilegeHandler; import li.strolch.privilege.model.RoleRep; import li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants; import li.strolch.service.api.AbstractService; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg @@ -33,7 +34,7 @@ public class PrivilegeRemovePrivilegeFromRoleService @Override protected PrivilegeRoleResult getResultInstance() { - return new PrivilegeRoleResult(); + return new PrivilegeRoleResult(ServiceResultState.FAILED); } @Override diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java index da76447f2..3b9c878c6 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java @@ -22,6 +22,7 @@ import li.strolch.privilege.handler.PrivilegeHandler; import li.strolch.privilege.model.RoleRep; import li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants; import li.strolch.service.api.AbstractService; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg @@ -32,7 +33,7 @@ public class PrivilegeRemoveRoleService extends AbstractService @@ -32,7 +33,7 @@ public class PrivilegeUpdateRoleService extends AbstractService @@ -33,7 +34,7 @@ public class PrivilegeAddRoleToUserService @Override protected PrivilegeUserResult getResultInstance() { - return new PrivilegeUserResult(); + return new PrivilegeUserResult(ServiceResultState.FAILED); } @Override diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java index 6e053a087..ec111c911 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java @@ -22,6 +22,7 @@ import li.strolch.privilege.handler.PrivilegeHandler; import li.strolch.privilege.model.UserRep; import li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants; import li.strolch.service.api.AbstractService; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg @@ -32,7 +33,7 @@ public class PrivilegeAddUserService extends AbstractService @@ -32,7 +33,7 @@ public class PrivilegeRemoveUserService extends AbstractService @@ -33,7 +34,7 @@ public class PrivilegeSetUserLocaleService @Override protected PrivilegeUserResult getResultInstance() { - return new PrivilegeUserResult(); + return new PrivilegeUserResult(ServiceResultState.FAILED); } @Override diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java index 227d03a6b..6d32edff9 100644 --- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java +++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java @@ -22,6 +22,7 @@ import li.strolch.privilege.handler.PrivilegeHandler; import li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants; import li.strolch.service.api.AbstractService; import li.strolch.service.api.ServiceResult; +import li.strolch.service.api.ServiceResultState; /** * @author Robert von Burg @@ -32,7 +33,7 @@ public class PrivilegeSetUserPasswordService extends AbstractService @@ -32,7 +33,7 @@ public class PrivilegeSetUserStateService extends AbstractService @@ -32,7 +33,7 @@ public class PrivilegeUpdateUserService extends AbstractService + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package li.strolch.command; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Before; + +import li.strolch.agent.api.ComponentContainer; +import li.strolch.model.Locator; +import li.strolch.model.Tags; +import li.strolch.model.activity.Activity; +import li.strolch.persistence.api.StrolchTransaction; +import li.strolch.service.api.Command; + +/** + * @author Robert von Burg + */ +public class RemoveActivityCollectionCommandTest extends AbstractRealmCommandTest { + + private List locators; + + @Before + public void before() { + this.locators = new ArrayList<>(); + this.locators.add(Locator.newBuilder(Tags.ACTIVITY, "ActivityType", "activity_1").build()); + this.locators.add(Locator.newBuilder(Tags.ACTIVITY, "ActivityType", "activity_2").build()); + this.locators.add(Locator.newBuilder(Tags.ACTIVITY, "ActivityType", "activity_3").build()); + } + + @Override + protected Command getCommandInstance(ComponentContainer container, StrolchTransaction tx) { + + List activities = new ArrayList<>(this.locators.size()); + for (Locator locator : this.locators) { + activities.add((Activity) tx.findElement(locator)); + } + + RemoveActivityCollectionCommand command = new RemoveActivityCollectionCommand(container, tx); + command.setActivities(activities); + return command; + } + + @Override + protected void validateAfterCommand(ComponentContainer container, StrolchTransaction tx) { + for (Locator locator : locators) { + assertFalse(tx.getActivityMap().hasElement(tx, locator.get(1), locator.get(2))); + } + } + + @Override + protected void validateAfterCommandFailed(ComponentContainer container, StrolchTransaction tx) { + for (Locator locator : locators) { + assertTrue(tx.getActivityMap().hasElement(tx, locator.get(1), locator.get(2))); + } + } +} diff --git a/li.strolch.service/src/test/java/li/strolch/command/plan/AssignActionTest.java b/li.strolch.service/src/test/java/li/strolch/command/plan/AssignActionTest.java index bb4f66f1b..50f89c5b4 100644 --- a/li.strolch.service/src/test/java/li/strolch/command/plan/AssignActionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/command/plan/AssignActionTest.java @@ -30,6 +30,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import li.strolch.command.planning.AssignActionCommand; +import li.strolch.command.planning.PlanActionCommand; import li.strolch.model.Locator; import li.strolch.model.ModelGenerator; import li.strolch.model.ParameterBag; diff --git a/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActionTest.java b/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActionTest.java index c23f0742a..3b5ad0fb8 100644 --- a/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActionTest.java @@ -30,6 +30,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import li.strolch.command.planning.PlanActionCommand; import li.strolch.model.Locator; import li.strolch.model.ModelGenerator; import li.strolch.model.ParameterBag; diff --git a/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActivityTest.java b/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActivityTest.java index 18117d034..dd80bbb61 100644 --- a/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActivityTest.java +++ b/li.strolch.service/src/test/java/li/strolch/command/plan/PlanActivityTest.java @@ -32,6 +32,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import li.strolch.command.planning.PlanActivityCommand; import li.strolch.model.Locator; import li.strolch.model.ModelGenerator; import li.strolch.model.ParameterBag; diff --git a/li.strolch.service/src/test/java/li/strolch/command/plan/ShiftActionTest.java b/li.strolch.service/src/test/java/li/strolch/command/plan/ShiftActionTest.java index 37239d990..dae4476dd 100644 --- a/li.strolch.service/src/test/java/li/strolch/command/plan/ShiftActionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/command/plan/ShiftActionTest.java @@ -31,6 +31,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import li.strolch.command.planning.PlanActionCommand; +import li.strolch.command.planning.ShiftActionCommand; import li.strolch.model.Locator; import li.strolch.model.ModelGenerator; import li.strolch.model.ParameterBag; diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java index d449ab45b..fa9838838 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java @@ -19,7 +19,6 @@ import org.junit.Test; import li.strolch.model.Locator; import li.strolch.model.Tags; -import li.strolch.service.RemoveActivityService.RemoveActivityArg; import li.strolch.service.test.AbstractRealmServiceTest; /** @@ -30,7 +29,7 @@ public class RemoveActivityServiceTest extends AbstractRealmServiceTest { @Test public void runTest() { - RemoveActivityArg arg = new RemoveActivityArg(); + LocatorArgument arg = new LocatorArgument(); arg.locator = Locator.newBuilder(Tags.ACTIVITY, "ActivityType", "activity_1").build(); runServiceInAllRealmTypes(RemoveActivityService.class, arg); diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java index 5f1a2169c..58ddc09e5 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java @@ -17,13 +17,12 @@ package li.strolch.service; import java.util.ArrayList; +import org.junit.Test; + import li.strolch.model.Locator; import li.strolch.model.Tags; -import li.strolch.service.RemoveOrderCollectionService.RemoveOrderCollectionArg; import li.strolch.service.test.AbstractRealmServiceTest; -import org.junit.Test; - /** * @author Robert von Burg */ @@ -32,7 +31,7 @@ public class RemoveOrderCollectionServiceTest extends AbstractRealmServiceTest { @Test public void runTest() { - RemoveOrderCollectionArg arg = new RemoveOrderCollectionArg(); + LocatorListArgument arg = new LocatorListArgument(); ArrayList locators = new ArrayList<>(); locators.add(Locator.newBuilder(Tags.ORDER, "TestType", "@1").build()); diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java index 483958aff..b3db9098e 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java @@ -15,13 +15,12 @@ */ package li.strolch.service; +import org.junit.Test; + import li.strolch.model.Locator; import li.strolch.model.Tags; -import li.strolch.service.RemoveOrderService.RemoveOrderArg; import li.strolch.service.test.AbstractRealmServiceTest; -import org.junit.Test; - /** * @author Robert von Burg */ @@ -30,7 +29,7 @@ public class RemoveOrderServiceTest extends AbstractRealmServiceTest { @Test public void runTest() { - RemoveOrderArg arg = new RemoveOrderArg(); + LocatorArgument arg = new LocatorArgument(); arg.locator = Locator.newBuilder(Tags.ORDER, "TestType", "@3").build(); runServiceInAllRealmTypes(RemoveOrderService.class, arg); diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java index 13dfb3d31..57c490e86 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java @@ -17,13 +17,12 @@ package li.strolch.service; import java.util.ArrayList; +import org.junit.Test; + import li.strolch.model.Locator; import li.strolch.model.Tags; -import li.strolch.service.RemoveResourceCollectionService.RemoveResourceCollectionArg; import li.strolch.service.test.AbstractRealmServiceTest; -import org.junit.Test; - /** * @author Robert von Burg */ @@ -32,7 +31,7 @@ public class RemoveResourceCollectionServiceTest extends AbstractRealmServiceTes @Test public void runTest() { - RemoveResourceCollectionArg arg = new RemoveResourceCollectionArg(); + LocatorListArgument arg = new LocatorListArgument(); ArrayList locators = new ArrayList<>(); locators.add(Locator.newBuilder(Tags.RESOURCE, "Enumeration", "salutations").build()); diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java index 3db54698d..84125615c 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java @@ -15,13 +15,12 @@ */ package li.strolch.service; +import org.junit.Test; + import li.strolch.model.Locator; import li.strolch.model.Tags; -import li.strolch.service.RemoveResourceService.RemoveResourceArg; import li.strolch.service.test.AbstractRealmServiceTest; -import org.junit.Test; - /** * @author Robert von Burg */ @@ -30,7 +29,7 @@ public class RemoveResourceServiceTest extends AbstractRealmServiceTest { @Test public void runTest() { - RemoveResourceArg arg = new RemoveResourceArg(); + LocatorArgument arg = new LocatorArgument(); arg.locator = Locator.newBuilder(Tags.RESOURCE, "Enumeration", "sex").build(); runServiceInAllRealmTypes(RemoveResourceService.class, arg); diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/parameter/RemoveParameterServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/test/parameter/RemoveParameterServiceTest.java index c67dc683c..5e6bd01de 100644 --- a/li.strolch.service/src/test/java/li/strolch/service/test/parameter/RemoveParameterServiceTest.java +++ b/li.strolch.service/src/test/java/li/strolch/service/test/parameter/RemoveParameterServiceTest.java @@ -15,13 +15,13 @@ */ package li.strolch.service.test.parameter; -import li.strolch.model.Locator; -import li.strolch.service.parameter.RemoveParameterService; -import li.strolch.service.parameter.RemoveParameterService.RemoveParameterArg; -import li.strolch.service.test.AbstractRealmServiceTest; - import org.junit.Test; +import li.strolch.model.Locator; +import li.strolch.service.LocatorArgument; +import li.strolch.service.parameter.RemoveParameterService; +import li.strolch.service.test.AbstractRealmServiceTest; + /** * @author Robert von Burg */ @@ -30,7 +30,7 @@ public class RemoveParameterServiceTest extends AbstractRealmServiceTest { @Test public void runTest() { - RemoveParameterArg arg = new RemoveParameterArg(); + LocatorArgument arg = new LocatorArgument(); arg.locator = Locator.valueOf("Resource/Ball/yellow/Bag/parameters/owner"); runServiceInAllRealmTypes(RemoveParameterService.class, arg); diff --git a/li.strolch.service/src/test/resources/svctest/data/Activities.xml b/li.strolch.service/src/test/resources/svctest/data/Activities.xml index bdf616fc6..00605a2e5 100644 --- a/li.strolch.service/src/test/resources/svctest/data/Activities.xml +++ b/li.strolch.service/src/test/resources/svctest/data/Activities.xml @@ -23,4 +23,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file