update tests for context serialization

Author: altavir

CHANGELOG.md

@@ -3,11 +3,12 @@
 ## Unreleased
 
 ### Added
-- Plugin based serialization capability to context
+- Plugin-based serialization capability to context
 - Documentation and safety for Tables-kt-dataframe
 - Ability to unwrap NamedData
 
 ### Changed
+- Change context `modify` to context `deriveContext` and add modification suffix as parameter.
 - Updated Exposed in tables to 1.0.0
 - **BREAKING** DataTree builders refactor. 
 - Updated Exposed in tables to 1.0.0

dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Context.kt

@@ -88,7 +88,7 @@ public open class Context internal constructor(
     @ThreadSafe
     public fun buildContext(name: Name? = null, block: ContextBuilder.() -> Unit = {}): Context {
         val existing = name?.let { childrenContexts[name] }
-        return existing?.modify(block) ?: ContextBuilder(this, name).apply(block).build().also {
+        return existing?.deriveContext(block = block) ?: ContextBuilder(this, name).apply(block).build().also {
             childrenContexts[it.name] = it
         }
     }
@@ -121,8 +121,8 @@ public open class Context internal constructor(
      */
     public val serializationModule: SerializersModule by lazy {
         val pluginModules = plugins.mapNotNull { it.serializerModule }
-        if(pluginModules.isEmpty()) {
-            parent?.serializationModule ?: SerializersModule{}
+        if (pluginModules.isEmpty()) {
+            parent?.serializationModule ?: SerializersModule {}
         } else {
             val pluginModule = pluginModules.reduce { acc, module -> acc + module }
             parent?.serializationModule?.overwriteWith(pluginModule) ?: pluginModule

dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/ContextBuilder.kt

@@ -97,21 +97,21 @@ public class ContextBuilder internal constructor(
 }
 
 /**
- * Check if current context contains all plugins required by the builder and return it does or forks to a new context
+ * Check if the current context contains all plugins required by the builder and properties are the same and return it does or forks to a new context
  * if it does not.
  */
 @DFExperimental
-public fun Context.modify(block: ContextBuilder.() -> Unit): Context {
+public fun Context.deriveContext(deriveSuffix: String = "mod", block: ContextBuilder.() -> Unit): Context {
 
     fun Context.contains(factory: PluginFactory<*>, meta: Meta): Boolean {
         val loaded = plugins[factory.tag] ?: return false
         return loaded.meta == meta
     }
 
-    val builder = ContextBuilder(this, name + "mod", properties).apply(block)
-    val requiresFork = builder.factories.any { (factory, meta) ->
+    val builder = ContextBuilder(this, name + deriveSuffix, properties).apply(block)
+    val requiresFork = !Meta.equals(properties,builder.meta) || builder.factories.any { (factory, meta) ->
         !contains(factory, meta)
-    } || ((properties as Meta) == builder.meta)
+    }
 
     return if (requiresFork) builder.build() else this
 }

dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextSerializerTest.kt

@@ -9,8 +9,8 @@ import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
 import kotlinx.serialization.serializer
-import space.kscience.dataforge.names.asName
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFails
 import kotlin.test.assertTrue
 
@@ -60,7 +60,7 @@ class ContextSerializerTest {
 
     }
 
-    class PluginB2 : AbstractPlugin() {
+    class PluginBFail : AbstractPlugin() {
         override val tag: PluginTag = PluginTag("B2")
 
         override val serializerModule: SerializersModule = SerializersModule {
@@ -74,7 +74,7 @@ class ContextSerializerTest {
 
     @Test
     fun testContextWithSerializers() {
-        val context = Context("test") {
+        val context = Context {
             plugin(PluginA())
             plugin(PluginB())
         }
@@ -88,30 +88,33 @@ class ContextSerializerTest {
 
     @Test
     fun testContextInheritance() {
-        val parentContext = Context("parent") {
+        val parentContext = Context {
             plugin(PluginA())
+            plugin(PluginBFail())
         }
 
-        val childContext = parentContext.buildContext("child".asName()) {
+        val childContext = parentContext.buildContext {
             plugin(PluginB())
         }
 
-
         val stringA = childContext.json.encodeToString(serializer<Body>(), BodyA())
 
         assertTrue { childContext.json.decodeFromString<Body>(stringA) is BodyA }
         val stringB = childContext.json.encodeToString(serializer<Body>(), BodyB())
 
         assertTrue { childContext.json.decodeFromString<Body>(stringB) is BodyB }
+
+        assertEquals("\"Fail\"", parentContext.json.encodeToString(serializer<Body>(), BodyB()))
+
     }
 
 
     @Test
     fun testConflict() {
-        val context = Context("test") {
+        val context = Context {
             plugin(PluginA())
             plugin(PluginB())
-            plugin(PluginB2())
+            plugin(PluginBFail())
         }
 
         assertFails {

dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextTest.kt

@@ -20,7 +20,7 @@ class ContextTest {
 
     @Test
     fun testPluginManager() {
-        val context = Context("test") {
+        val context = Context{
             plugin(DummyPlugin())
         }
         val members = context.gather<Name>("test")

dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/reflectiveDescriptors.kt

@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.MetaDescriptorBuilder
 import space.kscience.dataforge.misc.DFExperimental
+import java.net.URI
 import java.net.URL
 import kotlin.reflect.KAnnotatedElement
 import kotlin.reflect.KProperty
@@ -60,7 +61,7 @@ public fun MetaDescriptorBuilder.forAnnotatedElement(element: KAnnotatedElement)
 
             is DescriptorResource -> loadDescriptorFromResource(it)
 
-            is DescriptorUrl -> loadDescriptorFromUrl(URL(it.url))
+            is DescriptorUrl -> loadDescriptorFromUrl(URI.create(it.url).toURL())
         }
     }
 }
@@ -73,7 +74,7 @@ public fun MetaDescriptorBuilder.forProperty(property: KProperty<*>) {
 
             is DescriptorResource -> loadDescriptorFromResource(it)
 
-            is DescriptorUrl -> loadDescriptorFromUrl(URL(it.url))
+            is DescriptorUrl -> loadDescriptorFromUrl(URI.create(it.url).toURL())
         }
     }
 }