Fixed tests.

Author: Jarkko Laitinen

fi/cosky/sdk/tests/SdkTests.java

@@ -141,6 +141,7 @@ public void T04CreatingTaskTest() {
             taskEvents.get(1).setTimeWindows(timeWindows);
             taskEvents.get(0).setServiceTime(10);
             taskEvents.get(1).setServiceTime(10);
+            task.setActivityState("Active");
 
             ResponseData result = api.navigate(ResponseData.class, problem.getLink("create-task"), task); 
     		//##END EXAMPLE##
@@ -576,7 +577,7 @@ public void T21VehicleMassImport() {
 			for (int i = 0; i < 10; i++) {
 				VehicleUpdateRequest vehicle = new VehicleUpdateRequest("vehicle" + i, list, start, end);
 				vehicle.setTimeWindows(timeWindows);
-				vehicle.setCanBeRelocated("None");
+				vehicle.setRelocationType("None");
 				vehicles.add(vehicle);
 			}
 			set.setItems(vehicles);
@@ -680,14 +681,16 @@ public void T24DifferentCompatibilityTypesTest() {
 		task1.add(pickup);
 		task1.add(delivery);
 		TaskUpdateRequest task = new TaskUpdateRequest(task1);
-		task.setCanBeRelocated("None");
+		task.setActivityState("Active");
+		task.setRelocationType("None");
 		task.setName("testTask");
 		List<String> types = new ArrayList<String>();
 		types.add("rekka");
 		task.setIncompatibleVehicleTypes(types);
 
 		TaskUpdateRequest task2 = new TaskUpdateRequest(task1);
-		task2.setCanBeRelocated("None");
+		task2.setRelocationType("None");
+		task2.setActivityState("Active");
 		List<String> other = new ArrayList<String>();
 		other.add("henkiloauto");		
 		task2.setName("testTask2");

fi/cosky/sdk/tests/TestHelper.java

@@ -112,7 +112,8 @@ static TaskData getTask(API api, RoutingProblemData problem) {
 		both.add(task2);
 		TaskUpdateRequest task = new TaskUpdateRequest(both);
 		task.setName("testTask");
-		task.setCanBeRelocated("None");
+		task.setRelocationType("None");
+		task.setActivityState("Active");
 		try {
 			ResponseData createdTask = api.navigate(ResponseData.class, problem.getLink("create-task"), task);
 			TaskData td = api.navigate(TaskData.class, createdTask.getLocation());
@@ -145,7 +146,7 @@ static TaskUpdateRequest createTaskUpdateRequest(String name) {
 		both.add(task2);
 		TaskUpdateRequest task = new TaskUpdateRequest(both);
 		task.setName(name);
-		task.setCanBeRelocated("None");
+		task.setRelocationType("None");
 		return task;
 	}
 
@@ -171,7 +172,8 @@ static List<TaskUpdateRequest> createListOfTasks(int howMany) {
 			both.add(task2);
 			TaskUpdateRequest task = new TaskUpdateRequest(both);
 			task.setName("testTask" + i);
-			task.setCanBeRelocated("None");
+			task.setRelocationType("None");
+			task.setActivityState("Active");
 			tasks.add(task);
 		}
 		return tasks;