Fix workspace builder and tests

altavir · altavir · commit f2b326600b91 · 2026-01-30T09:31:20.000+03:00
diff --git a/dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextSerializerTest.kt b/dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextSerializerTest.kt
@@ -1,14 +1,14 @@
 package space.kscience.dataforge.context
 
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
-import kotlinx.serialization.serializer
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -71,6 +71,8 @@ class ContextSerializerTest {
 
     }
 
+    val polymorphicSerializer = PolymorphicSerializer(Body::class)
+
 
     @Test
     fun testContextWithSerializers() {
@@ -80,9 +82,9 @@ class ContextSerializerTest {
         }
 
 
-        val string = context.json.encodeToString(serializer<Body>(), BodyA())
+        val string = context.json.encodeToString(polymorphicSerializer, BodyA())
 
-        assertTrue { context.json.decodeFromString<Body>(string) is BodyA }
+        assertTrue { context.json.decodeFromString(polymorphicSerializer, string) is BodyA }
 
     }
 
@@ -97,14 +99,14 @@ class ContextSerializerTest {
             plugin(PluginB())
         }
 
-        val stringA = childContext.json.encodeToString(serializer<Body>(), BodyA())
+        val stringA = childContext.json.encodeToString(polymorphicSerializer, BodyA())
 
-        assertTrue { childContext.json.decodeFromString<Body>(stringA) is BodyA }
-        val stringB = childContext.json.encodeToString(serializer<Body>(), BodyB())
+        assertTrue { childContext.json.decodeFromString<Body>(polymorphicSerializer, stringA) is BodyA }
+        val stringB = childContext.json.encodeToString(polymorphicSerializer, BodyB())
 
-        assertTrue { childContext.json.decodeFromString<Body>(stringB) is BodyB }
+        assertTrue { childContext.json.decodeFromString<Body>(polymorphicSerializer, stringB) is BodyB }
 
-        assertEquals("\"Fail\"", parentContext.json.encodeToString(serializer<Body>(), BodyB()))
+        assertEquals("\"Fail\"", parentContext.json.encodeToString(polymorphicSerializer, BodyB()))
 
     }
 
@@ -118,7 +120,7 @@ class ContextSerializerTest {
         }
 
         assertFails {
-            context.json.encodeToString(serializer<Body>(), BodyB())
+            context.json.encodeToString(polymorphicSerializer, BodyB())
         }
     }
 
diff --git a/dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/ActionsTest.kt b/dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/ActionsTest.kt
@@ -8,12 +8,12 @@ import space.kscience.dataforge.actions.mapping
 import space.kscience.dataforge.misc.DFExperimental
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 @OptIn(DFExperimental::class, ExperimentalCoroutinesApi::class)
 internal class ActionsTest {
     @Test
-    fun testStaticMapAction() = runTest(timeout = 500.milliseconds) {
+    fun testStaticMapAction() = runTest(timeout = 1.seconds) {
         val plusOne = Action.mapping<Int, Int> {
             result { it + 1 }
         }
@@ -30,7 +30,7 @@ internal class ActionsTest {
     }
 
     @Test
-    fun testDynamicMapAction() = runTest(timeout = 500.milliseconds) {
+    fun testDynamicMapAction() = runTest(timeout = 1.seconds) {
         val plusOne = Action.mapping<Int, Int> {
             result { it + 1 }
         }
diff --git a/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/WorkspaceBuilder.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/WorkspaceBuilder.kt
@@ -11,7 +11,6 @@ import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.MetaDescriptorBuilder
 import space.kscience.dataforge.misc.DFBuilder
 import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.asName
 import kotlin.properties.PropertyDelegateProvider
 import kotlin.properties.ReadOnlyProperty
 
@@ -114,8 +113,8 @@ public class WorkspaceBuilder(
     /**
      * Define a context for the workspace
      */
-    public fun context(block: ContextBuilder.() -> Unit = {}) {
-        this.context = parentContext.buildContext("workspace".asName(), block)
+    public fun context(contextName: Name? = null, block: ContextBuilder.() -> Unit = {}) {
+        this.context = parentContext.buildContext(contextName, block)
     }
 
     /**
