Revize d7676f17

Re #7545 Fix errors in tests and domain classes

server/src/main/java/cz/zcu/yamanager/domain/DefaultSettings.java

@@ -51 +51 @@
      */
     public DefaultSettings(final long id, final int sickDayCount, final LocalDateTime notification) throws IllegalArgumentException {
         DefaultSettings.log.trace("Creating a new instance of the class DefaultSettings.");
-        DefaultSettings.log.debug("DefaultSettings: id={},\nsickDayCount={},\nnotification={}", id, sickDayCount, notification);
+        DefaultSettings.log.debug("DefaultSettings: id={}, sickDayCount={}, notification={}", id, sickDayCount, notification);
 
         this.id = id;
         this.setSickDayCount(sickDayCount);

server/src/main/java/cz/zcu/yamanager/domain/User.java

@@ -122 +122 @@
      */
     public User(final long id, final String firstName, final String lastName, final float vacationCount, final int totalSickDayCount, final int takenSickDayCount, final LocalDateTime notification, final String token, final String email, final String photo, final LocalDateTime creationDate, final UserRole role, final Status status) throws IllegalArgumentException {
         User.log.trace("Creating a new instance of the class User.");
-        User.log.debug("User: id={},\nfirstName={},\nlastName={},\nvacationCount={},\ntotalSickDayCount={},\ntakenSickDayCount={},\nnotification={},\ntoken={},\nemail={},\nphoto={},\ncreationDate={},\nrole={},\nstatus={}", id, firstName, lastName, vacationCount, totalSickDayCount, takenSickDayCount, notification, token, email, photo, creationDate, role, status);
+        User.log.debug("User: id={}, firstName={}, lastName={}, vacationCount={}, totalSickDayCount={}, takenSickDayCount={}, notification={}, token={}, email={}, photo={}, creationDate={}, role={}, status={}", id, firstName, lastName, vacationCount, totalSickDayCount, takenSickDayCount, notification, token, email, photo, creationDate, role, status);
 
         this.id = id;
         this.setFirstName(firstName);

server/src/main/java/cz/zcu/yamanager/domain/VacationDay.java

@@ -104 +104 @@
      */
     private VacationDay(final int id, final LocalDate date, final LocalTime from, final LocalTime to, final LocalDateTime creationDate, final Status status, final VacationType type) {
         VacationDay.log.trace("Creating a new instance of the class VacationDay.");
-        VacationDay.log.debug("VacationDay: id={},\ndate={},\nfrom={},\nto={},\ncreationDate={},\nstatus={},\ntype={}", id, date, from, to, creationDate, status, type);
+        VacationDay.log.debug("VacationDay: id={}, date={}, from={}, to={}, creationDate={}, status={}, type={}", id, date, from, to, creationDate, status, type);
 
         this.id = id;
         this.date = date;
@@ -161 +161 @@
     public void setFrom(final LocalTime from) throws IllegalArgumentException {
         VacationDay.log.debug("Settings a new value of the starting time of this vacation: {}", from);
 
-        if(this.type == VacationType.SICKDAY) {
-            VacationDay.log.info("The sick day must not have a starting time.");
-            this.from = null;
-        }
-
-        if (this.to != null && from.compareTo(this.to) >= 0) {
+        if (from != null && this.to != null && from.compareTo(this.to) >= 0) {
             VacationDay.log.warn("The vacation must not start after it ends. from={}, to={}", from, this.to);
             throw new IllegalArgumentException("time.order.error");
         }
@@ -193 +188 @@
     public void setTo(final LocalTime to) throws IllegalArgumentException {
         VacationDay.log.debug("Settings a new value of the ending time of this vacation: {}", to);
 
-        if(this.type == VacationType.SICKDAY) {
-            VacationDay.log.info("The sick day must not have an ending time.");
-            this.to = null;
-        }
-
-        if (this.from != null && to.compareTo(this.from) <= 0) {
+        if (to != null && this.from != null && to.compareTo(this.from) <= 0) {
             VacationDay.log.warn("The vacation must not end after it starts. from={}, to={}", this.from, to);
             throw new IllegalArgumentException("time.order.error");
         }
@@ -217 +207 @@
     public void setTime(final LocalTime from, final LocalTime to) throws IllegalArgumentException {
         VacationDay.log.debug("Settings a new value of the starting {} and the ending {} time of this vacation.", from, to);
 
-        if(this.type == VacationType.SICKDAY) {
-            VacationDay.log.info("The sick day must not have a starting and an ending time.");
-            this.from = null;
-            this.to = null;
-        }
-
-        if (from.compareTo(to) >= 0) {
+        if (from != null && to != null && from.compareTo(to) >= 0) {
             VacationDay.log.warn("The vacation must not start after it ends. from={}, to={}", from, to);
             throw new IllegalArgumentException("time.order.error");
         }
@@ -277 +261 @@
      */
     public void setType(final VacationType type) {
         VacationDay.log.debug("Setting a new type of this vacation: {}", type);
-
-        if(type == VacationType.SICKDAY) {
-            VacationDay.log.info("The sick day must not have a starting and an ending time.");
-            this.from = null;
-            this.to = null;
-        }
-
         this.type = type;
     }
 
@@ -297 +274 @@
         return "VacationDay{" +
                 "id=" + this.id +
                 ", date=" + this.date +
-                ", from=" + this.from +
-                ", to=" + this.to +
+                ", from=" + String.valueOf(this.from) +
+                ", to=" + String.valueOf(this.to) +
                 ", creationDate=" + this.creationDate +
                 ", status=" + this.status +
                 ", type=" + this.type +

server/src/test/java/cz/zcu/yamanager/domain/DefaultSettingsTest.java

@@ -67 +67 @@
     @Test
     void testToString() {
         DefaultSettings defaultSettings = new DefaultSettings(5, 1, LocalDateTime.of(2008,10,30,20,0));
-        assertEquals("DefaultSettings{id=5, sickDaysCount=1, notification=2008-10-30T20:00}", defaultSettings.toString());
+        assertEquals("DefaultSettings{id=5, sickDayCount=1, notification=2008-10-30T20:00}", defaultSettings.toString());
     }
 }

server/src/test/java/cz/zcu/yamanager/domain/UserTest.java

@@ -262 +262 @@
      */
     @Test
     void testToString() {
-        User user = new User(5, "Jan", "Novák", 0, 10, 5, LocalDateTime.of(2008,10,30,20,0), "tokenContent", "[e-mail]", "url", LocalDateTime.of(2010,6,31,12,5), UserRole.EMPLOYER, Status.ACCEPTED);
-        assertEquals("User{id=5, firstName=Jan, lastName=Novák, vacationsCount=0, totalSickDaysCount=10, takenSickDaysCount=5, notification=2008-10-30T20:00, token=tokenContent, email=[e-mail], photo=url, creationDate=2010-6-31T12:05 , role=EMPLOYER, status=ACCEPTED}", user.toString());
+        User user = new User(5, "Jan", "Nov\u00E1k", 0, 10, 5, LocalDateTime.of(2008,10,30,20,0), "tokenContent", "[e-mail]", "url", LocalDateTime.of(2010,7,31,12,5), UserRole.EMPLOYER, Status.ACCEPTED);
+        assertEquals("User{id=5, firstName='Jan', lastName='Nov\u00E1k', vacationCount=0.0, totalSickDayCount=10, takenSickDayCount=5, notification=2008-10-30T20:00, token='tokenContent', email='[e-mail]', photo='url', creationDate=2010-07-31T12:05, role=EMPLOYER, status=ACCEPTED}", user.toString());
     }
 }

server/src/test/java/cz/zcu/yamanager/domain/VacationDayTest.java

@@ -62 +62 @@
     }
 
     /**
-     * Tests the method {@code setTime} with a sick day.
+     * Tests the method {@code setTime} with null {@code from} input.
      */
     @Test
-    void testSetTimeSickDay() {
-        this.vacationDay.setType(VacationType.SICKDAY);
-        LocalTime from = LocalTime.of(10,0);
-        LocalTime to = LocalTime.of(20,0);
-        this.vacationDay.setTime(from, to);
+    void testSetTimeNullFrom() {
+        LocalTime to = LocalTime.of(10,0);
+        this.vacationDay.setTime(null, to);
+        assertNull(this.vacationDay.getFrom());
+        assertEquals(to, this.vacationDay.getTo());
+    }
+
+    /**
+     * Tests the method {@code setTime} with null {@code to} input.
+     */
+    @Test
+    void testSetTimeNullTo() {
+        LocalTime from = LocalTime.of(20,0);
+        this.vacationDay.setTime(from, null);
+        assertNull(this.vacationDay.getTo());
+        assertEquals(from, this.vacationDay.getFrom());
+    }
+
+    /**
+     * Tests the method {@code setTime} with null input.
+     */
+    @Test
+    void setSetTimeNull() {
+        this.vacationDay.setTime(null, null);
         assertNull(this.vacationDay.getFrom());
         assertNull(this.vacationDay.getTo());
     }
@@ -119 +138 @@
     }
 
     /**
-     * Tests the method {@code setFrom} with a sick day.
+     * Tests the method {@code setFrom} with a null input.
      */
     @Test
-    void testSetFromSickDay() {
-        this.vacationDay.setType(VacationType.SICKDAY);
-        LocalTime from = LocalTime.of(10,0);
-        this.vacationDay.setFrom(from);
+    void testSetFromNullInput() {
+        this.vacationDay.setFrom(null);
         assertNull(this.vacationDay.getFrom());
     }
 
@@ -174 +191 @@
     }
 
     /**
-     * Tests the method {@code setTo} with a sick day.
+     * Tests the method {@code setTo} with a null input.
      */
     @Test
-    void testSetToSickDay() {
-        this.vacationDay.setType(VacationType.SICKDAY);
-        LocalTime to = LocalTime.of(10,0);
-        this.vacationDay.setTo(to);
+    void testSetToNullInput() {
+        this.vacationDay.setTo(null);
         assertNull(this.vacationDay.getTo());
     }
 
@@ -190 +205 @@
     @Test
     void testToStringVacation() {
         VacationDay vacationDay = new VacationDay(5, LocalDate.of(2010,1,9), LocalTime.of(12,15), LocalTime.of(22,30), LocalDateTime.of(2008,10,30,20,0), Status.ACCEPTED);
-        assertEquals("User{id=5, date=2010-1-9, from=12:15, to=22:30, notification=2008-10-30T20:00, status=ACCEPTED, type=VACATION}", vacationDay.toString());
+        assertEquals("VacationDay{id=5, date=2010-01-09, from=12:15, to=22:30, creationDate=2008-10-30T20:00, status=ACCEPTED, type=VACATION}", vacationDay.toString());
     }
 
     /**
@@ -199 +214 @@
     @Test
     void testToStringSickDay() {
         VacationDay vacationDay = new VacationDay(5, LocalDate.of(2010,1,9), LocalDateTime.of(2008,10,30,20,0), Status.ACCEPTED);
-        assertEquals("User{id=5, date=2010-1-9, from=null, to=null, notification=2008-10-30T20:00, status=ACCEPTED, type=SICKDAY}", vacationDay.toString());
+        assertEquals("VacationDay{id=5, date=2010-01-09, from=null, to=null, creationDate=2008-10-30T20:00, status=ACCEPTED, type=SICKDAY}", vacationDay.toString());
     }
 }