Add integration tests and fix build

irinakomarchenko · irinakomarchenko · commit 010b116b4727 · 2025-06-16T02:36:53.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -48,6 +48,18 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.19.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.19.7</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/myuserservice/mapper/UserMapper.java b/src/main/java/myuserservice/mapper/UserMapper.java
@@ -13,6 +13,7 @@ public static UserDto toDto(User user) {
                     .id(user.getId())
                     .name(user.getName())
                     .email(user.getEmail())
+                    .age(user.getAge())
                     .build();
         }
 
diff --git a/src/test/java/myuserservice/controller/UserControllerTest.java b/src/test/java/myuserservice/controller/UserControllerTest.java
@@ -1,6 +1,7 @@
 package myuserservice.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.EntityNotFoundException;
 import myuserservice.dto.UserDto;
 import myuserservice.service.UserService;
 import org.junit.jupiter.api.Test;
@@ -9,9 +10,17 @@
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.http.MediaType;
 
+import java.util.List;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
@@ -61,4 +70,92 @@ void testCreateUser() throws Exception {
                 .andExpect(jsonPath("$.email").value("alice@example.com"))
                 .andExpect(jsonPath("$.age").value(25));
     }
+
+    @Test
+    void testGetAllUsers() throws Exception {
+        List<UserDto> users = List.of(
+                UserDto.builder().id(1L).name("Alice").email("alice@example.com").age(25).build(),
+                UserDto.builder().id(2L).name("Bob").email("bob@example.com").age(30).build()
+        );
+
+        Mockito.when(userService.getAllUsers()).thenReturn(users);
+
+        mockMvc.perform(get("/api/users"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.length()").value(2))
+                .andExpect(jsonPath("$[0].name").value("Alice"))
+                .andExpect(jsonPath("$[1].name").value("Bob"));
+    }
+
+    @Test
+    void testGetUserById() throws Exception {
+        UserDto user = UserDto.builder().id(1L).name("Alice").email("alice@example.com").age(25).build();
+
+        Mockito.when(userService.getUser(1L)).thenReturn(user);
+
+        mockMvc.perform(get("/api/users/1"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.name").value("Alice"))
+                .andExpect(jsonPath("$.email").value("alice@example.com"));
+    }
+
+    @Test
+    void testUpdateUser() throws Exception {
+        UserDto updated = UserDto.builder()
+                .id(1L)
+                .name("Updated")
+                .email("alice@example.com")
+                .age(28)
+                .build();
+
+        Mockito.when(userService.updateUser(eq(1L), any(UserDto.class))).thenReturn(updated);
+
+        mockMvc.perform(put("/api/users/1")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(updated)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.name").value("Updated"))
+                .andExpect(jsonPath("$.age").value(28));
+    }
+
+    @Test
+    void testDeleteUser() throws Exception {
+        mockMvc.perform(delete("/api/users/1"))
+                .andExpect(status().isOk());
+
+        Mockito.verify(userService).deleteUser(1L);
+    }
+
+    @Test
+    void testCreateUser_invalidName() throws Exception {
+        UserDto invalidDto = UserDto.builder().name("A").email("a@ex.com").age(20).build();
+
+        mockMvc.perform(post("/api/users")
+                        .contentType("application/json")
+                        .content(objectMapper.writeValueAsString(invalidDto)))
+                .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    void testGetUser_notFound() throws Exception {
+        Mockito.when(userService.getUser(100L)).thenThrow(new EntityNotFoundException("User not found"));
+
+        mockMvc.perform(get("/api/users/100"))
+                .andExpect(status().isNotFound())
+                .andExpect(content().string("User not found"));
+    }
+
+    @Test
+    void testCreateUser_duplicateEmail() throws Exception {
+        UserDto user = UserDto.builder().name("Alice").email("alice@example.com").age(25).build();
+
+        Mockito.when(userService.createUser(any(UserDto.class)))
+                .thenThrow(new DataIntegrityViolationException("Email already exists"));
+
+        mockMvc.perform(post("/api/users")
+                        .contentType("application/json")
+                        .content(objectMapper.writeValueAsString(user)))
+                .andExpect(status().isBadRequest())
+                .andExpect(content().string("Email already exists"));
+    }
 }
diff --git a/src/test/java/myuserservice/integration/UserServiceIntegrationTest.java b/src/test/java/myuserservice/integration/UserServiceIntegrationTest.java
@@ -0,0 +1,32 @@
+package myuserservice.integration;
+
+import myuserservice.dto.UserDto;
+import myuserservice.repository.UserRepository;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@ActiveProfiles("test")
+class UserServiceIntegrationTest {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Test
+    void testSaveUser() {
+        var user = myuserservice.entity.User.builder()
+                .name("Zoe")
+                .email("zoe@example.com")
+                .age(30)
+                .build();
+
+        var saved = userRepository.save(user);
+
+        assertThat(saved.getId()).isNotNull();
+        assertThat(saved.getEmail()).isEqualTo("zoe@example.com");
+    }
+}
diff --git a/src/test/java/myuserservice/mapper/UserMapperTest.java b/src/test/java/myuserservice/mapper/UserMapperTest.java
@@ -0,0 +1,60 @@
+package myuserservice.mapper;
+
+import org.junit.jupiter.api.Test;
+import myuserservice.dto.UserDto;
+import myuserservice.entity.User;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class UserMapperTest {
+
+    @Test
+    void toDto_shouldReturnNullWhenUserIsNull() {
+        UserDto result = UserMapper.toDto(null);
+        assertThat(result).isNull();
+    }
+
+    @Test
+    void toEntity_shouldReturnNullWhenDtoIsNull() {
+        User result = UserMapper.toEntity(null);
+        assertThat(result).isNull();
+    }
+
+    @Test
+    void toDto_shouldMapFieldsCorrectly() {
+        User user = User.builder()
+                .id(1L)
+                .name("Alice")
+                .email("alice@example.com")
+                .age(30)
+                .build();
+
+        UserDto dto = UserMapper.toDto(user);
+
+        assertThat(dto).isNotNull();
+        assertThat(dto.getId()).isEqualTo(1L);
+        assertThat(dto.getName()).isEqualTo("Alice");
+        assertThat(dto.getEmail()).isEqualTo("alice@example.com");
+        assertThat(dto.getAge()).isEqualTo(30);
+    }
+
+
+    @Test
+    void toEntity_shouldMapFieldsCorrectly() {
+        UserDto dto = UserDto.builder()
+                .id(1L)
+                .name("Alice")
+                .email("alice@example.com")
+                .age(30)
+                .build();
+
+        User user = UserMapper.toEntity(dto);
+
+        assertThat(user).isNotNull();
+        assertThat(user.getId()).isEqualTo(1L);
+        assertThat(user.getName()).isEqualTo("Alice");
+        assertThat(user.getEmail()).isEqualTo("alice@example.com");
+        assertThat(user.getAge()).isEqualTo(30);
+    }
+}
diff --git a/src/test/java/myuserservice/service/UserServiceImplTest.java b/src/test/java/myuserservice/service/UserServiceImplTest.java
@@ -0,0 +1,112 @@
+package myuserservice.service;
+
+import myuserservice.dto.UserDto;
+import myuserservice.entity.User;
+import myuserservice.repository.UserRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+
+class UserServiceImplTest {
+    @Mock
+    private UserRepository userRepository;
+
+    @InjectMocks
+    private UserServiceImpl userService;
+
+    private User user;
+    private UserDto userDto;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+
+        user = User.builder()
+                .id(1L)
+                .name("Alice")
+                .email("alice@example.com")
+                .age(25)
+                .build();
+
+        userDto = UserDto.builder()
+                .id(1L)
+                .name("Alice")
+                .email("alice@example.com")
+                .age(25)
+                .build();
+    }
+
+    @Test
+    void createUser_shouldReturnCreatedUser() {
+        when(userRepository.save(any(User.class))).thenReturn(user);
+
+        UserDto result = userService.createUser(userDto);
+
+        assertThat(result).isNotNull();
+        assertThat(result.getEmail()).isEqualTo("alice@example.com");
+        verify(userRepository, times(1)).save(any(User.class));
+    }
+
+    @Test
+    void getUser_shouldReturnUser() {
+        when(userRepository.findById(1L)).thenReturn(Optional.of(user));
+
+        UserDto result = userService.getUser(1L);
+
+        assertThat(result).isNotNull();
+        assertThat(result.getId()).isEqualTo(1L);
+        verify(userRepository, times(1)).findById(1L);
+    }
+
+    @Test
+    void getUser_shouldThrowIfNotFound() {
+        when(userRepository.findById(1L)).thenReturn(Optional.empty());
+
+        assertThrows(RuntimeException.class, () -> userService.getUser(1L));
+    }
+
+    @Test
+    void getAllUsers_shouldReturnList() {
+        when(userRepository.findAll()).thenReturn(List.of(user));
+
+        List<UserDto> users = userService.getAllUsers();
+
+        assertThat(users).hasSize(1);
+        assertThat(users.get(0).getEmail()).isEqualTo("alice@example.com");
+    }
+
+    @Test
+    void updateUser_shouldUpdateSuccessfully() {
+        User updated = User.builder()
+                .id(1L)
+                .name("Updated")
+                .email("alice@example.com")
+                .age(30)
+                .build();
+
+        when(userRepository.findById(1L)).thenReturn(Optional.of(user));
+        when(userRepository.save(any(User.class))).thenReturn(updated);
+
+        UserDto result = userService.updateUser(1L, userDto);
+
+        assertThat(result.getName()).isEqualTo("Updated");
+    }
+
+    @Test
+    void deleteUser_shouldDelete() {
+        when(userRepository.existsById(1L)).thenReturn(true);
+
+        userService.deleteUser(1L);
+
+        verify(userRepository, times(1)).deleteById(1L);
+    }
+}
+
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
@@ -0,0 +1,5 @@
+spring.jpa.hibernate.ddl-auto=update
+spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver
+spring.datasource.url=jdbc:tc:postgresql:15://localhost/test
+spring.datasource.username=postgres
+spring.datasource.password=postgres

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public static UserDto toDto(User user) {`
`13`	`13`	`.id(user.getId())`
`14`	`14`	`.name(user.getName())`
`15`	`15`	`.email(user.getEmail())`
	`16`	`+ .age(user.getAge())`
`16`	`17`	`.build();`
`17`	`18`	`}`
`18`	`19`