From 54c2307183e69b20b9a522b43b05e46fd18c53f2 Mon Sep 17 00:00:00 2001 From: egnaf Date: Sat, 23 Nov 2019 21:40:14 +0300 Subject: [PATCH 1/8] Add codec coverage plugin and script to .travis.yml --- .travis.yml | 3 +++ backend/pom.xml | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 008d614..37652ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,7 @@ language: java install: true script: - cd backend && mvn -B verify && cd .. + - mvn cobertura:cobertura +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/backend/pom.xml b/backend/pom.xml index 4aca09b..7a174ad 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -63,6 +63,18 @@ org.springframework.boot spring-boot-maven-plugin + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + From b7ba7c001e322e8e05bfedf2065566e8ede5f787 Mon Sep 17 00:00:00 2001 From: egnaf Date: Sat, 23 Nov 2019 22:41:13 +0300 Subject: [PATCH 2/8] Fix codecov and add status button --- .travis.yml | 16 ++++++++++++++-- README.md | 2 +- backend/pom.xml | 27 +++++++++++++++++---------- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37652ce..3e4554c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,20 @@ language: java +jdk: openjdk8 install: true + +cache: + directories: + - $HOME/.m2 + script: - cd backend && mvn -B verify && cd .. - - mvn cobertura:cobertura after_success: - - bash <(curl -s https://codecov.io/bash) + - bash <(curl -s https://codecov.io/bash) + +notifications: + email: + recipients: + - egnaf@yahoo.com + on_success: never + on_failure: always diff --git a/README.md b/README.md index d4c6c57..9a3cb92 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/egnaf/spring-boot-docker-example.svg)](https://travis-ci.org/egnaf/spring-boot-docker-example) - +[![codecov](https://codecov.io/gh/egnaf/spring-boot-docker-example/branch/dev/graph/badge.svg)](https://codecov.io/gh/egnaf/spring-boot-docker-example) # spring-boot-docker-example ## Stack diff --git a/backend/pom.xml b/backend/pom.xml index 7a174ad..128f358 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -64,16 +64,23 @@ spring-boot-maven-plugin - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - + org.jacoco + jacoco-maven-plugin + 0.8.4 + + + + prepare-agent + + + + report + test + + report + + + From 43f4f8986b26db8d55d8152136e7cb4dd561139d Mon Sep 17 00:00:00 2001 From: egnaf Date: Sun, 24 Nov 2019 00:28:37 +0300 Subject: [PATCH 3/8] Disable banner mode for dev profile --- backend/src/main/resources/application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 7742360..09e8378 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -6,6 +6,8 @@ server: spring: profiles: active: dev + main: + banner-mode: off datasource: driver-class-name: org.postgresql.Driver url: jdbc:postgresql://postgres:5432/demo?createDatabaseIfNotExist=true From 9b7d761ec3a418db4619a70cb74199479eab1ccb Mon Sep 17 00:00:00 2001 From: egnaf Date: Sun, 24 Nov 2019 00:29:34 +0300 Subject: [PATCH 4/8] Add application properties file for testing --- backend/src/test/resources/application.yml | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 backend/src/test/resources/application.yml diff --git a/backend/src/test/resources/application.yml b/backend/src/test/resources/application.yml new file mode 100644 index 0000000..b8bb797 --- /dev/null +++ b/backend/src/test/resources/application.yml @@ -0,0 +1,33 @@ +server: + port: 8080 + servlet: + context-path: /api/0.1 + +spring: + profiles: + active: dev + main: + banner-mode: off + datasource: + driver-class-name: org.h2.Driver + url: jdbc:h2:mem:testdb + username: sa + password: password + jpa: + hibernate: + ddl-auto: create-drop + show-sql: false + database: postgresql + database-platform: org.hibernate.dialect.H2Dialect + open-in-view: false + generate-ddl: false + h2: + console: + enabled: true + +logging: + pattern: + console: "%d %-5level %logger : %msg%n" + level: + org.springframework: INFO + org.hibernate: INFO From 21ac7bfc45888821745a8f837f839c075530c96d Mon Sep 17 00:00:00 2001 From: egnaf Date: Sun, 24 Nov 2019 00:30:00 +0300 Subject: [PATCH 5/8] Add h2 database dependency --- backend/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backend/pom.xml b/backend/pom.xml index 128f358..ee8329f 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -35,6 +35,11 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-test + test + org.springframework.boot spring-boot-starter-data-jpa @@ -44,6 +49,12 @@ postgresql 9.4.1210 + + com.h2database + h2 + 1.4.195 + test + org.projectlombok lombok From a9b39272565dc46f7754f85a1289f895db44827e Mon Sep 17 00:00:00 2001 From: egnaf Date: Sun, 24 Nov 2019 00:34:51 +0300 Subject: [PATCH 6/8] Add tests for user service --- .../service/impl/UserServiceImplTest.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java diff --git a/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java b/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java new file mode 100644 index 0000000..76063b8 --- /dev/null +++ b/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java @@ -0,0 +1,51 @@ +package com.github.egnaf.spring_boot_docker_example.service.impl; + +import com.github.egnaf.spring_boot_docker_example.domain.User; +import com.github.egnaf.spring_boot_docker_example.exception.UserNotFoundException; +import com.github.egnaf.spring_boot_docker_example.repository.UserRepository; +import com.github.egnaf.spring_boot_docker_example.service.UserService; +import lombok.extern.slf4j.Slf4j; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.junit.Assert.assertEquals; + +@Slf4j +@RunWith(SpringRunner.class) +@SpringBootTest +public class UserServiceImplTest { + + @Autowired + private UserRepository userRepository; + + @Autowired + private UserService userService; + + @Before + public void setUp() { + User user1 = new User(1L, "user1", "user1@mail.com", "pass"); + userRepository.save(user1); + log.debug(user1.toString()); + + User user2 = new User(2L, "user2", "user2@mail.com", "test"); + userRepository.save(user2); + log.debug(user2.toString()); + } + + @Test + public void getUserTest() throws UserNotFoundException { + User actual = userService.getUser(1L); + User expected = new User(1L, "user1", "user1@mail.com", "pass"); + assertEquals(expected, actual); + } + + @After + public void tearDown() { + userRepository.deleteAll(); + } +} From 2455cce3923ba3911709cde98ebcf320b0203fdf Mon Sep 17 00:00:00 2001 From: egnaf Date: Sun, 24 Nov 2019 00:43:31 +0300 Subject: [PATCH 7/8] Create a code coverage configuration file --- codecov.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..0bb5946 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,25 @@ +codecov: + require_ci_to_pass: true + +coverage: + precision: 2 + round: down + range: "70...100" + + status: + project: true + patch: yes + changes: no + +parsers: + gcov: + branch_detection: + conditional: yes + loop: yes + method: no + macro: no + +comment: + layout: diff + behavior: default + require_changes: false From b0ec2e5c886c46aed0471b0cc4bca44f02ec08d6 Mon Sep 17 00:00:00 2001 From: egnaf Date: Sun, 24 Nov 2019 01:21:17 +0300 Subject: [PATCH 8/8] Fix user service and test methods --- .../service/UserService.java | 6 ++- .../service/impl/UserServiceImpl.java | 3 ++ .../service/impl/UserServiceImplTest.java | 42 ++++++++++++++++--- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/UserService.java b/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/UserService.java index 62bdebb..34fbe52 100644 --- a/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/UserService.java +++ b/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/UserService.java @@ -1,12 +1,14 @@ package com.github.egnaf.spring_boot_docker_example.service; import com.github.egnaf.spring_boot_docker_example.domain.User; +import com.github.egnaf.spring_boot_docker_example.exception.UserExistsException; +import com.github.egnaf.spring_boot_docker_example.exception.UserNotFoundException; import java.util.List; public interface UserService { List getUsers(); - User getUser(long id); - User addUser(String nickname, String email, String password); + User getUser(long id) throws UserNotFoundException; + User addUser(String nickname, String email, String password) throws UserExistsException; } diff --git a/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImpl.java b/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImpl.java index 667e03a..5ee62ee 100644 --- a/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImpl.java +++ b/backend/src/main/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImpl.java @@ -5,6 +5,7 @@ import com.github.egnaf.spring_boot_docker_example.exception.UserNotFoundException; import com.github.egnaf.spring_boot_docker_example.repository.UserRepository; import com.github.egnaf.spring_boot_docker_example.service.UserService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,6 +13,7 @@ import java.util.Optional; @Service +@Slf4j public class UserServiceImpl implements UserService { private final UserRepository userRepository; @@ -33,6 +35,7 @@ public User getUser(long id) { if (user.isPresent()) { return user.get(); } else { + log.info(String.valueOf(user.orElse(null))); throw new UserNotFoundException(); } } diff --git a/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java b/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java index 76063b8..dd5b54c 100644 --- a/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java +++ b/backend/src/test/java/com/github/egnaf/spring_boot_docker_example/service/impl/UserServiceImplTest.java @@ -1,11 +1,11 @@ package com.github.egnaf.spring_boot_docker_example.service.impl; import com.github.egnaf.spring_boot_docker_example.domain.User; +import com.github.egnaf.spring_boot_docker_example.exception.UserExistsException; import com.github.egnaf.spring_boot_docker_example.exception.UserNotFoundException; import com.github.egnaf.spring_boot_docker_example.repository.UserRepository; import com.github.egnaf.spring_boot_docker_example.service.UserService; import lombok.extern.slf4j.Slf4j; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -13,6 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.util.ArrayList; +import java.util.List; + import static org.junit.Assert.assertEquals; @Slf4j @@ -38,14 +41,41 @@ public void setUp() { } @Test - public void getUserTest() throws UserNotFoundException { - User actual = userService.getUser(1L); + public void getUsers() { + //expected + List expected = new ArrayList<>(); + expected.add(new User(1L, "user1", "user1@mail.com", "pass")); + expected.add(new User(2L, "user2", "user2@mail.com", "test")); + + //actual + List actual = userService.getUsers(); + + //assert + assertEquals(expected, actual); + } + + @Test + public void getUser() throws UserNotFoundException { + //expected User expected = new User(1L, "user1", "user1@mail.com", "pass"); + + //actual + User actual = userService.getUser(1L); + + //assert assertEquals(expected, actual); } - @After - public void tearDown() { - userRepository.deleteAll(); + @Test + public void addUser() throws UserExistsException { + //expected + User expected = new User(3L, "user3", "user3@mail.com", "demo"); + + //actual + User actual = userService.addUser(expected.getNickname(), expected.getEmail(), expected.getPassword()); + userRepository.deleteById(3L); + + //assert + assertEquals(expected, actual); } }