From 851623394314e3c90b134c0cb4d16ca2a54e0d0c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 28 Sep 2018 18:53:47 +0200 Subject: [PATCH] [Minor] compile error fix in ShiftActionTest --- .../li/strolch/planning/ShiftActionTest.java | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/li.strolch.service/src/test/java/li/strolch/planning/ShiftActionTest.java b/li.strolch.service/src/test/java/li/strolch/planning/ShiftActionTest.java index e77e78a57..df064a948 100644 --- a/li.strolch.service/src/test/java/li/strolch/planning/ShiftActionTest.java +++ b/li.strolch.service/src/test/java/li/strolch/planning/ShiftActionTest.java @@ -15,31 +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.STATE_TIME_30; +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; @@ -49,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.PlanActionCommand; -import li.strolch.planning.ShiftActionCommand; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Martin Smock @@ -152,7 +138,7 @@ public class ShiftActionTest { */ 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));