Merge pull request #1 from k163377/add_ci

CI関連の項目追加 + Kotlinのアップデート + フォーマッティング

Author: k163377

.github/workflows/ci.yml

@@ -1,7 +1,4 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Test with Gradle
+name: Lint, Test, and upload Coveradge with Gradle.
 
 on:
   push:
@@ -22,5 +19,11 @@ jobs:
           java-version: 1.8
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: ktlint check
+        run: ./gradlew ktlintCheck
       - name: Test with Gradle
         run: ./gradlew test
+      - name: upload coverage
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
-    kotlin("jvm") version "1.4.10"
+    kotlin("jvm") version "1.4.20"
+    id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
+    id("jacoco")
 }
 
 group = "com.mapk"
@@ -31,7 +33,16 @@ tasks {
             jvmTarget = "1.8"
         }
     }
+    jacocoTestReport {
+        reports {
+            xml.isEnabled = true
+            csv.isEnabled = false
+            html.isEnabled = true
+        }
+    }
     test {
         useJUnitPlatform()
+        // テスト終了時にjacocoのレポートを生成する
+        finalizedBy(jacocoTestReport)
     }
 }

settings.gradle.kts

@@ -1,2 +1 @@
 rootProject.name = "FastKFunction"
-

src/test/kotlin/com/mapk/fastkfunction/argumentBucket/ArgumentBucketTest.kt

@@ -2,7 +2,9 @@ package com.mapk.fastkfunction.argumentBucket
 
 import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
 import com.mapk.fastkfunction.argumentbucket.BucketGenerator
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 

src/test/kotlin/com/mapk/fastkfunction/fastkfunction/FullInitializedCallTest.kt

@@ -14,7 +14,7 @@ import kotlin.reflect.full.companionObject
 import kotlin.reflect.full.companionObjectInstance
 import kotlin.reflect.full.functions
 
-private fun topLevelFunc(arg1: Int,  arg2: String): FullInitializedCallTest.Dst =
+private fun topLevelFunc(arg1: Int, arg2: String): FullInitializedCallTest.Dst =
     FullInitializedCallTest.Dst(arg1, arg2)
 
 private fun FullInitializedCallTest.Class.topLevelExtensionFunc(arg1: Int, arg2: String): FullInitializedCallTest.Dst =

src/test/kotlin/com/mapk/fastkfunction/fastkfunction/UseDefaultValueCallTest.kt

@@ -29,19 +29,27 @@ enum class DefaultValues {
 }
 
 private fun topLevelFunc(
-    arg1: Int,  arg2: String, arg3: String = DefaultValues.TopLevelFunc.name
+    arg1: Int,
+    arg2: String,
+    arg3: String = DefaultValues.TopLevelFunc.name
 ): UseDefaultValueCallTest.Dst = UseDefaultValueCallTest.Dst(arg1, arg2, arg3)
 
 private fun UseDefaultValueCallTest.Class.topLevelExtensionFunc(
-    arg1: Int, arg2: String, arg3: String = DefaultValues.TopLevelExtensionFunc.name
+    arg1: Int,
+    arg2: String,
+    arg3: String = DefaultValues.TopLevelExtensionFunc.name
 ): UseDefaultValueCallTest.Dst = UseDefaultValueCallTest.Dst(arg1, arg2, arg3)
 
 private fun UseDefaultValueCallTest.Class.topLevelExtensionFuncFromInstance(
-    arg1: Int, arg2: String, arg3: String = DefaultValues.TopLevelExtensionFuncFromInstance.name
+    arg1: Int,
+    arg2: String,
+    arg3: String = DefaultValues.TopLevelExtensionFuncFromInstance.name
 ): UseDefaultValueCallTest.Dst = UseDefaultValueCallTest.Dst(arg1, arg2, arg3)
 
 private fun UseDefaultValueCallTest.Class.topLevelExtensionFuncFromInstanceWithInstance(
-    arg1: Int, arg2: String, arg3: String = DefaultValues.TopLevelExtensionFuncFromInstanceWithInstance.name
+    arg1: Int,
+    arg2: String,
+    arg3: String = DefaultValues.TopLevelExtensionFuncFromInstanceWithInstance.name
 ): UseDefaultValueCallTest.Dst = UseDefaultValueCallTest.Dst(arg1, arg2, arg3)
 
 /**
@@ -68,15 +76,21 @@ private class UseDefaultValueCallTest {
                 Dst(arg1, arg2, arg3)
 
             fun ofWithInstance(
-                arg1: Int, arg2: String, arg3: String = DefaultValues.CompanionObjectFuncWithInstance.name
+                arg1: Int,
+                arg2: String,
+                arg3: String = DefaultValues.CompanionObjectFuncWithInstance.name
             ) = Dst(arg1, arg2, arg3)
 
             fun ofFromReflection(
-                arg1: Int, arg2: String, arg3: String = DefaultValues.CompanionObjectFuncFromReflection.name
+                arg1: Int,
+                arg2: String,
+                arg3: String = DefaultValues.CompanionObjectFuncFromReflection.name
             ) = Dst(arg1, arg2, arg3)
 
             fun ofFromReflectionWithInstance(
-                arg1: Int, arg2: String, arg3: String = DefaultValues.CompanionObjectFuncFromReflectionWithInstance.name
+                arg1: Int,
+                arg2: String,
+                arg3: String = DefaultValues.CompanionObjectFuncFromReflectionWithInstance.name
             ) = Dst(arg1, arg2, arg3)
         }
     }
@@ -85,7 +99,9 @@ private class UseDefaultValueCallTest {
         Dst(arg1, arg2, arg3)
 
     private fun instanceFunctionWithInstance(
-        arg1: Int, arg2: String, arg3: String = DefaultValues.InstanceFuncWithInstance.name
+        arg1: Int,
+        arg2: String,
+        arg3: String = DefaultValues.InstanceFuncWithInstance.name
     ) = Dst(arg1, arg2, arg3)
 
     @ParameterizedTest
@@ -115,7 +131,9 @@ private class UseDefaultValueCallTest {
             Arguments.of(::instanceFunctionWithInstance, this, DefaultValues.InstanceFuncWithInstance),
             Arguments.of((Dst)::of, null, DefaultValues.CompanionObjectFunc),
             Arguments.of(
-                (Dst)::ofWithInstance, Dst::class.companionObjectInstance, DefaultValues.CompanionObjectFuncWithInstance
+                (Dst)::ofWithInstance,
+                Dst::class.companionObjectInstance,
+                DefaultValues.CompanionObjectFuncWithInstance
             ),
             Arguments.of(ofFromReflection, null, DefaultValues.CompanionObjectFuncFromReflection),
             Arguments.of(
@@ -127,7 +145,9 @@ private class UseDefaultValueCallTest {
             Arguments.of(Class::topLevelExtensionFunc, Class(), DefaultValues.TopLevelExtensionFunc),
             Class().let {
                 Arguments.of(
-                    it::topLevelExtensionFuncFromInstance, null, DefaultValues.TopLevelExtensionFuncFromInstance
+                    it::topLevelExtensionFuncFromInstance,
+                    null,
+                    DefaultValues.TopLevelExtensionFuncFromInstance
                 )
             },
             Class().let {