[Minor] code cleanup in planning tests
This commit is contained in:
parent
62fb8671fb
commit
3eba63ff13
|
@ -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 <martin.smock@bluewin.ch>
|
||||
|
@ -182,7 +169,7 @@ public class AssignActionTest {
|
|||
*/
|
||||
protected static void createChanges(Action action) {
|
||||
|
||||
Parameter<Integer> parameter = action.getParameter("objective", "quantity");
|
||||
IntegerParameter parameter = action.getParameter("objective", "quantity");
|
||||
Integer quantity = parameter.getValue();
|
||||
|
||||
IValueChange<IntegerValue> startChange = new ValueChange<>(STATE_TIME_10, new IntegerValue(quantity));
|
||||
|
|
|
@ -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 <martin.smock@bluewin.ch>
|
||||
|
@ -139,7 +127,7 @@ public class PlanActionTest {
|
|||
*/
|
||||
protected static void createChanges(Action action) {
|
||||
|
||||
Parameter<Integer> parameter = action.getParameter("objective", "quantity");
|
||||
IntegerParameter parameter = action.getParameter("objective", "quantity");
|
||||
Integer quantity = parameter.getValue();
|
||||
|
||||
IValueChange<IntegerValue> startChange = new ValueChange<>(STATE_TIME_10, new IntegerValue(quantity));
|
||||
|
|
|
@ -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 <martin.smock@bluewin.ch>
|
||||
|
@ -229,7 +215,7 @@ public class PlanActivityTest {
|
|||
*/
|
||||
protected static void createChanges(Action action, Long start, Long end) {
|
||||
|
||||
Parameter<Integer> parameter = action.getParameter("objective", "quantity");
|
||||
IntegerParameter parameter = action.getParameter("objective", "quantity");
|
||||
Integer quantity = parameter.getValue();
|
||||
|
||||
IValueChange<IntegerValue> startChange = new ValueChange<>(start, new IntegerValue(quantity));
|
||||
|
|
Loading…
Reference in New Issue