Merge pull request #28 from codeurjc-students/testing/add-unit-integration-tests

Testing/add unit integration tests

Author: eloydsdlh

backend/pom.xml

@@ -84,6 +84,12 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>5.18.0</version>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 

backend/src/main/java/com/skyapartments/backend/controller/ApartmentController.java

@@ -39,4 +39,5 @@ public ResponseEntity<ApartmentDTO> getApartments(@PathVariable Long id) {
         return apartmentService.getApartmentById(id)
             .map(ResponseEntity::ok)
             .orElse(ResponseEntity.notFound().build());
-    }
+    }
+}

backend/src/test/java/com/skyapartments/backend/ApartmentApiTest.java renamed to backend/src/test/java/com/skyapartments/backend/e2e/ApartmentApiTest.java

@@ -1,4 +1,4 @@
-package com.skyapartments.backend;
+package com.skyapartments.backend.e2e;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

backend/src/test/java/com/skyapartments/backend/integration/ApartmentServiceIntegrationTest.java

@@ -0,0 +1,67 @@
+package com.skyapartments.backend.integration;
+
+import com.skyapartments.backend.dto.ApartmentDTO;
+import com.skyapartments.backend.model.Apartment;
+import com.skyapartments.backend.repository.ApartmentRepository;
+import com.skyapartments.backend.service.ApartmentService;
+import com.skyapartments.backend.testutils.AbstractMySQLTest;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ApartmentServiceIntegrationTest extends AbstractMySQLTest {
+
+    @Autowired
+    private ApartmentRepository apartmentRepository;
+
+    private ApartmentService apartmentService;
+
+    private Apartment savedApartment;
+
+    @BeforeEach
+    void setUp() {
+        apartmentRepository.deleteAll();
+        apartmentService = new ApartmentService(apartmentRepository);
+
+        savedApartment = apartmentRepository.save(
+            new Apartment("Test Apartment 1", "Nice view", "123 Fake St")
+        );
+    }
+
+    @Test
+    void shouldReturnAllApartments() {
+        List<ApartmentDTO> apartments = apartmentService.getAllApartments();
+
+        assertThat(apartments).hasSize(1);
+        assertThat(apartments.get(0).getName()).isEqualTo("Test Apartment 1");
+        assertThat(apartments.get(0).getDescription()).isEqualTo("Nice view");
+        assertThat(apartments.get(0).getAddress()).isEqualTo("123 Fake St");
+    }
+
+    @Test
+    void shouldReturnApartmentById() {
+        Optional<ApartmentDTO> apartmentOpt = apartmentService.getApartmentById(savedApartment.getId());
+
+        assertThat(apartmentOpt).isPresent();
+        ApartmentDTO apartment = apartmentOpt.get();
+        assertThat(apartment.getName()).isEqualTo("Test Apartment 1");
+        assertThat(apartment.getDescription()).isEqualTo("Nice view");
+        assertThat(apartment.getAddress()).isEqualTo("123 Fake St");
+    }
+
+    @Test
+    void shouldReturnEmptyWhenApartmentNotFound() {
+        Optional<ApartmentDTO> apartmentOpt = apartmentService.getApartmentById(9999L);
+
+        assertThat(apartmentOpt).isNotPresent();
+    }
+}

backend/src/test/java/com/skyapartments/backend/testutils/AbstractMySQLTest.java

@@ -0,0 +1,25 @@
+package com.skyapartments.backend.testutils;
+
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+public abstract class AbstractMySQLTest {
+
+    @Container
+    public static final MySQLContainer<?> mysqlContainer = new MySQLContainer<>("mysql:8.0")
+            .withDatabaseName("testdb")
+            .withUsername("testuser")
+            .withPassword("testpass");
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.datasource.url", mysqlContainer::getJdbcUrl);
+        registry.add("spring.datasource.username", mysqlContainer::getUsername);
+        registry.add("spring.datasource.password", mysqlContainer::getPassword);
+        registry.add("spring.datasource.driver-class-name", mysqlContainer::getDriverClassName);
+    }
+}

backend/src/test/java/com/skyapartments/backend/unit/ApartmentServiceTest.java

@@ -0,0 +1,67 @@
+package com.skyapartments.backend.unit;
+
+import com.skyapartments.backend.dto.ApartmentDTO;
+import com.skyapartments.backend.model.Apartment;
+import com.skyapartments.backend.repository.ApartmentRepository;
+import com.skyapartments.backend.service.ApartmentService;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class ApartmentServiceTest {
+    
+    private ApartmentService apartmentService;
+    private ApartmentRepository apartmentRepository = mock(ApartmentRepository.class);
+
+    public ApartmentServiceTest() {
+        apartmentService = new ApartmentService(apartmentRepository);
+    }
+
+    @Test
+    public void testGetAllApartments() {
+        Apartment apt1 = new Apartment("Test Apartment 1", "Nice view", "123 Fake St");
+        Apartment apt2 = new Apartment("Test Apartment 2", "Cozy place", "456 Real Ave");
+
+        when(apartmentRepository.findAll()).thenReturn(List.of(apt1, apt2));
+
+        List<ApartmentDTO> apartments = apartmentService.getAllApartments();
+
+        assertThat(apartments).hasSize(2);
+
+        assertThat(apartments.get(0).getName()).isEqualTo("Test Apartment 1");
+        assertThat(apartments.get(0).getDescription()).isEqualTo("Nice view");
+        assertThat(apartments.get(0).getAddress()).isEqualTo("123 Fake St");
+
+        assertThat(apartments.get(1).getName()).isEqualTo("Test Apartment 2");
+        assertThat(apartments.get(1).getDescription()).isEqualTo("Cozy place");
+        assertThat(apartments.get(1).getAddress()).isEqualTo("456 Real Ave");
+    }
+
+    @Test
+    public void testGetApartmentByIdFound() {
+        Apartment apt = new Apartment("Test", "Nice", "Street 1");
+        when(apartmentRepository.findById(1L)).thenReturn(Optional.of(apt));
+
+        Optional<ApartmentDTO> result = apartmentService.getApartmentById(1L);
+        assertThat(result).isPresent();
+        assertEquals("Test", result.get().getName());
+        assertEquals("Nice", result.get().getDescription());
+        assertEquals("Street 1", result.get().getAddress());
+    }
+
+    @Test
+    public void testGetApartmentByIdNotFound() {
+        when(apartmentRepository.findById(1L)).thenReturn(Optional.empty());
+        
+        Optional<ApartmentDTO> result = apartmentService.getApartmentById(1L);
+        assertThat(result).isNotPresent();
+    }
+
+}

backend/target/classes/com/skyapartments/backend/controller/ApartmentController.class

@@ -88,7 +88,8 @@
             "styles": [
               "src/styles.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "karmaConfig": "karma.conf.js"
           }
         }
       }

backend/target/test-classes/com/skyapartments/backend/ApartmentApiTest.class

@@ -0,0 +1,22 @@
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    reporters: ['progress', 'kjhtml'],
+    browsers: ['Chrome'], //ChromeHeadless for non-GUI environments
+    restartOnFileChange: true,
+    proxies: {
+      '/api/': 'http://localhost:8080/api/'
+    },
+  });
+};