sonarlist and checkstyle fixes

erikbjo · Dec 9, 2023 · 1c61575 · 1c61575
1 parent 55d942a
commit 1c61575
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 48 deletions.
diff --git a/src/main/java/no/ntnu/erbj/tds/dao/TrainDao.java b/src/main/java/no/ntnu/erbj/tds/dao/TrainDao.java
@@ -133,21 +133,4 @@ public boolean trainNumberIsUnique(String trainNumber) {
     long count = query.getSingleResult();
     return count == 0;
   }
-
-  /**
-   * Updates the wagons of a train. Sets the train of each wagon to the given train.
-   *
-   * @param train the train to update the wagons of.
-   */
-  private void updateWagonsOfTrain(Train train) {
-    train
-        .getWagons()
-        .forEach(
-            wagon -> {
-              if (!em.contains(wagon)) {
-                wagon = em.merge(wagon);
-              }
-              wagon.setTrain(train);
-            });
-  }
 }
diff --git a/src/test/java/no/ntnu/erbj/tds/TdsApplicationTests.java b/src/test/java/no/ntnu/erbj/tds/TdsApplicationTests.java
diff --git a/src/test/java/no/ntnu/erbj/tds/model/DepartureBuilderTest.java b/src/test/java/no/ntnu/erbj/tds/model/DepartureBuilderTest.java
@@ -5,21 +5,28 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.LocalTime;
-
 import no.ntnu.erbj.tds.model.departures.DepartureBuilder;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class DepartureBuilderTest {
+  private DepartureBuilder departureBuilder;
+
+  @BeforeEach
+  void setUp() {
+    departureBuilder = new DepartureBuilder();
+  }
+
   /** Method under test: {@link DepartureBuilder#setDepartureTime(String)} */
   @Test
   void testSetDepartureTime() {
     assertThrows(
         IllegalArgumentException.class,
-        () -> (new DepartureBuilder()).setDepartureTime("Departure Time String"));
+        () -> departureBuilder.setDepartureTime("Departure Time String"));
     assertThrows(
-        IllegalArgumentException.class, () -> (new DepartureBuilder()).setDepartureTime(null));
+        IllegalArgumentException.class, () -> departureBuilder.setDepartureTime(null));
     assertThrows(
-        IllegalArgumentException.class, () -> (new DepartureBuilder()).setDepartureTime(""));
+        IllegalArgumentException.class, () -> departureBuilder.setDepartureTime(""));
   }
 
   /** Method under test: {@link DepartureBuilder#setDepartureTime(String)} */
@@ -43,8 +50,8 @@ void testSetLinePos() {
   /** Method under test: {@link DepartureBuilder#setLine(String)} */
   @Test
   void testSetLineNeg() {
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setLine(null));
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setLine(""));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setLine(null));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setLine(""));
   }
 
   /** Method under test: {@link DepartureBuilder#setDestination(String)} */
@@ -59,17 +66,14 @@ void testSetDestinationPos() {
   /** Method under test: {@link DepartureBuilder#setDestination(String)} */
   @Test
   void testSetDestinationNeg() {
-    assertThrows(
-        IllegalArgumentException.class, () -> (new DepartureBuilder()).setDestination(null));
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setDestination(""));
-    assertThrows(
-        IllegalArgumentException.class, () -> (new DepartureBuilder()).setDestination(" "));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setDestination(null));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setDestination(""));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setDestination(" "));
   }
 
   /** Method under test: {@link DepartureBuilder#setTrack(int)} */
   @Test
   void testSetTrackPog() {
-    DepartureBuilder departureBuilder = new DepartureBuilder();
     DepartureBuilder actualSetTrackResult = departureBuilder.setTrack(1);
     assertSame(departureBuilder, actualSetTrackResult);
     assertEquals(1, actualSetTrackResult.getTrack());
@@ -78,21 +82,20 @@ void testSetTrackPog() {
   /** Method under test: {@link DepartureBuilder#setTrack(int)} */
   @Test
   void testSetTrackNeg() {
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setTrack(0));
+    assertThrows(IllegalArgumentException.class, () ->departureBuilder.setTrack(0));
   }
 
   /** Method under test: {@link DepartureBuilder#setDelay(String)} */
   @Test
   void testSetDelayNeg() {
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setDelay("Delay"));
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setDelay(null));
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setDelay(""));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setDelay("Delay"));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setDelay(null));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setDelay(""));
   }
 
   /** Method under test: {@link DepartureBuilder#setDelay(String)} */
   @Test
   void testSetDelayPositive() {
-    DepartureBuilder departureBuilder = new DepartureBuilder();
     DepartureBuilder actualSetDelayResult = departureBuilder.setDelay("20:20");
     assertSame(departureBuilder, actualSetDelayResult);
     assertEquals(LocalTime.of(20, 20), actualSetDelayResult.getDelay());
@@ -101,7 +104,6 @@ void testSetDelayPositive() {
   /** Method under test: {@link DepartureBuilder#setTrain(Train)} */
   @Test
   void testSetTrainPos() {
-    DepartureBuilder departureBuilder = new DepartureBuilder();
     Train train = new Train();
     DepartureBuilder actualSetTrainResult = departureBuilder.setTrain(train);
     assertSame(departureBuilder, actualSetTrainResult);
@@ -111,6 +113,6 @@ void testSetTrainPos() {
   /** Method under test: {@link DepartureBuilder#setTrain(Train)} */
   @Test
   void testSetTrainNeg() {
-    assertThrows(IllegalArgumentException.class, () -> (new DepartureBuilder()).setTrain(null));
+    assertThrows(IllegalArgumentException.class, () -> departureBuilder.setTrain(null));
   }
 }
diff --git a/src/test/java/no/ntnu/erbj/tds/model/WagonTest.java b/src/test/java/no/ntnu/erbj/tds/model/WagonTest.java
@@ -70,15 +70,18 @@ void reserveSeatsNegative() {
   /** Method under test: {@link Wagon#reserveSeats(int)} */
   @Test
   void reserveSeatsTooMany() {
+    int sleepingSeats = WagonType.SLEEPING.getSeats();
+    int passengerSeats = WagonType.PASSENGER.getSeats();
+    int freightSeats = WagonType.FREIGHT.getSeats();
     assertThrows(
         IllegalArgumentException.class,
-        () -> sleepingWagon.reserveSeats(WagonType.SLEEPING.getSeats() + 1));
+        () -> sleepingWagon.reserveSeats(sleepingSeats + 1));
     assertThrows(
         IllegalArgumentException.class,
-        () -> passengerWagon.reserveSeats(WagonType.PASSENGER.getSeats() + 1));
+        () -> passengerWagon.reserveSeats(passengerSeats + 1));
     assertThrows(
         IllegalArgumentException.class,
-        () -> freightWagon.reserveSeats(WagonType.FREIGHT.getSeats() + 1));
+        () -> freightWagon.reserveSeats(freightSeats + 1));
   }
 
   /** Method under test: {@link Wagon#cancelReservation(int)} */