Skip to content
This repository was archived by the owner on Jan 20, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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"
}

group = "com.mapk"
version = "0.10"
version = "0.11"

java {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -18,7 +18,7 @@ buildscript {
}

dependencies {
classpath(kotlin("gradle-plugin", version = "1.3.71"))
classpath(kotlin("gradle-plugin"))
}
}

Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/test/kotlin/com/mapk/core/ArgumentBucketTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -80,6 +83,7 @@ class ArgumentBucketTest {

@Nested
@DisplayName("アノテーションを付与した場合のテスト")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
inner class AnnotatedParametersTest {
@Test
@DisplayName("non-null要求のテスト")
Expand Down
4 changes: 4 additions & 0 deletions src/test/kotlin/com/mapk/core/KFunctionForCallTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand Down Expand Up @@ -40,6 +43,7 @@ class KFunctionForCallTest {

@Nested
@DisplayName("呼び出し関連テスト")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
inner class CallTest {
@Test
@DisplayName("コンパニオンオブジェクトから取得した場合")
Expand Down