Revize d6c90b22

Final version of domain class User with tests

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

@@ -25 +25 @@
      */
     private static final int EMAIL_ADDRESS_LENGTH = 100;
 
+    /**
+     * The url of a generic photo.
+     */
+    private static final String DEFAULT_PHOTO = "https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg";
+
     /**
      * The logger.
      */
@@ -33 +38 @@
     /**
      * The user's ID.
      */
-    private final long id;
+    private Long id;
 
     /**
      * The user's first name.
@@ -48 +53 @@
     /**
      * The number of user's remaining hours of an overtime.
      */
-    private float vacationCount;
+    private Float vacationCount;
 
     /**
      * The number of user's sick days available during a year.
      */
-    private int totalSickDayCount;
+    private Integer totalSickDayCount;
 
     /**
      * The number of user's taken sick days.
      */
-    private int takenSickDayCount;
+    private Integer takenSickDayCount;
 
     /**
      * The date and time of sending an email warning about an incoming reset of remaining overtimes and sick days.
@@ -83 +88 @@
     /**
      * The date and time of a user's creation.
      */
-    private final LocalDateTime creationDate;
+    private LocalDateTime creationDate;
 
     /**
      * The user's role.
@@ -96 +101 @@
     private Status status;
 
     /**
-     * Creates an empty user for testing purposes only.
-     * It just sets id to zero and creation date to now.
-     */
-    public User() {
-        User.log.trace("Creating a new instance of the class User.");
-        this.id = 0;
-        this.creationDate = null;
-    }
-
-    /**
-     * Creates a new user and sets attributes known during an insertion.
+     * Returns the user's ID.
      *
-     * @param firstName         the user's first name
-     * @param lastName          the user's last name.
-     * @param vacationCount     the number of user's remaining hours of an overtime
-     * @param totalSickDayCount the number of user's sick days available during a year
-     * @param takenSickDayCount the number of user's taken sick days
-     * @param notification      the date and time of sending an email warning about an incoming reset of remaining overtimes and sick days
-     * @param token             the token for the Google oAuth
-     * @param email             the user's email address
-     * @param photo             the URL of a user's photo
-     * @param role              the user's role
-     * @param status            the user's authorization status
-     * @throws IllegalArgumentException when the vacationCount, totalSickDayCount or takenSickDayCount are negative or first name, last name or email exceed the maximal permitted number of characters
-     */
-    public User(final String firstName, final String lastName, final Float vacationCount, final Integer totalSickDayCount, final Integer takenSickDayCount, final LocalDateTime notification, final String token, final String email, final String photo, final UserRole role, final Status status) throws IllegalArgumentException {
-        this(0, firstName, lastName, vacationCount, totalSickDayCount, takenSickDayCount, notification, token, email, photo, null, role, status);
+     * @return the user's ID
+     */
+    public Long getId() {
+        return this.id;
     }
 
     /**
-     * Creates a new user and sets all his/hers attributes.
+     * Replaces the user's ID with the given one.
      *
-     * @param id                the user's ID
-     * @param firstName         the user's first name
-     * @param lastName          the user's last name.
-     * @param vacationCount     the number of user's remaining hours of an overtime
-     * @param totalSickDayCount the number of user's sick days available during a year
-     * @param takenSickDayCount the number of user's taken sick days
-     * @param notification      the date and time of sending an email warning about an incoming reset of remaining overtimes and sick days
-     * @param token             the token for the Google oAuth
-     * @param email             the user's email address
-     * @param photo             the URL of a user's photo
-     * @param creationDate      the date and time of a user's creation
-     * @param role              the user's role
-     * @param status            the user's authorization status
-     * @throws IllegalArgumentException when the vacationCount, totalSickDayCount or takenSickDayCount are negative or first name, last name or email exceed the maximal permitted number of characters
-     */
-    public User(final long id, final String firstName, final String lastName, final Float vacationCount, final Integer totalSickDayCount, final Integer 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={}, 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);
+     * @param id the given ID
+     */
+    public void setId(final Long id) {
+        User.log.debug("Setting a new id: {}", id);
 
         this.id = id;
-        this.setFirstName(firstName);
-        this.setLastName(lastName);
-        this.setVacationCount(vacationCount);
-        this.setTotalSickDayCount(totalSickDayCount);
-        this.setTakenSickDayCount(takenSickDayCount);
-        this.setNotification(notification);
-        this.token = token;
-        this.setEmail(email);
-        this.photo = photo;
-        this.creationDate = creationDate;
-        this.setRole(role);
-        this.setStatus(status);
-    }
-
-    /**
-     * Returns the user's ID.
-     *
-     * @return the user's ID
-     */
-    public long getId() {
-        return this.id;
     }
 
     /**
@@ -190 +139 @@
     public void setFirstName(final String firstName) throws IllegalArgumentException {
         User.log.debug("Setting a new first name: {}", firstName);
 
-        if (firstName.length() > User.NAME_LENGTH) {
+        if (firstName == null) {
+            User.log.warn("The given first name must not be null");
+            throw new IllegalArgumentException("first.name.null.error");
+        } else if (firstName.length() > User.NAME_LENGTH) {
             User.log.warn("The length of the given first name exceeded a limit");
             throw new IllegalArgumentException("name.length.error");
         }
@@ -217 +169 @@
     public void setLastName(final String lastName) throws IllegalArgumentException {
         User.log.debug("Setting a new last name: {}", lastName);
 
-        if (lastName.length() > User.NAME_LENGTH) {
+        if(lastName == null) {
+            User.log.warn("The given last name must not be null");
+            throw new IllegalArgumentException("last.name.null.error");
+        } else if (lastName.length() > User.NAME_LENGTH) {
             User.log.warn("The length of the given last name exceeded a limit");
             throw new IllegalArgumentException("name.length.error");
         }
@@ -230 +185 @@
      *
      * @return the number of user's remaining hours of the overtime
      */
-    public float getVacationCount() {
+    public Float getVacationCount() {
         return this.vacationCount;
     }
 
@@ -255 +210 @@
         this.vacationCount = vacationCount;
     }
 
+    /**
+     * Adds a difference of the given starting and the ending time of a vacation
+     * to the number of user's available vacations. If some of the given parameters are null
+     * or the times are not in order the method throws an exception.
+     *
+     * @param from the starting time of a vacation
+     * @param to the ending time of a vacation
+     * @throws IllegalArgumentException when some of the given parameters are null
+     *          or the times are not in order
+     */
+    public void addVacationCount(final LocalTime from, final LocalTime to) {
+        User.log.debug("Adding a vacation from {} to {}", from, to);
+
+        if(from == null || to == null) {
+            User.log.warn("A vacation has to have a starting and an ending time");
+            throw new IllegalArgumentException("time.vacation.error");
+        } else if (from.compareTo(to) >= 0) {
+            User.log.warn("A vacation must not start after it ends. from={}, to={}", from, to);
+            throw new IllegalArgumentException("time.order.error");
+        }
+
+        final float difference = from.until(to, MINUTES) / 60f;
+        this.vacationCount += difference;
+    }
+
     /**
      * Returns the number of user's sick days available during a year.
      *
      * @return the number of user's sick days available during the year
      */
-    public int getTotalSickDayCount() {
+    public Integer getTotalSickDayCount() {
         return this.totalSickDayCount;
     }
 
@@ -274 +254 @@
     public void setTotalSickDayCount(final Integer totalSickDayCount) throws IllegalArgumentException {
         User.log.debug("Setting a new number of user's sick days available during a year: {}", totalSickDayCount);
 
-        if (totalSickDayCount == null) {
-            User.log.warn("The number of user's available sick days must not be null");
-            throw new IllegalArgumentException("sick.day.null.error");
-        } else if (totalSickDayCount < 0) {
+        if (totalSickDayCount != null && totalSickDayCount < 0) {
             User.log.warn("The number of user's available sick days must not be negative");
             throw new IllegalArgumentException("negative.sick.day.error");
         }
@@ -290 +267 @@
      *
      * @return the number of user's taken sick days
      */
-    public int getTakenSickDayCount() {
+    public Integer getTakenSickDayCount() {
         return this.takenSickDayCount;
     }
 
@@ -318 +295 @@
         this.takenSickDayCount = takenSickDayCount;
     }
 
+    /**
+     * Adds the given amount to the number of user's remaining hours of an overtime.
+     * If the given number is null or a result of the addition is negative the method throws an exception.
+     *
+     * @param value the given amount that is going to be added
+     * @throws IllegalArgumentException when the given number is null or a result of the addition is negative
+     */
+    public void addTakenSickDayCount(final Integer value) throws IllegalArgumentException {
+        User.log.debug("Increasing the number of remaining overtime by {}", value);
+
+        if (value == null) {
+            User.log.warn("The given value must not be null");
+            throw new IllegalArgumentException("vacation.null.error");
+        } else if (this.takenSickDayCount + value < 0) {
+            User.log.warn("The number number of user's taken sick days must not be negative");
+            throw new IllegalArgumentException("negative.sick.day.error");
+        } else if (this.takenSickDayCount + value > this.totalSickDayCount) {
+            User.log.warn("The number number of user's taken sick days must not greater than his/her available sick days");
+            throw new IllegalArgumentException("taken.sick.day.count.error");
+        }
+
+        this.takenSickDayCount += value;
+    }
+
     /**
      * Returns the date and time of sending an email warning about an incoming reset of remaining overtimes and sick days.
      *
@@ -337 +338 @@
     public void setNotification(final LocalDateTime notification) throws IllegalArgumentException {
         User.log.debug("Setting a new date and time of sending an email warning: {}", notification);
 
-        if(notification == null) {
-            User.log.warn("The given notification must not be null");
-            throw new IllegalArgumentException("notification.null.error");
-        }
-
         this.notification = notification;
     }
 
@@ -361 +357 @@
      */
     public void setToken(final String token) {
         User.log.debug("Setting a new token: {}", token);
+
+        if (token == null) {
+            User.log.warn("The given token must not be null");
+            throw new IllegalArgumentException("token.null.error");
+        }
+
         this.token = token;
     }
 
@@ -383 +385 @@
     public void setEmail(final String email) throws IllegalArgumentException {
         User.log.debug("Setting a new email address: {}", email);
 
-        if (email.length() > User.EMAIL_ADDRESS_LENGTH) {
+        if (email == null) {
+            User.log.warn("The given email must not be null");
+            throw new IllegalArgumentException("email.null.error");
+        }else if (email.length() > User.EMAIL_ADDRESS_LENGTH) {
             User.log.warn("The length of the email address exceeded a limit");
             throw new IllegalArgumentException("email.length.error");
         }
@@ -407 +412 @@
      */
     public void setPhoto(final String photo) {
         User.log.debug("Setting a new url of a photo: {}", photo);
-        this.photo = photo;
+
+        this.photo = photo == null ? User.DEFAULT_PHOTO : photo;
     }
 
     /**
@@ -419 +425 @@
         return this.creationDate;
     }
 
+    /**
+     * Replaces the user's creation date with the given date and time.
+     *
+     * @param creationDate the new creation date
+     */
+    public void setCreationDate(final LocalDateTime creationDate) {
+        User.log.debug("Setting a new user's creation date: {}", creationDate);
+
+        if (creationDate == null) {
+            User.log.warn("The given creation date must not be null");
+            throw new IllegalArgumentException("creation.null.error");
+        }
+
+        this.creationDate = creationDate;
+    }
+
     /**
      * Returns the user's role.
      *

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

@@ -8 +8 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * This class tests methods of the {@code User} class.
@@ -28 +27 @@
     @BeforeEach
     void setUp() {
         this.user = new User();
+        this.user.setVacationCount(0f);
+        this.user.setTotalSickDayCount(0);
+        this.user.setTakenSickDayCount(0);
     }
 
     /**
      * Tests the method {@code setFirstName} with common values where no problem should occur.
      */
     @Test
-    void testSetFirstName() {
+    void setFirstName_valid() {
         this.user.setFirstName("aaaaaa");
         assertEquals("aaaaaa", this.user.getFirstName());
     }
@@ -43 +45 @@
      * Tests the method {@code setFirstName} with the maximal length of a name.
      */
     @Test
-    void testSetFirstNameMax() {
+    void setFirstName_maxLength_valid() {
         this.user.setFirstName("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
         assertEquals("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", this.user.getFirstName());
     }
@@ -52 +54 @@
      * Tests the method {@code setFirstName} with name that exceeds maximal length which should throw an exception.
      */
     @Test
-    void testSetFirstNameException() {
+    void setFirstName_tooLong() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setFirstName("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
     }
 
+    /**
+     * Tests the method {@code setFirstName} with null input which should throw an exception.
+     */
+    @Test
+    void setFirstName_nullInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.setFirstName(null));
+    }
+
     /**
      * Tests the method {@code setLastName} with common values where no problem should occur.
      */
     @Test
-    void testSetLastName() {
+    void setLastName_valid() {
         this.user.setLastName("aaaaaa");
         assertEquals("aaaaaa", this.user.getLastName());
     }
@@ -69 +79 @@
      * Tests the method {@code setLastName} with the maximal length of a name.
      */
     @Test
-    void testSetLastNameMax() {
+    void setLastName_maxLength_valid() {
         this.user.setLastName("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
         assertEquals("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", this.user.getLastName());
     }
@@ -78 +88 @@
      * Tests the method {@code setLastName} with name that exceeds maximal length which should throw an exception.
      */
     @Test
-    void testSetLastNameException() {
+    void setLastName_tooLong() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setLastName("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
     }
 
+    /**
+     * Tests the method {@code setLastName} with null input which should throw an exception.
+     */
+    @Test
+    void setLastName_nullInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.setLastName(null));
+    }
+
     /**
      * Tests the method {@code setVacationCount} with common values where no problem should occur.
      */
     @Test
-    void testSetVacationCount() {
+    void setVacationCount_valid() {
         this.user.setVacationCount(10f);
-        assertEquals(10, this.user.getVacationCount());
+        assertEquals(10f, this.user.getVacationCount().floatValue());
     }
 
     /**
      * Tests the method {@code setVacationCount} with zero which is a threshold value.
      */
     @Test
-    void testSetVacationCountZero() {
+    void setVacationCount_zeroInput_valid() {
         this.user.setVacationCount(0f);
-        assertEquals(0, this.user.getVacationCount());
+        assertEquals(0f, this.user.getVacationCount().floatValue());
     }
 
     /**
      * Tests the method {@code setVacationCount} with negative one which is a threshold value.
      */
     @Test
-    void testSetVacationCountNegativeOne() {
+    void setVacationCount_negativeOneInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setVacationCount(-1f));
     }
 
@@ -112 +130 @@
      * Tests the method {@code setVacationCount} with negative value.
      */
     @Test
-    void testSetVacationCountNegative() {
+    void setVacationCount_negativeInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setVacationCount(-10f));
     }
 
     /**
-     * Tests the method {@code setVacationCount} with null value.
+     * Tests the method {@code setVacationCount} with null value which should throw an exception.
      */
     @Test
-    void testSetVacationCountObjectNull() {
+    void setVacationCount_nullInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setVacationCount(null));
     }
 
+    /**
+     * Tests the method {@code addVacationCount} with common values where no problem should occur.
+     */
+    @Test
+    void addVacationCount_floatInput_valid() {
+        this.user.addVacationCount(10f);
+        assertEquals(10f, this.user.getVacationCount().floatValue());
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with common values where no problem should occur.
+     */
+    @Test
+    void addVacationCount_addFloatInput_valid() {
+        this.user.setVacationCount(2f);
+        this.user.addVacationCount(10f);
+        assertEquals(12f, this.user.getVacationCount().floatValue());
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with common values where no problem should occur.
+     */
+    @Test
+    void addVacationCount_subtractFloatInput_valid() {
+        this.user.setVacationCount(20f);
+        this.user.addVacationCount(-10f);
+        assertEquals(10f, this.user.getVacationCount().floatValue());
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with negative result of the operation which should throw an exception.
+     */
+    @Test
+    void addVacationCount_floatInput_negativeResult() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.addVacationCount(-10f));
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with null value which should throw an exception.
+     */
+    @Test
+    void addVacationCount_nullFloatInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.addVacationCount(null));
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with common values where no problem should occur.
+     */
+    @Test
+    void addVacationCount_timeInput_valid() {
+        LocalTime from = LocalTime.of(10,0);
+        LocalTime to = LocalTime.of(20,0);
+        this.user.addVacationCount(from, to);
+        assertEquals(10f, this.user.getVacationCount().floatValue());
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with wrong order of parameters which should throw an exception.
+     */
+    @Test
+    void addVacationCount_timeInput_order() {
+        LocalTime from = LocalTime.of(10,0);
+        LocalTime to = LocalTime.of(20,0);
+        assertThrows(IllegalArgumentException.class, () -> this.user.addVacationCount(to, from));
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with null from parameter which should throw an exception.
+     */
+    @Test
+    void addVacationCount_timeInput_nullFrom() {
+        LocalTime to = LocalTime.of(20,0);
+        assertThrows(IllegalArgumentException.class, () -> this.user.addVacationCount(null, to));
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with null to parameter which should throw an exception.
+     */
+    @Test
+    void addVacationCount_timeInput_nullTo() {
+        LocalTime from = LocalTime.of(20,0);
+        assertThrows(IllegalArgumentException.class, () -> this.user.addVacationCount(from, null));
+    }
+
+    /**
+     * Tests the method {@code addVacationCount} with null parameters which should throw an exception.
+     */
+    @Test
+    void addVacationCount_timeNullInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.addVacationCount(null, null));
+    }
+
     /**
      * Tests the method {@code setTotalSickDayCount} with common values where no problem should occur.
      */
     @Test
-    void testSetTotalSickDayCount() {
+    void setTotalSickDayCount_valid() {
         this.user.setTotalSickDayCount(10);
-        assertEquals(10, this.user.getTotalSickDayCount());
+        assertEquals(10, this.user.getTotalSickDayCount().intValue());
     }
 
     /**
      * Tests the method {@code setTotalSickDayCount} with zero which is a threshold value.
      */
     @Test
-    void testSetTotalSickDayCountZero() {
+    void setTotalSickDayCount_zeroInput_valid() {
         this.user.setTotalSickDayCount(0);
-        assertEquals(0, this.user.getTotalSickDayCount());
+        assertEquals(0, this.user.getTotalSickDayCount().intValue());
     }
 
     /**
      * Tests the method {@code setTotalSickDayCount} with negative one which is a threshold value.
      */
     @Test
-    void testSetTotalSickDayCountNegativeOne() {
+    void setTotalSickDayCount_negativeOneInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setTotalSickDayCount(-1));
     }
 
@@ -154 +264 @@
      * Tests the method {@code setTotalSickDayCount} with negative value.
      */
     @Test
-    void testSetTotalSickDayCountNegative() {
+    void setTotalSickDayCount_negativeInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setTotalSickDayCount(-10));
     }
 
@@ -162 +272 @@
      * Tests the method {@code setTotalSickDayCount} with null value.
      */
     @Test
-    void testSetTotalSickDayCountObjectNull() {
-        assertThrows(IllegalArgumentException.class, () -> this.user.setTotalSickDayCount(null));
+    void setTotalSickDayCount_nullInput_valid() {
+        this.user.setTotalSickDayCount(null);
+        assertNull(this.user.getTotalSickDayCount());
     }
 
     /**
      * Tests the method {@code setTakenSickDayCount} with common values where no problem should occur.
      */
     @Test
-    void testSetTakenSickDayCount() {
-        this.user.setTotalSickDayCount(50);
+    void setTakenSickDayCount_valid() {
+        this.user.setTotalSickDayCount(20);
         this.user.setTakenSickDayCount(10);
-        assertEquals(10, this.user.getTakenSickDayCount());
+        assertEquals(10, this.user.getTakenSickDayCount().intValue());
     }
 
     /**
      * Tests the method {@code setTakenSickDayCount} with zero which is a threshold value.
      */
     @Test
-    void testSetTakenSickDayCountZero() {
-        this.user.setTotalSickDayCount(50);
+    void setTakenSickDayCount_zeroInput_valid() {
         this.user.setTakenSickDayCount(0);
-        assertEquals(0, this.user.getTakenSickDayCount());
+        assertEquals(0, this.user.getTakenSickDayCount().intValue());
     }
 
     /**
      * Tests the method {@code setTakenSickDayCount} with negative one which is a threshold value.
      */
     @Test
-    void testSetTakenSickDayCountNegativeOne() {
-        this.user.setTotalSickDayCount(10);
+    void setTakenSickDayCount_negativeOneInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setTakenSickDayCount(-1));
     }
 
@@ -199 +308 @@
      * Tests the method {@code setTakenSickDayCount} with negative value.
      */
     @Test
-    void testSetTakenSickDayCountNegative() {
+    void setTakenSickDayCount_negativeInput() {
         this.user.setTotalSickDayCount(10);
         assertThrows(IllegalArgumentException.class, () -> this.user.setTakenSickDayCount(-10));
     }
@@ -208 +317 @@
      * Tests the method {@code setTakenSickDayCount} with a value that is greater than total sick days.
      */
     @Test
-    void testSetTakenSickDayCountOver() {
+    void setTakenSickDayCount_over() {
         this.user.setTotalSickDayCount(10);
         assertThrows(IllegalArgumentException.class, () -> this.user.setTakenSickDayCount(20));
     }
@@ -217 +326 @@
      * Tests the method {@code setTakenSickDayCount} with a value that is equals the total sick days.
      */
     @Test
-    void testSetTakenSickDayCountSame() {
+    void setTakenSickDayCount_same() {
         this.user.setTotalSickDayCount(10);
         this.user.setTakenSickDayCount(10);
-        assertEquals(10, this.user.getTakenSickDayCount());
+        assertEquals(10, this.user.getTakenSickDayCount().intValue());
     }
 
     /**
      * Tests the method {@code setTakenSickDayCount} with null value.
      */
     @Test
-    void testSetTakenSickDayCountObjectNull() {
+    void setTakenSickDayCount_nullInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setTakenSickDayCount(null));
     }
 
+    /**
+     * Tests the method {@code addTakenSickDayCount} with common values where no problem should occur.
+     */
+    @Test
+    void addTakenSickDayCount_valid() {
+        this.user.setTotalSickDayCount(50);
+        this.user.addTakenSickDayCount(10);
+        assertEquals(10, this.user.getTakenSickDayCount().intValue());
+    }
+
+    /**
+     * Tests the method {@code addTakenSickDayCount} with common values where no problem should occur.
+     */
+    @Test
+    void addTakenSickDayCount_add_valid() {
+        this.user.setTotalSickDayCount(50);
+        this.user.setTakenSickDayCount(2);
+        this.user.addTakenSickDayCount(10);
+        assertEquals(12f, this.user.getTakenSickDayCount().intValue());
+    }
+
+    /**
+     * Tests the method {@code addTakenSickDayCount} with common values where no problem should occur.
+     */
+    @Test
+    void addTakenSickDayCount_subtract_valid() {
+        this.user.setTotalSickDayCount(50);
+        this.user.setTakenSickDayCount(20);
+        this.user.addTakenSickDayCount(-10);
+        assertEquals(10f, this.user.getTakenSickDayCount().intValue());
+    }
+
+    /**
+     * Tests the method {@code addTakenSickDayCount} with negative result of the operation which should throw an exception.
+     */
+    @Test
+    void addTakenSickDayCount_negativeResult() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.addTakenSickDayCount(-10));
+    }
+
+    /**
+     * Tests the method {@code addTakenSickDayCount} with null value which should throw an exception.
+     */
+    @Test
+    void addTakenSickDayCount_nullInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.addTakenSickDayCount(null));
+    }
+
+    /**
+     * Tests the method {@code addTakenSickDayCount} with a value that is greater than total sick days.
+     */
+    @Test
+    void addTakenSickDayCount_over() {
+        this.user.setTotalSickDayCount(10);
+        assertThrows(IllegalArgumentException.class, () -> this.user.addTakenSickDayCount(20));
+    }
+
+    /**
+     * Tests the method {@code addTakenSickDayCount} with a value that is equals the total sick days.
+     */
+    @Test
+    void addTakenSickDayCount_same() {
+        this.user.setTotalSickDayCount(10);
+        this.user.addTakenSickDayCount(10);
+        assertEquals(10, this.user.getTakenSickDayCount().intValue());
+    }
+
+
     /**
      * Tests the method {@code setNotification} with common values where no problem should occur.
      */
     @Test
-    void testSetNotification() {
+    void setNotification_valid() {
         this.user.setNotification(LocalDateTime.of(2010,5,1,20,0));
         assertEquals(LocalDateTime.of(2010,5,1,20,0), this.user.getNotification());
     }
@@ -244 +421 @@
      * Tests the method {@code setNotification} with null value.
      */
     @Test
-    void testSetNotificationNull() {
-        assertThrows(IllegalArgumentException.class, () -> this.user.setNotification(null));
+    void setNotification_nullInput_valid() {
+        this.user.setNotification(null);
+        assertNull(this.user.getNotification());
+    }
+
+    /**
+     * Tests the method {@code setToken} with common values where no problem should occur.
+     */
+    @Test
+    void setToken_valid() {
+        this.user.setToken("aaaaa");
+        assertEquals("aaaaa", this.user.getToken());
+    }
+
+    /**
+     * Tests the method {@code setToken} with null value.
+     */
+    @Test
+    void setToken_nullInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.setToken(null));
     }
 
     /**
      * Tests the method {@code setEmail} with common values where no problem should occur.
      */
     @Test
-    void testSetEmail() {
+    void setEmail_valid() {
         this.user.setEmail("aaaaaa");
         assertEquals("aaaaaa", this.user.getEmail());
     }
@@ -261 +456 @@
      * Tests the method {@code setEmail} with the maximal length of an email address.
      */
     @Test
-    void testSetEmailMax() {
+    void setEmail_maxLength() {
         this.user.setEmail("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
         assertEquals("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", this.user.getEmail());
     }
@@ -270 +465 @@
      * Tests the method {@code setEmail} with email address that exceeds maximal length which should throw an exception.
      */
     @Test
-    void testSetEmailException() {
+    void setEmail_tooLong() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setEmail("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
     }
 
+    /**
+     * Tests the method {@code setEmail} with null value.
+     */
+    @Test
+    void setEmail_nullInput() {
+        assertThrows(IllegalArgumentException.class, () -> this.user.setEmail(null));
+    }
+
+    /**
+     * Tests the method {@code setPhoto} with common values where no problem should occur.
+     */
+    @Test
+    void setPhoto_valid() {
+        this.user.setPhoto("aaaaa");
+        assertEquals("aaaaa", this.user.getPhoto());
+    }
+
+    /**
+     * Tests the method {@code setPhoto} with null value.
+     */
+    @Test
+    void setPhoto_nullInput_valid() {
+        this.user.setPhoto(null);
+        assertEquals("https://st2.depositphotos.com/9223672/12056/v/950/depositphotos_120568236-stock-illustration-male-face-avatar-logo-template.jpg", this.user.getPhoto());
+    }
+
     /**
      * Tests the method {@code setRole} with common values where no problem should occur.
      */
     @Test
-    void testSetRole() {
+    void setRole_valid() {
         this.user.setRole(UserRole.EMPLOYER);
         assertEquals(UserRole.EMPLOYER, this.user.getRole());
     }
@@ -287 +508 @@
      * Tests the method {@code setRole} with null value.
      */
     @Test
-    void testSetRoleNull() {
+    void setRole_nullInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setRole(null));
     }
 
@@ -295 +516 @@
      * Tests the method {@code setStatus} with common values where no problem should occur.
      */
     @Test
-    void testSetStatus() {
+    void setStatus_valid() {
         this.user.setStatus(Status.ACCEPTED);
         assertEquals(Status.ACCEPTED, this.user.getStatus());
     }
@@ -304 +525 @@
      * Tests the method {@code setStatus} with null value.
      */
     @Test
-    void testSetStatusNull() {
+    void setStatus_nullInput() {
         assertThrows(IllegalArgumentException.class, () -> this.user.setStatus(null));
     }
 
@@ -312 +533 @@
      * Tests the method {@code takeVacation} with common values where no problem should occur.
      */
     @Test
-    void testTakeVacation() {
+    void takeVacation_valid() {
         this.user.setVacationCount(10f);
         this.user.takeVacation(LocalTime.of(15,0), LocalTime.of(20, 0));
-        assertEquals(5, this.user.getVacationCount());
+        assertEquals(5, this.user.getVacationCount().intValue());
     }
 
     /**
      * Tests the method {@code takeVacation} when there is not enough vacations.
      */
     @Test
-    void testTakeVacationException() {
+    void takeVacation_notEnough() {
         assertThrows(IllegalArgumentException.class, () -> this.user.takeVacation(LocalTime.of(15,0), LocalTime.of(20, 0)));
     }
 
@@ -330 +551 @@
      * Tests the method {@code takeVacation} with switched from and to parameters.
      */
     @Test
-    void testTakeVacationOrder() {
+    void takeVacation_order() {
         assertThrows(IllegalArgumentException.class, () -> this.user.takeVacation( LocalTime.of(20,0), LocalTime.of(10,0)));
     }
 
@@ -338 +559 @@
      * Tests the method {@code takeVacation} with from argument null.
      */
     @Test
-    void testTakeVacationNullFrom() {
+    void takeVacation_nullFrom() {
         assertThrows(IllegalArgumentException.class, () -> this.user.takeVacation(null, LocalTime.of(15,0)));
     }
 
@@ -346 +567 @@
      * Tests the method {@code takeVacation} with to argument null.
      */
     @Test
-    void testTakeVacationNullTo() {
+    void takeVacation_nullTo() {
         assertThrows(IllegalArgumentException.class, () -> this.user.takeVacation(LocalTime.of(15,0), null));
     }
 
@@ -354 +575 @@
      * Tests the method {@code takeVacation } with both arguments null.
      */
     @Test
-    void testTakeVacationNullBoth() {
+    void takeVacation_nullBoth() {
         assertThrows(IllegalArgumentException.class, () -> this.user.takeVacation(null, null));
     }
 
@@ -362 +583 @@
      * Tests the method {@code takeVacation} with common values where no problem should occur.
      */
     @Test
-    void testTakeSickDay() {
+    void takeSickDay_valid() {
         this.user.setTotalSickDayCount(5);
         this.user.takeSickDay();
-        assertEquals(1, this.user.getTakenSickDayCount());
+        assertEquals(1, this.user.getTakenSickDayCount().intValue());
     }
 
     /**
      * Tests the method {@code takeVacation} when there is not enough available sick days.
      */
     @Test
-    void testTakeSickDayException() {
+    void takeSickDay_notEnough() {
         assertThrows(IllegalArgumentException.class, () -> this.user.takeSickDay());
     }
 
@@ -381 +602 @@
      */
     @Test
     void testToString() {
-        User user = new User(5, "Jan", "Nov\u00E1k",0f, 10, 5, LocalDateTime.of(2008,10,30,20,0), "tokenContent", "[e-mail]", "url", LocalDateTime.of(2010,7,31,12,5), UserRole.EMPLOYER, Status.ACCEPTED);
+        User user = new User();
+        user.setId(5L);
+        user.setFirstName("Jan");
+        user.setLastName("Nov\u00E1k");
+        user.setVacationCount(0f);
+        user.setTotalSickDayCount(10);
+        user.setTakenSickDayCount(5);
+        user.setNotification(LocalDateTime.of(2008,10,30,20,0));
+        user.setToken("tokenContent");
+        user.setEmail("[e-mail]");
+        user.setPhoto("url");
+        user.setCreationDate(LocalDateTime.of(2010,7,31,12,5));
+        user.setRole(UserRole.EMPLOYER);
+        user.setStatus(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());
     }
 }