Skip to content

Commit 1b2d598

Browse files
rranjanguptaclaude
andcommitted
fix: guard teardown against nulls and use assertNotNull in VehicleServiceTest
Add null checks in @AfterEach tearDown() to prevent NullPointerException if setUp() partially fails. Replace assertTrue(x != null) with assertNotNull(x). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 3fdda66 commit 1b2d598

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

single-table-inheritance/src/test/java/com/iluwatar/service/VehicleServiceTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import static org.junit.jupiter.api.Assertions.assertEquals;
2929
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
30+
import static org.junit.jupiter.api.Assertions.assertNotNull;
3031
import static org.junit.jupiter.api.Assertions.assertNull;
3132
import static org.junit.jupiter.api.Assertions.assertTrue;
3233

@@ -73,10 +74,10 @@ void setUp() {
7374

7475
@AfterEach
7576
void tearDown() {
76-
vehicleService.deleteVehicle(savedCar);
77-
vehicleService.deleteVehicle(savedTruck);
78-
vehicleService.deleteVehicle(savedTrain);
79-
vehicleService.deleteVehicle(savedFreighter);
77+
if (savedCar != null) vehicleService.deleteVehicle(savedCar);
78+
if (savedTruck != null) vehicleService.deleteVehicle(savedTruck);
79+
if (savedTrain != null) vehicleService.deleteVehicle(savedTrain);
80+
if (savedFreighter != null) vehicleService.deleteVehicle(savedFreighter);
8081
}
8182

8283

@@ -117,7 +118,8 @@ void saveVehicle_shouldPersistFreighterWithCorrectType() {
117118
@Test
118119
void getVehicle_shouldReturnCorrectVehicleById() {
119120
Vehicle fetched = vehicleService.getVehicle(savedCar.getVehicleId());
120-
assertTrue(fetched != null);
121+
122+
assertNotNull(fetched);
121123
assertInstanceOf(Car.class, fetched);
122124
assertEquals(savedCar.getVehicleId(), fetched.getVehicleId());
123125
}
@@ -133,7 +135,7 @@ void getVehicle_shouldReturnNullForNonexistentId() {
133135
@Test
134136
void getAllVehicles_shouldReturnAllSavedVehicles() {
135137
List<Vehicle> all = vehicleService.getAllVehicles();
136-
assertTrue(all != null);
138+
assertNotNull(all);
137139
// At minimum the 4 vehicles saved in @BeforeEach must be present
138140
assertTrue_containsId(all, savedCar.getVehicleId());
139141
assertTrue_containsId(all, savedTruck.getVehicleId());

0 commit comments

Comments
 (0)