Merge pull request #16 from k163377/fix_codes

Fixes.

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.mapk"
-version = "0.1.0"
+version = "0.1.2"
 
 repositories {
     mavenCentral()
@@ -24,7 +24,7 @@ dependencies {
     }
     testImplementation("io.mockk:mockk:1.10.3-jdk8")
 
-    implementation(group = "org.openjdk.jmh", name = "jmh-core", version = "1.26")
+    jmhImplementation(group = "org.openjdk.jmh", name = "jmh-core", version = "1.26")
 }
 
 tasks {

src/main/kotlin/com/mapk/fastkfunction/argumentbucket/ArgumentBucket.kt

@@ -1,6 +1,5 @@
 package com.mapk.fastkfunction.argumentbucket
 
-import java.lang.UnsupportedOperationException
 import kotlin.reflect.KParameter
 
 class ArgumentBucket(
@@ -62,13 +61,14 @@ class ArgumentBucket(
     }
 
     override val entries: Set<Map.Entry<KParameter, Any?>>
-        get() = keys.fold(HashSet()) { acc, cur ->
+        get() = keyList.fold(HashSet()) { acc, cur ->
             acc.apply { if (initializationStatuses[cur.index]) add(Entry(cur, valueArray[cur.index])) }
         }
     override val keys: Set<KParameter>
-        get() = keys.fold(HashSet()) { acc, cur ->
+        get() = keyList.fold(HashSet()) { acc, cur ->
             acc.apply { if (initializationStatuses[cur.index]) add(cur) }
         }
+    override val size: Int get() = initializationStatuses.count { it }
     override val values: Collection<Any?>
         get() = valueArray.filterIndexed { idx, _ -> initializationStatuses[idx] }
 
@@ -82,8 +82,5 @@ class ArgumentBucket(
     override fun get(key: KParameter): Any? = valueArray[key.index]
     operator fun get(index: Int): Any? = valueArray[index]
 
-    // サイズ系の処理はVALUEパラメータ以外を考慮した際の整合性を考えることが難しく、使う場面も無いためUnsupported
-    override val size: Int
-        get() = throw UnsupportedOperationException()
-    override fun isEmpty(): Boolean = throw UnsupportedOperationException()
+    override fun isEmpty(): Boolean = size == 0
 }

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

@@ -1,6 +1,7 @@
 package com.mapk.fastkfunction.argumentbucket
 
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
@@ -79,4 +80,62 @@ private class ArgumentBucketTest {
             }
         }
     }
+
+    @Test
+    fun entriesTest() {
+        assertTrue(bucket.entries.isEmpty())
+
+        bucket[0] = 0.toShort()
+        bucket[1] = 1
+
+        val entries = bucket.entries.sortedBy { it.key.index }
+        assertEquals(2, entries.size)
+        entries.forEach {
+            assertEquals(it.key.index, (it.value as Number).toInt())
+        }
+    }
+
+    @Test
+    fun keysTest() {
+        assertTrue(bucket.keys.isEmpty())
+
+        bucket[0] = 0.toShort()
+        val result = bucket.keys
+
+        assertEquals(1, result.size)
+        assertEquals(0, result.single().index)
+    }
+
+    @Test
+    fun valuesTest() {
+        assertTrue(bucket.isEmpty())
+
+        bucket[0] = null
+        bucket[1] = 100
+        val result = bucket.values
+
+        assertTrue(result.contains(null))
+        assertTrue(result.contains(100))
+    }
+
+    @Test
+    fun containsValueTest() {
+        assertFalse(bucket.containsValue(null))
+        assertFalse(bucket.containsValue(100))
+
+        bucket[0] = null
+        bucket[1] = 100
+
+        assertTrue(bucket.containsValue(null))
+        assertTrue(bucket.containsValue(100))
+    }
+
+    @Test
+    fun isEmptyTest() {
+        assertTrue(bucket.isEmpty())
+
+        bucket[0] = 0.toShort()
+
+        assertFalse(bucket.isEmpty())
+    }
 }