Merge pull request #61 from SelahattinSert/dependabot/maven/spring-dependencies-9ff97370fe

Bump org.springframework.boot:spring-boot-starter-parent from 3.3.8 to 3.5.6 in the spring-dependencies group

Author: SelahattinSert

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.8</version>
+        <version>3.5.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.onboarding.camera</groupId>

src/test/java/com/onboarding/camera/cameraonboarding/repository/LightSensorRepositoryTest.java

@@ -129,10 +129,8 @@ public void expect_deleteCamera_removesAssociatedSensors() {
 
         // Arrange
         Camera camera = new Camera();
-        camera.setCamId(CAMERA_ID);
         camera.setCameraName(CAMERA_NAME);
         camera.setFirmwareVersion(FIRMWARE_VERSION);
-        camera = cameraRepository.save(camera);
 
         LightSensor sensor1 = new LightSensor();
         sensor1.setName(SENSOR_NAME);
@@ -147,37 +145,40 @@ public void expect_deleteCamera_removesAssociatedSensors() {
         camera.getSensors().add(sensor1);
         camera.getSensors().add(sensor2);
 
-        lightSensorRepository.save(sensor1);
-        lightSensorRepository.save(sensor2);
+        Camera savedCamera = cameraRepository.save(camera);
+        UUID savedCameraId = savedCamera.getCamId();
+
 
         // Act
-        cameraRepository.delete(camera);
+        cameraRepository.deleteById(savedCameraId);
 
         // Assert
-        Assertions.assertThat(lightSensorRepository.findLightSensorByCamera(camera)).isEmpty();
+        Assertions.assertThat(lightSensorRepository.findById(sensor1.getId())).isEmpty();
+        Assertions.assertThat(lightSensorRepository.findById(sensor2.getId())).isEmpty();
+        Assertions.assertThat(cameraRepository.findById(savedCameraId)).isEmpty();
     }
 
     @Test
     public void expect_findLightSensorsByCamera_returnsLightSensors() {
         // Arrange
         Camera camera = new Camera();
-        camera.setCamId(CAMERA_ID);
         camera.setCameraName(CAMERA_NAME);
         camera.setFirmwareVersion(FIRMWARE_VERSION);
-        Camera savedCamera = cameraRepository.save(camera);
 
         LightSensor sensor1 = new LightSensor();
         sensor1.setName(SENSOR_NAME);
         sensor1.setSensorType(SENSOR_TYPE);
-        sensor1.setCamera(savedCamera);
+        sensor1.setCamera(camera);
 
         LightSensor sensor2 = new LightSensor();
         sensor2.setName(SENSOR_NAME_2);
         sensor2.setSensorType(SENSOR_TYPE);
-        sensor2.setCamera(savedCamera);
+        sensor2.setCamera(camera);
 
-        lightSensorRepository.save(sensor1);
-        lightSensorRepository.save(sensor2);
+        camera.getSensors().add(sensor1);
+        camera.getSensors().add(sensor2);
+
+        Camera savedCamera = cameraRepository.save(camera);
 
         // Act
         List<LightSensor> sensors = lightSensorRepository.findLightSensorByCamera(savedCamera);

src/test/java/com/onboarding/camera/cameraonboarding/repository/MotionSensorRepositoryTest.java

@@ -129,10 +129,8 @@ public void expect_deleteCamera_removesAssociatedSensors() {
 
         // Arrange
         Camera camera = new Camera();
-        camera.setCamId(CAMERA_ID);
         camera.setCameraName(CAMERA_NAME);
         camera.setFirmwareVersion(FIRMWARE_VERSION);
-        camera = cameraRepository.save(camera);
 
         MotionSensor sensor1 = new MotionSensor();
         sensor1.setName(SENSOR_NAME);
@@ -147,37 +145,40 @@ public void expect_deleteCamera_removesAssociatedSensors() {
         camera.getSensors().add(sensor1);
         camera.getSensors().add(sensor2);
 
-        motionSensorRepository.save(sensor1);
-        motionSensorRepository.save(sensor2);
+        Camera savedCamera = cameraRepository.save(camera);
+        UUID savedCameraId = savedCamera.getCamId();
+
 
         // Act
-        cameraRepository.delete(camera);
+        cameraRepository.deleteById(savedCameraId);
 
         // Assert
-        Assertions.assertThat(motionSensorRepository.findMotionSensorByCamera(camera)).isEmpty();
+        Assertions.assertThat(motionSensorRepository.findById(sensor1.getId())).isEmpty();
+        Assertions.assertThat(motionSensorRepository.findById(sensor2.getId())).isEmpty();
+        Assertions.assertThat(cameraRepository.findById(savedCameraId)).isEmpty();
     }
 
     @Test
     public void expect_findMotionSensorsByCamera_returnsMotionSensors() {
         // Arrange
         Camera camera = new Camera();
-        camera.setCamId(CAMERA_ID);
         camera.setCameraName(CAMERA_NAME);
         camera.setFirmwareVersion(FIRMWARE_VERSION);
-        Camera savedCamera = cameraRepository.save(camera);
 
         MotionSensor sensor1 = new MotionSensor();
         sensor1.setName(SENSOR_NAME);
         sensor1.setSensorType(SENSOR_TYPE);
-        sensor1.setCamera(savedCamera);
+        sensor1.setCamera(camera);
 
         MotionSensor sensor2 = new MotionSensor();
         sensor2.setName(SENSOR_NAME_2);
         sensor2.setSensorType(SENSOR_TYPE);
-        sensor2.setCamera(savedCamera);
+        sensor2.setCamera(camera);
 
-        motionSensorRepository.save(sensor1);
-        motionSensorRepository.save(sensor2);
+        camera.getSensors().add(sensor1);
+        camera.getSensors().add(sensor2);
+
+        Camera savedCamera = cameraRepository.save(camera);
 
         // Act
         List<MotionSensor> sensors = motionSensorRepository.findMotionSensorByCamera(savedCamera);

src/test/java/com/onboarding/camera/cameraonboarding/repository/TemperatureSensorRepositoryTest.java

@@ -129,10 +129,8 @@ public void expect_deleteCamera_removesAssociatedSensors() {
 
         // Arrange
         Camera camera = new Camera();
-        camera.setCamId(CAMERA_ID);
         camera.setCameraName(CAMERA_NAME);
         camera.setFirmwareVersion(FIRMWARE_VERSION);
-        camera = cameraRepository.save(camera);
 
         TemperatureSensor sensor1 = new TemperatureSensor();
         sensor1.setName(SENSOR_NAME);
@@ -147,37 +145,40 @@ public void expect_deleteCamera_removesAssociatedSensors() {
         camera.getSensors().add(sensor1);
         camera.getSensors().add(sensor2);
 
-        temperatureSensorRepository.save(sensor1);
-        temperatureSensorRepository.save(sensor2);
+        Camera savedCamera = cameraRepository.save(camera);
+        UUID savedCameraId = savedCamera.getCamId();
+
 
         // Act
-        cameraRepository.delete(camera);
+        cameraRepository.deleteById(savedCameraId);
 
         // Assert
-        Assertions.assertThat(temperatureSensorRepository.findTemperatureSensorByCamera(camera)).isEmpty();
+        Assertions.assertThat(temperatureSensorRepository.findById(sensor1.getId())).isEmpty();
+        Assertions.assertThat(temperatureSensorRepository.findById(sensor2.getId())).isEmpty();
+        Assertions.assertThat(cameraRepository.findById(savedCameraId)).isEmpty();
     }
 
     @Test
     public void expect_findTemperatureSensorsByCamera_returnsTemperatureSensors() {
         // Arrange
         Camera camera = new Camera();
-        camera.setCamId(CAMERA_ID);
         camera.setCameraName(CAMERA_NAME);
         camera.setFirmwareVersion(FIRMWARE_VERSION);
-        Camera savedCamera = cameraRepository.save(camera);
 
         TemperatureSensor sensor1 = new TemperatureSensor();
         sensor1.setName(SENSOR_NAME);
         sensor1.setSensorType(SENSOR_TYPE);
-        sensor1.setCamera(savedCamera);
+        sensor1.setCamera(camera);
 
         TemperatureSensor sensor2 = new TemperatureSensor();
         sensor2.setName(SENSOR_NAME_2);
         sensor2.setSensorType(SENSOR_TYPE);
-        sensor2.setCamera(savedCamera);
+        sensor2.setCamera(camera);
 
-        temperatureSensorRepository.save(sensor1);
-        temperatureSensorRepository.save(sensor2);
+        camera.getSensors().add(sensor1);
+        camera.getSensors().add(sensor2);
+
+        Camera savedCamera = cameraRepository.save(camera);
 
         // Act
         List<TemperatureSensor> sensors = temperatureSensorRepository.findTemperatureSensorByCamera(savedCamera);