From 4761b30b16417a41facb7237168b480b270c3e12 Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Fri, 21 Jun 2013 11:16:51 +0200
Subject: [PATCH] adapt tests to changes in vehicleFleetManager

---
 .../CalcVehicleTypeDependentServiceInsertionTest.java        | 4 ++++
 .../examples/MultipleDepotExampleWithPenaltyVehicles.java    | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jsprit-core/src/test/java/algorithms/CalcVehicleTypeDependentServiceInsertionTest.java b/jsprit-core/src/test/java/algorithms/CalcVehicleTypeDependentServiceInsertionTest.java
index 56d3a2db..f485a241 100644
--- a/jsprit-core/src/test/java/algorithms/CalcVehicleTypeDependentServiceInsertionTest.java
+++ b/jsprit-core/src/test/java/algorithms/CalcVehicleTypeDependentServiceInsertionTest.java
@@ -25,6 +25,8 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Arrays;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -59,6 +61,8 @@ public class CalcVehicleTypeDependentServiceInsertionTest {
 		service = mock(Service.class);
 		vehicleRoute = mock(VehicleRoute.class);
 		
+		when(fleetManager.getAvailableVehicles()).thenReturn(Arrays.asList(veh1,veh2));
+		
 		when(veh1.getCapacity()).thenReturn(10);
 		when(veh2.getCapacity()).thenReturn(10);
 		
diff --git a/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java b/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java
index 244658c8..acd61039 100644
--- a/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java
+++ b/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java
@@ -20,6 +20,7 @@ import basics.io.VrpXMLReader;
 import basics.route.PenaltyVehicleType;
 import basics.route.Vehicle;
 import basics.route.VehicleImpl;
+import basics.route.VehicleType;
 import basics.route.VehicleTypeImpl;
 
 public class MultipleDepotExampleWithPenaltyVehicles {
@@ -52,7 +53,7 @@ public class MultipleDepotExampleWithPenaltyVehicles {
 		int depotCounter = 1;
 		for(Coordinate depotCoord : Arrays.asList(firstDepotCoord,second)){
 			for(int i=0;i<nuOfVehicles;i++){
-				VehicleTypeImpl vehicleType = VehicleTypeImpl.Builder.newInstance(depotCounter + "_type", capacity).setCostPerDistance(1.0).build();
+				VehicleType vehicleType = VehicleTypeImpl.Builder.newInstance(depotCounter + "_type", capacity).setCostPerDistance(1.0).build();
 				String vehicleId = depotCounter + "_" + (i+1) + "_vehicle";
 				VehicleImpl.Builder vehicleBuilder = VehicleImpl.Builder.newInstance(vehicleId);
 				vehicleBuilder.setLocationCoord(depotCoord);
@@ -64,7 +65,7 @@ public class MultipleDepotExampleWithPenaltyVehicles {
 			/*
 			 * define penalty-type with the same id, but other higher fixed and variable costs
 			 */
-			VehicleTypeImpl penaltyType = VehicleTypeImpl.Builder.newInstance(depotCounter + "_type", capacity).setFixedCost(50).setCostPerDistance(3.0).build();
+			VehicleType penaltyType = VehicleTypeImpl.Builder.newInstance(depotCounter + "_type", capacity).setFixedCost(50).setCostPerDistance(3.0).build();
 			/*
 			 * to mark the penalty-type as penalty-type, wrap it with PenaltyVehicleType(Wrapper)
 			 * this is to tell the fleetManager that this is not a regular but a penalty vehicle