Fix rdMap unbind

Add test
JetBrains · Jun 22, 2023 · 31e18a0 · 31e18a0
1 parent 030749e
commit 31e18a0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/rd-kt/rd-framework/src/main/kotlin/com/jetbrains/rd/framework/impl/RdMap.kt b/rd-kt/rd-framework/src/main/kotlin/com/jetbrains/rd/framework/impl/RdMap.kt
@@ -51,6 +51,11 @@ open class RdMap<K : Any, V : Any> private constructor(
             (value != null).condstr { " :: value = ${value.printToString()}" }
     }
 
+    override fun unbind() {
+        super.unbind()
+        bindDefinitions = null
+    }
+
     override fun preInit(lifetime: Lifetime, proto: IProtocol) {
         super.preInit(lifetime, proto)
 

diff --git a/...t/rd-framework/src/test/kotlin/com/jetbrains/rd/framework/test/cases/RdCollectionsTest.kt b/...t/rd-framework/src/test/kotlin/com/jetbrains/rd/framework/test/cases/RdCollectionsTest.kt
@@ -173,6 +173,9 @@ class RdCollectionsTest : RdFrameworkTestBase() {
         assertEquals(BindState.Bound, serverSet.bindState)
 
         setSchedulerActive(SchedulerKind.Client) {
+            val oldProperty = clientProperty.value
+            clientProperty.value = null
+            clientProperty.value = oldProperty
             clientProperty.value = null
         }
 
@@ -184,6 +187,9 @@ class RdCollectionsTest : RdFrameworkTestBase() {
         assertEquals(BindState.Bound, serverProperty.bindState)
 
         setSchedulerActive(SchedulerKind.Client) {
+            val oldProperty = clientList[0]
+            clientList[0] = RdProperty(null)
+            clientList[0] = oldProperty
             clientList[0] = RdProperty(null)
         }
 
@@ -212,6 +218,9 @@ class RdCollectionsTest : RdFrameworkTestBase() {
         assertEquals(BindState.Bound, serverList.bindState)
 
         setSchedulerActive(SchedulerKind.Client) {
+            val oldValue = clientMap[clientMap.keys.single()]!!
+            clientMap[clientMap.keys.single()] = RdList()
+            clientMap[clientMap.keys.single()] = oldValue
             clientMap[clientMap.keys.single()] = RdList()
         }
 
@@ -239,6 +248,9 @@ class RdCollectionsTest : RdFrameworkTestBase() {
         assertEquals(BindState.Bound, serverMap.bindState)
 
         setSchedulerActive(SchedulerKind.Client) {
+            val oldValue = clientTopLevelProperty.value
+            clientTopLevelProperty.value = null
+            clientTopLevelProperty.value = oldValue
             clientTopLevelProperty.value = null
         }
 

diff --git a/rd-net/Test.RdFramework/RdCollectionsTest.cs b/rd-net/Test.RdFramework/RdCollectionsTest.cs
@@ -220,6 +220,9 @@ public void UnbindTest()
 
     SetSchedulerActive(SchedulerKind.Client, () =>
     {
+      var oldValue = clientProperty.Value;
+      clientProperty.Value = null;
+      clientProperty.Value = oldValue;
       clientProperty.Value = null;
     });
 
@@ -232,6 +235,9 @@ public void UnbindTest()
 
     SetSchedulerActive(SchedulerKind.Client, () =>
     {
+      var oldValue = clientList[0];
+      clientList[0] = NewRdProperty<RdSet<int>>();
+      clientList[0] = oldValue;
       clientList[0] = NewRdProperty<RdSet<int>>();
     });
 
@@ -262,6 +268,9 @@ public void UnbindTest()
 
     SetSchedulerActive(SchedulerKind.Client, () =>
     {
+      var oldValue = clientMap[clientMap.Keys.Single()];
+      clientMap[clientMap.Keys.Single()] = NewRdList<RdProperty<RdSet<int>>>();
+      clientMap[clientMap.Keys.Single()] = oldValue;
       clientMap[clientMap.Keys.Single()] = NewRdList<RdProperty<RdSet<int>>>();
     });
 
@@ -291,6 +300,9 @@ public void UnbindTest()
 
     SetSchedulerActive(SchedulerKind.Client, () =>
     {
+      var oldValue = clientTopLevelProperty.Value;
+      clientTopLevelProperty.Value = null;
+      clientTopLevelProperty.Value = oldValue;
       clientTopLevelProperty.Value = null;
     });