📍Use lombok, reformat, and optimize the code (#1560)

* Use lombok, reformat, and optimize the code

* Fix merge conflicts and some sonar issues

Co-authored-by: va1m <va1m@email.com>
This commit is contained in:
va1m
2021-03-13 13:19:21 +01:00
committed by GitHub
parent 0e26a6adb5
commit 5cf2fe009b
681 changed files with 2472 additions and 4966 deletions
@@ -23,16 +23,16 @@
package com.iluwatar.transactionscript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
* Tests {@link Room}.
*/
public class RoomTest {
class RoomTest {
private Room room;
private static final int ID = 1;
@@ -41,33 +41,33 @@ public class RoomTest {
private static final boolean BOOKED = false;
@BeforeEach
public void setUp() {
void setUp() {
room = new Room(ID, ROOMTYPE, PRICE, BOOKED);
}
@Test
public void getAndSetId() {
void getAndSetId() {
final var newId = 2;
room.setId(newId);
assertEquals(newId, room.getId());
}
@Test
public void getAndSetRoomType() {
void getAndSetRoomType() {
final var newRoomType = "Double";
room.setRoomType(newRoomType);
assertEquals(newRoomType, room.getRoomType());
}
@Test
public void getAndSetLastName() {
void getAndSetLastName() {
final var newPrice = 60;
room.setPrice(newPrice);
assertEquals(newPrice, room.getPrice());
}
@Test
public void notEqualWithDifferentId() {
void notEqualWithDifferentId() {
final var newId = 2;
final var otherRoom = new Room(newId, ROOMTYPE, PRICE, BOOKED);
assertNotEquals(room, otherRoom);
@@ -75,21 +75,21 @@ public class RoomTest {
}
@Test
public void equalsWithSameObjectValues() {
void equalsWithSameObjectValues() {
final var otherRoom = new Room(ID, ROOMTYPE, PRICE, BOOKED);
assertEquals(room, otherRoom);
assertEquals(room.hashCode(), otherRoom.hashCode());
}
@Test
public void equalsWithSameObjects() {
void equalsWithSameObjects() {
assertEquals(room, room);
assertEquals(room.hashCode(), room.hashCode());
}
@Test
public void testToString() {
assertEquals(String.format("Room{id=%s, roomType=%s, price=%s, booked=%s}",
void testToString() {
assertEquals(String.format("Room(id=%s, roomType=%s, price=%s, booked=%s)",
room.getId(), room.getRoomType(), room.getPrice(), room.isBooked()), room.toString());
}
}