From 3eba63ff1366613bc2d6fb5a08e48fbb89a2c509 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 26 Mar 2018 10:41:25 +0200 Subject: [PATCH] [Minor] code cleanup in planning tests --- .../li/strolch/planning/AssignActionTest.java | 25 +++++------------- .../li/strolch/planning/PlanActionTest.java | 24 +++++------------ .../li/strolch/planning/PlanActivityTest.java | 26 +++++-------------- 3 files changed, 18 insertions(+), 57 deletions(-) diff --git a/li.strolch.service/src/test/java/li/strolch/planning/AssignActionTest.java b/li.strolch.service/src/test/java/li/strolch/planning/AssignActionTest.java index be49f8ad9..db4cf6b5d 100644 --- a/li.strolch.service/src/test/java/li/strolch/planning/AssignActionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/planning/AssignActionTest.java @@ -15,30 +15,16 @@ */ package li.strolch.planning; -import static li.strolch.model.ModelGenerator.STATE_INTEGER_ID; -import static li.strolch.model.ModelGenerator.STATE_INTEGER_TIME_0; -import static li.strolch.model.ModelGenerator.STATE_TIME_0; -import static li.strolch.model.ModelGenerator.STATE_TIME_10; -import static li.strolch.model.ModelGenerator.STATE_TIME_20; +import static li.strolch.model.ModelGenerator.*; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.SortedSet; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import li.strolch.model.Locator; -import li.strolch.model.ModelGenerator; -import li.strolch.model.ParameterBag; -import li.strolch.model.Resource; -import li.strolch.model.State; -import li.strolch.model.Tags; +import li.strolch.model.*; import li.strolch.model.activity.Action; import li.strolch.model.parameter.IntegerParameter; -import li.strolch.model.parameter.Parameter; import li.strolch.model.timedstate.IntegerTimedState; import li.strolch.model.timedstate.StrolchTimedState; import li.strolch.model.timevalue.ITimeValue; @@ -48,8 +34,9 @@ import li.strolch.model.timevalue.IValueChange; import li.strolch.model.timevalue.impl.IntegerValue; import li.strolch.model.timevalue.impl.ValueChange; import li.strolch.persistence.api.StrolchTransaction; -import li.strolch.planning.AssignActionCommand; -import li.strolch.planning.PlanActionCommand; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Martin Smock @@ -182,7 +169,7 @@ public class AssignActionTest { */ protected static void createChanges(Action action) { - Parameter parameter = action.getParameter("objective", "quantity"); + IntegerParameter parameter = action.getParameter("objective", "quantity"); Integer quantity = parameter.getValue(); IValueChange startChange = new ValueChange<>(STATE_TIME_10, new IntegerValue(quantity)); diff --git a/li.strolch.service/src/test/java/li/strolch/planning/PlanActionTest.java b/li.strolch.service/src/test/java/li/strolch/planning/PlanActionTest.java index aadc35d4e..6be15375f 100644 --- a/li.strolch.service/src/test/java/li/strolch/planning/PlanActionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/planning/PlanActionTest.java @@ -15,30 +15,16 @@ */ package li.strolch.planning; -import static li.strolch.model.ModelGenerator.STATE_INTEGER_ID; -import static li.strolch.model.ModelGenerator.STATE_INTEGER_TIME_0; -import static li.strolch.model.ModelGenerator.STATE_TIME_0; -import static li.strolch.model.ModelGenerator.STATE_TIME_10; -import static li.strolch.model.ModelGenerator.STATE_TIME_20; +import static li.strolch.model.ModelGenerator.*; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.SortedSet; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import li.strolch.model.Locator; -import li.strolch.model.ModelGenerator; -import li.strolch.model.ParameterBag; -import li.strolch.model.Resource; -import li.strolch.model.State; -import li.strolch.model.Tags; +import li.strolch.model.*; import li.strolch.model.activity.Action; import li.strolch.model.parameter.IntegerParameter; -import li.strolch.model.parameter.Parameter; import li.strolch.model.timedstate.IntegerTimedState; import li.strolch.model.timedstate.StrolchTimedState; import li.strolch.model.timevalue.ITimeValue; @@ -48,7 +34,9 @@ import li.strolch.model.timevalue.IValueChange; import li.strolch.model.timevalue.impl.IntegerValue; import li.strolch.model.timevalue.impl.ValueChange; import li.strolch.persistence.api.StrolchTransaction; -import li.strolch.planning.PlanActionCommand; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Martin Smock @@ -139,7 +127,7 @@ public class PlanActionTest { */ protected static void createChanges(Action action) { - Parameter parameter = action.getParameter("objective", "quantity"); + IntegerParameter parameter = action.getParameter("objective", "quantity"); Integer quantity = parameter.getValue(); IValueChange startChange = new ValueChange<>(STATE_TIME_10, new IntegerValue(quantity)); diff --git a/li.strolch.service/src/test/java/li/strolch/planning/PlanActivityTest.java b/li.strolch.service/src/test/java/li/strolch/planning/PlanActivityTest.java index dfbde787c..bcab270c3 100644 --- a/li.strolch.service/src/test/java/li/strolch/planning/PlanActivityTest.java +++ b/li.strolch.service/src/test/java/li/strolch/planning/PlanActivityTest.java @@ -15,34 +15,18 @@ */ package li.strolch.planning; -import static li.strolch.model.ModelGenerator.STATE_INTEGER_ID; -import static li.strolch.model.ModelGenerator.STATE_INTEGER_TIME_0; -import static li.strolch.model.ModelGenerator.STATE_TIME_0; -import static li.strolch.model.ModelGenerator.STATE_TIME_10; -import static li.strolch.model.ModelGenerator.STATE_TIME_20; -import static li.strolch.model.ModelGenerator.STATE_TIME_30; -import static li.strolch.model.ModelGenerator.STATE_TIME_40; +import static li.strolch.model.ModelGenerator.*; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.SortedSet; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import li.strolch.model.Locator; -import li.strolch.model.ModelGenerator; -import li.strolch.model.ParameterBag; -import li.strolch.model.Resource; -import li.strolch.model.State; -import li.strolch.model.Tags; +import li.strolch.model.*; import li.strolch.model.activity.Action; import li.strolch.model.activity.Activity; import li.strolch.model.activity.TimeOrdering; import li.strolch.model.parameter.IntegerParameter; -import li.strolch.model.parameter.Parameter; import li.strolch.model.timedstate.IntegerTimedState; import li.strolch.model.timedstate.StrolchTimedState; import li.strolch.model.timevalue.ITimeValue; @@ -52,7 +36,9 @@ import li.strolch.model.timevalue.IValueChange; import li.strolch.model.timevalue.impl.IntegerValue; import li.strolch.model.timevalue.impl.ValueChange; import li.strolch.persistence.api.StrolchTransaction; -import li.strolch.planning.PlanActivityCommand; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Martin Smock @@ -229,7 +215,7 @@ public class PlanActivityTest { */ protected static void createChanges(Action action, Long start, Long end) { - Parameter parameter = action.getParameter("objective", "quantity"); + IntegerParameter parameter = action.getParameter("objective", "quantity"); Integer quantity = parameter.getValue(); IValueChange startChange = new ValueChange<>(start, new IntegerValue(quantity));