From 6d2514203a94beb657eb307ee5342fb8887e20e3 Mon Sep 17 00:00:00 2001 From: jkazama Date: Fri, 20 Nov 2020 13:00:44 +0900 Subject: [PATCH] Spring Boot 2.3.0 to 2.4.0 Gradle 6.4.1 to 6.7 --- build.gradle | 10 +++++----- src/test/java/sample/EntityTestSupport.java | 6 +++--- src/test/java/sample/model/account/AccountTest.java | 4 ++-- src/test/java/sample/model/asset/AssetTest.java | 4 ++-- src/test/java/sample/model/asset/CashBalanceTest.java | 4 ++-- src/test/java/sample/model/asset/CashInOutTest.java | 4 ++-- src/test/java/sample/model/asset/CashflowTest.java | 4 ++-- src/test/java/sample/util/CalculatorTest.java | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 5bc6864..c3e021b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ plugins { id "java" id "eclipse" - id "org.springframework.boot" version "2.3.0.RELEASE" - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id "org.springframework.boot" version "2.4.0" + id "io.spring.dependency-management" version "1.0.10.RELEASE" } -ext['lombok.version'] = "1.18.12" +ext['lombok.version'] = "1.18.16" -version = "2.3.0" +version = "2.4.0" sourceCompatibility = '1.8' targetCompatibility = '1.8' @@ -49,5 +49,5 @@ dependencies { } wrapper { - gradleVersion = "6.4.1" + gradleVersion = "6.7" } diff --git a/src/test/java/sample/EntityTestSupport.java b/src/test/java/sample/EntityTestSupport.java index e33a0fb..d17431f 100644 --- a/src/test/java/sample/EntityTestSupport.java +++ b/src/test/java/sample/EntityTestSupport.java @@ -7,7 +7,7 @@ import javax.sql.DataSource; import org.hibernate.cfg.AvailableSettings; -import org.junit.*; +import org.junit.jupiter.api.*; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder.Builder; import org.springframework.orm.jpa.*; @@ -41,7 +41,7 @@ public class EntityTestSupport { /** テスト対象とするEntityクラス一覧 */ private List> targetEntities = new ArrayList<>(); - @Before + @BeforeEach public final void setup() { setupPreset(); dh = new MockDomainHelper(); @@ -79,7 +79,7 @@ protected void setting(String id, String value) { dh.setting(id, value); } - @After + @AfterEach public void cleanup() { emf.close(); } diff --git a/src/test/java/sample/model/account/AccountTest.java b/src/test/java/sample/model/account/AccountTest.java index 8ce7873..cf0fedc 100644 --- a/src/test/java/sample/model/account/AccountTest.java +++ b/src/test/java/sample/model/account/AccountTest.java @@ -1,8 +1,8 @@ package sample.model.account; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import sample.*; import sample.model.account.Account.AccountStatusType; diff --git a/src/test/java/sample/model/asset/AssetTest.java b/src/test/java/sample/model/asset/AssetTest.java index 1833a6f..8f609b5 100644 --- a/src/test/java/sample/model/asset/AssetTest.java +++ b/src/test/java/sample/model/asset/AssetTest.java @@ -1,10 +1,10 @@ package sample.model.asset; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.math.BigDecimal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import sample.EntityTestSupport; import sample.model.account.Account; diff --git a/src/test/java/sample/model/asset/CashBalanceTest.java b/src/test/java/sample/model/asset/CashBalanceTest.java index 4a43f29..246d735 100644 --- a/src/test/java/sample/model/asset/CashBalanceTest.java +++ b/src/test/java/sample/model/asset/CashBalanceTest.java @@ -1,10 +1,10 @@ package sample.model.asset; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.math.BigDecimal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import sample.EntityTestSupport; diff --git a/src/test/java/sample/model/asset/CashInOutTest.java b/src/test/java/sample/model/asset/CashInOutTest.java index abb55c3..ab23a8a 100644 --- a/src/test/java/sample/model/asset/CashInOutTest.java +++ b/src/test/java/sample/model/asset/CashInOutTest.java @@ -1,10 +1,10 @@ package sample.model.asset; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.math.BigDecimal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import sample.*; import sample.model.account.Account; diff --git a/src/test/java/sample/model/asset/CashflowTest.java b/src/test/java/sample/model/asset/CashflowTest.java index 53ea08f..9b8f162 100644 --- a/src/test/java/sample/model/asset/CashflowTest.java +++ b/src/test/java/sample/model/asset/CashflowTest.java @@ -1,10 +1,10 @@ package sample.model.asset; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.math.BigDecimal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import sample.*; diff --git a/src/test/java/sample/util/CalculatorTest.java b/src/test/java/sample/util/CalculatorTest.java index fd70284..f76ecaa 100644 --- a/src/test/java/sample/util/CalculatorTest.java +++ b/src/test/java/sample/util/CalculatorTest.java @@ -1,10 +1,10 @@ package sample.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.math.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CalculatorTest {