From 1d48cee9ece986e323f0b063c58e1d0c678a1716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20=C5=A0=C5=AFstek?= Date: Mon, 30 Oct 2017 22:57:09 +0100 Subject: [PATCH] Hotel changes fix --- .../main/java/cz/fi/muni/pa165/dao/HotelDaoImpl.java | 2 +- .../src/main/java/cz/fi/muni/pa165/entity/Hotel.java | 5 ++--- .../test/java/cz/fi/muni/pa165/dao/HotelDaoTest.java | 12 ++++++++++++ .../cz/fi/muni/pa165/dao/ReservationDaoTest.java | 1 + .../test/java/cz/fi/muni/pa165/dao/RoomDaoTest.java | 7 +++++-- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/dao/HotelDaoImpl.java b/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/dao/HotelDaoImpl.java index fbaa03c..3c9c4c3 100644 --- a/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/dao/HotelDaoImpl.java +++ b/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/dao/HotelDaoImpl.java @@ -44,6 +44,6 @@ public void remove(Hotel hotel) { @Override public List findAll() { - return entityManager.createQuery("select h from Hotel h", Hotel.class).setMaxResults(1).getResultList(); + return entityManager.createQuery("select h from Hotel h", Hotel.class).getResultList(); } } diff --git a/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/entity/Hotel.java b/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/entity/Hotel.java index aed3e3e..569f790 100644 --- a/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/entity/Hotel.java +++ b/bookingmanagerpersistence/src/main/java/cz/fi/muni/pa165/entity/Hotel.java @@ -115,7 +115,7 @@ public void setAddress(String address) { @Override public int hashCode() { - return Objects.hash(getName(), getAddress(), getRooms()); + return Objects.hash(getName(), getAddress()); } @Override @@ -133,8 +133,7 @@ public boolean equals(Object obj) { Hotel other = (Hotel) obj; boolean result = other.getName().equals(getName()) && - other.getAddress().equals(getAddress()) && - other.getRooms().equals(getRooms()); + other.getAddress().equals(getAddress()); return result; } diff --git a/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/HotelDaoTest.java b/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/HotelDaoTest.java index 53bbe09..a508051 100644 --- a/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/HotelDaoTest.java +++ b/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/HotelDaoTest.java @@ -34,6 +34,7 @@ public class HotelDaoTest { @Inject private HotelDao hotelDao; + @PersistenceContext EntityManager em; @@ -42,12 +43,15 @@ public class HotelDaoTest { public void create() throws Exception { Hotel hilton = new Hotel(); hilton.setName("Hilton Hotel"); + hilton.setAddress("Hilton street"); Hotel holidayInn = new Hotel(); holidayInn.setName("Holiday Inn"); + holidayInn.setAddress("Holiday street"); Hotel bestWestern = new Hotel(); bestWestern.setName("Best Western"); + bestWestern.setAddress("Western street"); hotelDao.create(hilton); hotelDao.create(holidayInn); @@ -63,6 +67,7 @@ public void create() throws Exception { public void findById() throws Exception { Hotel tatra = new Hotel(); tatra.setName("Hotel Tatra"); + tatra.setAddress("Tatra street"); hotelDao.create(tatra); em.persist(tatra); @@ -83,6 +88,7 @@ public void update() throws Exception { Hotel royal = new Hotel(); royal.setName("Hotel Royal"); + royal.setAddress("Royal street"); Set rooms = new HashSet(); rooms.add(single); @@ -104,12 +110,15 @@ public void update() throws Exception { public void findAll() throws Exception { Hotel hilton = new Hotel(); hilton.setName("Hilton Hotel"); + hilton.setAddress("Hilton street"); Hotel holidayInn = new Hotel(); holidayInn.setName("Holiday Inn"); + holidayInn.setAddress("Holiday street"); Hotel bestWestern = new Hotel(); bestWestern.setName("Best Western"); + bestWestern.setAddress("Western street"); hotelDao.create(hilton); hotelDao.create(holidayInn); @@ -123,12 +132,15 @@ public void findAll() throws Exception { public void remove() throws Exception { Hotel hilton = new Hotel(); hilton.setName("Hilton Hotel"); + hilton.setAddress("Hilton street"); Hotel holidayInn = new Hotel(); holidayInn.setName("Holiday Inn"); + holidayInn.setAddress("Holiday street"); Hotel bestWestern = new Hotel(); bestWestern.setName("Best Western"); + bestWestern.setAddress("Western street"); hotelDao.create(hilton); hotelDao.create(holidayInn); diff --git a/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/ReservationDaoTest.java b/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/ReservationDaoTest.java index 9e56376..abf3601 100644 --- a/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/ReservationDaoTest.java +++ b/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/ReservationDaoTest.java @@ -181,6 +181,7 @@ public void findAll() throws Exception { private Reservation getReservation(LocalDateTime from, LocalDateTime to) { Hotel hotel = new Hotel(); hotel.setName("Hotel"); + hotel.setAddress("Brno"); hotelDao.create(hotel); diff --git a/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/RoomDaoTest.java b/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/RoomDaoTest.java index a417024..665c192 100644 --- a/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/RoomDaoTest.java +++ b/bookingmanagerpersistence/src/test/java/cz/fi/muni/pa165/dao/RoomDaoTest.java @@ -35,6 +35,7 @@ public class RoomDaoTest { public void create() throws Exception { Hotel tmpHotel = new Hotel(); tmpHotel.setName("Hotel"); + tmpHotel.setAddress("Brno"); hotelDao.create(tmpHotel); @@ -53,7 +54,7 @@ public void create() throws Exception { public void findById() throws Exception { Hotel tmpHotel = new Hotel(); tmpHotel.setName("Hotel"); - + tmpHotel.setAddress("Brno"); hotelDao.create(tmpHotel); Room tmpRoom1 = new Room(); @@ -79,7 +80,7 @@ public void update() throws Exception { Hotel tmpHotel = new Hotel(); tmpHotel.setName("Hotel"); - + tmpHotel.setAddress("Brno"); hotelDao.create(tmpHotel); Room tmpRoom = new Room(); @@ -101,6 +102,7 @@ public void update() throws Exception { public void remove() throws Exception { Hotel tmpHotel = new Hotel(); tmpHotel.setName("Hotel"); + tmpHotel.setAddress("Brno"); hotelDao.create(tmpHotel); @@ -128,6 +130,7 @@ public void remove() throws Exception { public void findAll() throws Exception { Hotel tmpHotel = new Hotel(); tmpHotel.setName("Hotel"); + tmpHotel.setAddress("Brno"); hotelDao.create(tmpHotel);