From e6a653514bff67e1093dd9de05db3868a6fd78e1 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 19 Apr 2020 00:31:42 +0900 Subject: [PATCH 1/5] =?UTF-8?q?ide=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=A7=E4=BB=98=E3=81=84=E3=81=A6=E3=81=8D?= =?UTF-8?q?=E3=81=9F=E3=82=82=E3=81=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 6 ++++++ .idea/misc.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .idea/compiler.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bc8d0a3..38167d7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file From 93b13601523aa0536437939cb05ffd336615b2f9 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 19 Apr 2020 00:31:51 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f087be2..3daf107 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "com.mapk" -version = "0.10" +version = "0.11" java { sourceCompatibility = JavaVersion.VERSION_1_8 From 18a7fd57301fcdd1650d5cebd557fae81a6c4109 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 19 Apr 2020 01:07:16 +0900 Subject: [PATCH 3/5] =?UTF-8?q?kotlin=201.3.72=E3=81=B8=E3=81=AE=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ついでにgradleプラグインは余計なバージョンを指定しないように修正 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3daf107..2975448 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("maven") id("java") - id("org.jetbrains.kotlin.jvm") version "1.3.71" + id("org.jetbrains.kotlin.jvm") version "1.3.72" id("org.jlleitschuh.gradle.ktlint") version "9.2.1" } @@ -18,7 +18,7 @@ buildscript { } dependencies { - classpath(kotlin("gradle-plugin", version = "1.3.71")) + classpath(kotlin("gradle-plugin")) } } From fc25b702e3243ed72356e406f0576d248258ac5d Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 19 Apr 2020 01:07:29 +0900 Subject: [PATCH 4/5] =?UTF-8?q?JUnit5=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2975448..adf5f58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter - testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.1") { + testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.2") { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } // https://mvnrepository.com/artifact/io.mockk/mockk From e97a5a018e4136cbeb84cb5fa5a11320fa338558 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 19 Apr 2020 01:16:56 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?= =?UTF-8?q?=E6=99=82=E3=81=AE=E5=86=AA=E7=AD=89=E6=80=A7=E7=A2=BA=E8=AA=8D?= =?UTF-8?q?=E3=81=AE=E3=81=9F=E3=82=81=E3=80=81PER=5FCLASS=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/kotlin/com/mapk/core/ArgumentBucketTest.kt | 4 ++++ src/test/kotlin/com/mapk/core/KFunctionForCallTest.kt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/test/kotlin/com/mapk/core/ArgumentBucketTest.kt b/src/test/kotlin/com/mapk/core/ArgumentBucketTest.kt index 0aaa633..b5622e0 100644 --- a/src/test/kotlin/com/mapk/core/ArgumentBucketTest.kt +++ b/src/test/kotlin/com/mapk/core/ArgumentBucketTest.kt @@ -9,6 +9,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.assertThrows @@ -24,9 +25,11 @@ private fun sampleAnnotatedFunction(@KParameterRequireNonNull arg1: Any, arg2: A } @DisplayName("ArgumentBucketTestのテスト") +@TestInstance(TestInstance.Lifecycle.PER_CLASS) class ArgumentBucketTest { @Nested @DisplayName("シンプルな呼び出しのテスト") + @TestInstance(TestInstance.Lifecycle.PER_CLASS) inner class SimpleTest { private lateinit var argumentBucket: ArgumentBucket @@ -80,6 +83,7 @@ class ArgumentBucketTest { @Nested @DisplayName("アノテーションを付与した場合のテスト") + @TestInstance(TestInstance.Lifecycle.PER_CLASS) inner class AnnotatedParametersTest { @Test @DisplayName("non-null要求のテスト") diff --git a/src/test/kotlin/com/mapk/core/KFunctionForCallTest.kt b/src/test/kotlin/com/mapk/core/KFunctionForCallTest.kt index daf33ea..a9bd801 100644 --- a/src/test/kotlin/com/mapk/core/KFunctionForCallTest.kt +++ b/src/test/kotlin/com/mapk/core/KFunctionForCallTest.kt @@ -7,12 +7,15 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.assertThrows +@TestInstance(TestInstance.Lifecycle.PER_CLASS) class KFunctionForCallTest { @Nested @DisplayName("初期化関連テスト") + @TestInstance(TestInstance.Lifecycle.PER_CLASS) inner class InitializeTest { // 空引数の関数 private fun dummy1() {} @@ -40,6 +43,7 @@ class KFunctionForCallTest { @Nested @DisplayName("呼び出し関連テスト") + @TestInstance(TestInstance.Lifecycle.PER_CLASS) inner class CallTest { @Test @DisplayName("コンパニオンオブジェクトから取得した場合")