From d424e27164960af8f6d99884f889d8da8a32c3b3 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 15 Sep 2023 10:08:07 -0700
Subject: [PATCH] Finish testing new channel store client behavior

---
 .../src/channel_store/channel_index.rs        |  6 +-
 crates/collab/src/tests/channel_tests.rs      | 83 ++++++++++++++-----
 2 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/crates/channel/src/channel_store/channel_index.rs b/crates/channel/src/channel_store/channel_index.rs
index 36e02f4134..1d01d33050 100644
--- a/crates/channel/src/channel_store/channel_index.rs
+++ b/crates/channel/src/channel_store/channel_index.rs
@@ -123,6 +123,7 @@ impl<'a> ChannelPathsEditGuard<'a> {
     }
 
     fn insert_edge(&mut self, parent_id: ChannelId, channel_id: ChannelId) {
+        debug_assert!(self.channels_by_id.contains_key(&parent_id));
         let mut ix = 0;
         while ix < self.paths.len() {
             let path = &self.paths[ix];
@@ -131,8 +132,9 @@ impl<'a> ChannelPathsEditGuard<'a> {
                 new_path.push(channel_id);
                 self.paths.insert(ix + 1, ChannelPath(new_path.into()));
                 ix += 2;
-            } else if path.len() == 1 && path[0] == channel_id {
-                self.paths.swap_remove(ix);
+            } else if path.get(0) == Some(&channel_id) {
+                // Clear out any paths that have this chahnnel as their root
+                self.paths.remove(ix);
             } else {
                 ix += 1;
             }
diff --git a/crates/collab/src/tests/channel_tests.rs b/crates/collab/src/tests/channel_tests.rs
index aeb2f1adcc..fbd73de87b 100644
--- a/crates/collab/src/tests/channel_tests.rs
+++ b/crates/collab/src/tests/channel_tests.rs
@@ -780,7 +780,6 @@ async fn test_lost_channel_creation(
     deterministic: Arc<Deterministic>,
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
 ) {
     deterministic.forbid_parking();
     let mut server = TestServer::start(&deterministic).await;
@@ -953,7 +952,7 @@ async fn test_channel_moving(
         .await
         .unwrap();
 
-    // Current shape:
+    // Current shape for A:
     //      /------\
     // a - b -- c -- d
     assert_channels_list_shape(
@@ -982,21 +981,23 @@ async fn test_channel_moving(
     let channel_ga_id = b_channels[1];
     let channel_ep_id = b_channels[2];
 
-
     // Current shape for B:
     //    /- ep
     // mu -- ga
     assert_channels_list_shape(
         client_b.channel_store(),
         cx_b,
-        &[
-            (channel_mu_id, 0),
-            (channel_ep_id, 1),
-            (channel_ga_id, 1),
-        ],
+        &[(channel_mu_id, 0), (channel_ep_id, 1), (channel_ga_id, 1)],
     );
 
-    client_a.add_admin_to_channel((&client_b, cx_b), channel_b_id, cx_a).await;
+    client_a
+        .add_admin_to_channel((&client_b, cx_b), channel_b_id, cx_a)
+        .await;
+
+    client_b
+        .add_admin_to_channel((&client_c, cx_c), channel_ep_id, cx_b)
+        .await;
+
     // Current shape for B:
     //    /- ep
     // mu -- ga
@@ -1011,12 +1012,20 @@ async fn test_channel_moving(
             (channel_c_id, 1),
             (channel_d_id, 2),
             (channel_d_id, 1),
-
             // B's old channels
             (channel_mu_id, 0),
             (channel_ep_id, 1),
             (channel_ga_id, 1),
+        ],
+    );
 
+    // Current shape for C:
+    // - ep
+    assert_channels_list_shape(
+        client_c.channel_store(),
+        cx_c,
+        &[
+            (channel_ep_id, 0),
         ],
     );
 
@@ -1036,16 +1045,28 @@ async fn test_channel_moving(
         client_b.channel_store(),
         cx_b,
         &[
-            // B's old channels
             (channel_mu_id, 0),
-            (channel_ga_id, 1),
             (channel_ep_id, 1),
-
-            // New channels from a, now under epsilon
             (channel_b_id, 2),
             (channel_c_id, 3),
-            (channel_d_id, 3),
             (channel_d_id, 4),
+            (channel_d_id, 3),
+            (channel_ga_id, 1),
+        ],
+    );
+
+    // Current shape for C:
+    //        /---------\
+    // ep -- b  -- c  -- d
+    assert_channels_list_shape(
+        client_c.channel_store(),
+        cx_c,
+        &[
+            (channel_ep_id, 0),
+            (channel_b_id, 1),
+            (channel_c_id, 2),
+            (channel_d_id, 3),
+            (channel_d_id, 2),
         ],
     );
 
@@ -1066,34 +1087,50 @@ async fn test_channel_moving(
         client_b.channel_store(),
         cx_b,
         &[
-            // B's old channels
             (channel_mu_id, 0),
-            (channel_ga_id, 1),
             (channel_ep_id, 1),
-
-            // New channels from a, now under epsilon, with gamma
             (channel_b_id, 2),
-            (channel_ga_id, 3),
             (channel_c_id, 3),
-            (channel_d_id, 3),
             (channel_d_id, 4),
+            (channel_d_id, 3),
+            (channel_ga_id, 3),
+            (channel_ga_id, 1),
         ],
     );
 
     // Current shape for A:
+    //      /------\
+    // a - b -- c -- d
+    //      \-- ga
     assert_channels_list_shape(
         client_a.channel_store(),
         cx_a,
         &[
             (channel_a_id, 0),
             (channel_b_id, 1),
-            (channel_ga_id, 1),
             (channel_c_id, 2),
             (channel_d_id, 3),
             (channel_d_id, 2),
+            (channel_ga_id, 2),
+        ],
+    );
+
+    // Current shape for C:
+    //        /-------\
+    // ep -- b -- c -- d
+    //        \-- ga
+    assert_channels_list_shape(
+        client_c.channel_store(),
+        cx_c,
+        &[
+            (channel_ep_id, 0),
+            (channel_b_id, 1),
+            (channel_c_id, 2),
+            (channel_d_id, 3),
+            (channel_d_id, 2),
+            (channel_ga_id, 2),
         ],
     );
-    // TODO: Make sure to test that non-local root removing problem I was thinking about
 }
 
 #[derive(Debug, PartialEq)]