refactor tests to use number execution value fixtures

CharlieTap · May 20, 2024 · 16e8aca · 16e8aca
1 parent 213b697
commit 16e8aca
Show file tree

Hide file tree

Showing 53 changed files with 576 additions and 574 deletions.
diff --git a/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/GlobalTest.kt b/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/GlobalTest.kt
@@ -2,9 +2,9 @@ package io.github.charlietap.chasm.embedding
 
 import io.github.charlietap.chasm.executor.runtime.instance.ExternalValue
 import io.github.charlietap.chasm.executor.runtime.store.Address
-import io.github.charlietap.chasm.executor.runtime.value.NumberValue
 import io.github.charlietap.chasm.fixture.store
 import io.github.charlietap.chasm.fixture.type.globalType
+import io.github.charlietap.chasm.fixture.value.i32
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -15,7 +15,7 @@ class GlobalTest {
 
         val store = store()
         val globalType = globalType()
-        val initialValue = NumberValue.I32(117)
+        val initialValue = i32(117)
 
         val expected = ExternalValue.Global(Address.Global(0))
 

diff --git a/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/InvokeTest.kt b/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/InvokeTest.kt
@@ -7,11 +7,11 @@ import io.github.charlietap.chasm.error.ChasmError
 import io.github.charlietap.chasm.executor.invoker.FunctionInvoker
 import io.github.charlietap.chasm.executor.runtime.error.InvocationError
 import io.github.charlietap.chasm.executor.runtime.value.ExecutionValue
-import io.github.charlietap.chasm.executor.runtime.value.NumberValue
 import io.github.charlietap.chasm.fixture.instance.exportInstance
 import io.github.charlietap.chasm.fixture.instance.functionAddress
 import io.github.charlietap.chasm.fixture.instance.functionExternalValue
 import io.github.charlietap.chasm.fixture.instance.moduleInstance
+import io.github.charlietap.chasm.fixture.value.i32
 import io.github.charlietap.chasm.fixture.value.nameValue
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -87,7 +87,7 @@ class InvokeTest {
             ),
         )
 
-        val results = listOf(NumberValue.I32(117))
+        val results = listOf(i32(117))
         val functionInvoker: FunctionInvoker = { _store, _address, _args ->
             assertEquals(store, _store)
             assertEquals(address, _address)

diff --git a/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/global/ReadGlobalTest.kt b/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/global/ReadGlobalTest.kt
@@ -4,9 +4,9 @@ import io.github.charlietap.chasm.ChasmResult
 import io.github.charlietap.chasm.error.ChasmError
 import io.github.charlietap.chasm.executor.runtime.store.Address
 import io.github.charlietap.chasm.executor.runtime.value.ExecutionValue
-import io.github.charlietap.chasm.executor.runtime.value.NumberValue
 import io.github.charlietap.chasm.fixture.instance.globalInstance
 import io.github.charlietap.chasm.fixture.store
+import io.github.charlietap.chasm.fixture.value.i32
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -15,7 +15,7 @@ class ReadGlobalTest {
     @Test
     fun `can read a value from a global`() {
 
-        val value = NumberValue.I32(117)
+        val value = i32(117)
         val instance = globalInstance(value = value)
         val store = store(globals = mutableListOf(instance))
         val address = Address.Global(0)

diff --git a/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/global/WriteGlobalTest.kt b/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/embedding/global/WriteGlobalTest.kt
@@ -3,9 +3,9 @@ package io.github.charlietap.chasm.embedding.global
 import io.github.charlietap.chasm.ChasmResult
 import io.github.charlietap.chasm.error.ChasmError
 import io.github.charlietap.chasm.executor.runtime.store.Address
-import io.github.charlietap.chasm.executor.runtime.value.NumberValue
 import io.github.charlietap.chasm.fixture.instance.globalInstance
 import io.github.charlietap.chasm.fixture.store
+import io.github.charlietap.chasm.fixture.value.i32
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -14,7 +14,7 @@ class WriteGlobalTest {
     @Test
     fun `can write a value to a global`() {
 
-        val value = NumberValue.I32(117)
+        val value = i32(117)
         val instance = globalInstance()
         val store = store(globals = mutableListOf(instance))
         val address = Address.Global(0)

diff --git a/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/integration/gc/ArrayCopyTest.kt b/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/integration/gc/ArrayCopyTest.kt
@@ -2,7 +2,7 @@ package io.github.charlietap.chasm.integration.gc
 
 import io.github.charlietap.chasm.ChasmResult
 import io.github.charlietap.chasm.executor.runtime.value.ExecutionValue
-import io.github.charlietap.chasm.executor.runtime.value.NumberValue
+import io.github.charlietap.chasm.fixture.value.i32
 import io.github.charlietap.chasm.integration.testRunner
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -16,10 +16,10 @@ class ArrayCopyTest {
             fileName = "array_copy.wasm",
             fileDirectory = FILE_DIR,
             functionName = "array_get_nth",
-            arguments = listOf(NumberValue.I32(0)),
+            arguments = listOf(i32(0)),
         )
 
-        val expected = listOf(NumberValue.I32(0))
+        val expected = listOf(i32(0))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -31,10 +31,10 @@ class ArrayCopyTest {
             fileName = "array_copy.wasm",
             fileDirectory = FILE_DIR,
             functionName = "array_get_nth",
-            arguments = listOf(NumberValue.I32(5)),
+            arguments = listOf(i32(5)),
         )
 
-        val expected = listOf(NumberValue.I32(0))
+        val expected = listOf(i32(0))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -46,10 +46,10 @@ class ArrayCopyTest {
             fileName = "array_copy.wasm",
             fileDirectory = FILE_DIR,
             functionName = "array_get_nth",
-            arguments = listOf(NumberValue.I32(11)),
+            arguments = listOf(i32(11)),
         )
 
-        val expected = listOf(NumberValue.I32(0))
+        val expected = listOf(i32(0))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -61,7 +61,7 @@ class ArrayCopyTest {
             fileName = "array_copy.wasm",
             fileDirectory = FILE_DIR,
             functionName = "array_copy",
-            arguments = listOf(NumberValue.I32(0), NumberValue.I32(0), NumberValue.I32(2)),
+            arguments = listOf(i32(0), i32(0), i32(2)),
         )
 
         val expected = listOf<ExecutionValue>()

diff --git a/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/integration/gc/ArrayTest.kt b/chasm/src/commonTest/kotlin/io/github/charlietap/chasm/integration/gc/ArrayTest.kt
@@ -2,8 +2,9 @@ package io.github.charlietap.chasm.integration.gc
 
 import io.github.charlietap.chasm.ChasmResult
 import io.github.charlietap.chasm.error.ChasmError
-import io.github.charlietap.chasm.executor.runtime.value.NumberValue
 import io.github.charlietap.chasm.executor.runtime.value.ReferenceValue
+import io.github.charlietap.chasm.fixture.value.f32
+import io.github.charlietap.chasm.fixture.value.i32
 import io.github.charlietap.chasm.integration.testRunner
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -30,10 +31,10 @@ class ArrayTest {
             fileName = "array_1.wasm",
             fileDirectory = FILE_DIR,
             functionName = "get",
-            arguments = listOf(NumberValue.I32(0)),
+            arguments = listOf(i32(0)),
         )
 
-        val expected = listOf(NumberValue.F32(0f))
+        val expected = listOf(f32(0f))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -44,10 +45,10 @@ class ArrayTest {
             fileName = "array_1.wasm",
             fileDirectory = FILE_DIR,
             functionName = "set_get",
-            arguments = listOf(NumberValue.I32(0), NumberValue.F32(7f)),
+            arguments = listOf(i32(0), f32(7f)),
         )
 
-        val expected = listOf(NumberValue.F32(7f))
+        val expected = listOf(f32(7f))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -61,7 +62,7 @@ class ArrayTest {
             arguments = listOf(),
         )
 
-        val expected = listOf(NumberValue.I32(3))
+        val expected = listOf(i32(3))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -84,10 +85,10 @@ class ArrayTest {
             fileName = "array_2.wasm",
             fileDirectory = FILE_DIR,
             functionName = "get",
-            arguments = listOf(NumberValue.I32(0)),
+            arguments = listOf(i32(0)),
         )
 
-        val expected = listOf(NumberValue.F32(1f))
+        val expected = listOf(f32(1f))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -98,10 +99,10 @@ class ArrayTest {
             fileName = "array_2.wasm",
             fileDirectory = FILE_DIR,
             functionName = "set_get",
-            arguments = listOf(NumberValue.I32(1), NumberValue.F32(7f)),
+            arguments = listOf(i32(1), f32(7f)),
         )
 
-        val expected = listOf(NumberValue.F32(7f))
+        val expected = listOf(f32(7f))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -115,7 +116,7 @@ class ArrayTest {
             arguments = listOf(),
         )
 
-        val expected = listOf(NumberValue.I32(2))
+        val expected = listOf(i32(2))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -138,10 +139,10 @@ class ArrayTest {
             fileName = "array_3.wasm",
             fileDirectory = FILE_DIR,
             functionName = "get_u",
-            arguments = listOf(NumberValue.I32(2)),
+            arguments = listOf(i32(2)),
         )
 
-        val expected = listOf(NumberValue.I32(255))
+        val expected = listOf(i32(255))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -152,10 +153,10 @@ class ArrayTest {
             fileName = "array_3.wasm",
             fileDirectory = FILE_DIR,
             functionName = "get_s",
-            arguments = listOf(NumberValue.I32(2)),
+            arguments = listOf(i32(2)),
         )
 
-        val expected = listOf(NumberValue.I32(-1))
+        val expected = listOf(i32(-1))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -169,7 +170,7 @@ class ArrayTest {
             arguments = listOf(),
         )
 
-        val expected = listOf(NumberValue.I32(3))
+        val expected = listOf(i32(3))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -193,10 +194,10 @@ class ArrayTest {
             fileName = "array_4.wasm",
             fileDirectory = FILE_DIR,
             functionName = "get",
-            arguments = listOf(NumberValue.I32(0), NumberValue.I32(0)),
+            arguments = listOf(i32(0), i32(0)),
         )
 
-        val expected = listOf(NumberValue.I32(7))
+        val expected = listOf(i32(7))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -207,10 +208,10 @@ class ArrayTest {
             fileName = "array_4.wasm",
             fileDirectory = FILE_DIR,
             functionName = "get",
-            arguments = listOf(NumberValue.I32(1), NumberValue.I32(0)),
+            arguments = listOf(i32(1), i32(0)),
         )
 
-        val expected = listOf(NumberValue.I32(1))
+        val expected = listOf(i32(1))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -221,10 +222,10 @@ class ArrayTest {
             fileName = "array_4.wasm",
             fileDirectory = FILE_DIR,
             functionName = "set_get",
-            arguments = listOf(NumberValue.I32(0), NumberValue.I32(1), NumberValue.I32(1)),
+            arguments = listOf(i32(0), i32(1), i32(1)),
         )
 
-        val expected = listOf(NumberValue.I32(2))
+        val expected = listOf(i32(2))
 
         assertEquals(ChasmResult.Success(expected), result)
     }
@@ -238,7 +239,7 @@ class ArrayTest {
             arguments = listOf(),
         )
 
-        val expected = listOf(NumberValue.I32(2))
+        val expected = listOf(i32(2))
 
         assertEquals(ChasmResult.Success(expected), result)
     }