From 1ce1f73533dbf21985259509ae4ef4da1cfeacf0 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 6 May 2018 18:23:27 +0200
Subject: Fix rebase errors

---
 .../tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java  | 4 ++--
 .../groupphase/vehicle/VehicleServiceTestConfiguration.java           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle')

diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
index 3ae2fe6..731da6f 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
@@ -8,8 +8,8 @@ import static org.mockito.Mockito.when;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDBDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleAdd;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
@@ -17,7 +17,7 @@ import org.junit.Test;
 
 public class CarAddTestService {
     private final VehicleDAO vehicleP = mock(VehicleDBDAO.class);
-    private final VehicleService vehicleService = new VehicleAdd(vehicleP);
+    private final VehicleService vehicleService = new VehicleServiceImpl(vehicleP);
 
     public CarAddTestService() throws PersistenceException {
         when(vehicleP.add(any())).thenReturn(1L);
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehicleServiceTestConfiguration.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehicleServiceTestConfiguration.java
index cccd5dc..ccd1e5d 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehicleServiceTestConfiguration.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehicleServiceTestConfiguration.java
@@ -2,8 +2,8 @@ package at.ac.tuwien.sepm.assignment.groupphase.vehicle;
 
 import static org.mockito.Mockito.mock;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleAdd;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -14,6 +14,6 @@ public class VehicleServiceTestConfiguration {
     @Bean
     @Primary
     public VehicleService vehicleService() {
-        return mock(VehicleAdd.class);
+        return mock(VehicleServiceImpl.class);
     }
 }
-- 
cgit v1.2.3-70-g09d2