wip

listener_test.go

@@ -228,179 +228,48 @@ func TestListenerMoreStuffWithMultipleRelays(t *testing.T) {
 			ws3: {
 				{"a", cancel, 0, rlz},
 				{"a", cancel, 3, rlx},
-				{"f", cancel, 2, rly},
+				{"f", cancel, 3, rly},
 			},
 			ws4: {
 				{"d", cancel, 1, rlx},
 				{"e", cancel, 2, rlx},
-				{"e", cancel, 1, rly},
+				{"e", cancel, 2, rly},
 			},
 		}, rl.clients)
 
 		require.Equal(t, []listener{
 			{"c", f1, ws1},
+			{"b", f2, ws2},
+			{"a", f3, ws3},
 			{"d", f3, ws4},
 			{"e", f3, ws4},
 			{"a", f3, ws3},
-		}, rlx.listeners)
-
-		require.Equal(t, []listener{
-			{"b", f2, ws2},
 			{"e", f3, ws4},
 			{"f", f3, ws3},
-		}, rly.listeners)
-
-		require.Equal(t, []listener{
-			{"a", f3, ws3},
 			{"g", f1, ws1},
 			{"g", f2, ws2},
-		}, rlz.listeners)
+		}, rl.listeners)
 	})
 
-	t.Run("removing a subscription id", func(t *testing.T) {
-		// removing 'd' from ws4
-		rl.clients[ws4][0].cancel = func(cause error) {} // set since removing will call it
-		rl.removeListenerId(ws4, "d")
+	// t.Run("removing a client", func(t *testing.T) {
+	// 	rl.removeClientAndListeners(ws2)
 
-		require.Equal(t, map[*WebSocket][]listenerSpec{
-			ws1: {
-				{"c", cancel, 0, rlx},
-				{"g", cancel, 1, rlz},
-			},
-			ws2: {
-				{"b", cancel, 0, rly},
-				{"g", cancel, 2, rlz},
-			},
-			ws3: {
-				{"a", cancel, 0, rlz},
-				{"a", cancel, 1, rlx},
-				{"f", cancel, 2, rly},
-			},
-			ws4: {
-				{"e", cancel, 1, rly},
-				{"e", cancel, 2, rlx},
-			},
-		}, rl.clients)
+	// 	require.Equal(t, map[*WebSocket][]listenerSpec{
+	// 		ws1: {
+	// 			{"c", cancel, 0, rl},
+	// 		},
+	// 		ws3: {
+	// 			{"a", cancel, 2, rl},
+	// 		},
+	// 		ws4: {
+	// 			{"d", cancel, 1, rl},
+	// 		},
+	// 	}, rl.clients)
 
-		require.Equal(t, []listener{
-			{"c", f1, ws1},
-			{"a", f3, ws3},
-			{"e", f3, ws4},
-		}, rlx.listeners)
-
-		require.Equal(t, []listener{
-			{"b", f2, ws2},
-			{"e", f3, ws4},
-			{"f", f3, ws3},
-		}, rly.listeners)
-
-		require.Equal(t, []listener{
-			{"a", f3, ws3},
-			{"g", f1, ws1},
-			{"g", f2, ws2},
-		}, rlz.listeners)
-	})
-
-	t.Run("removing another subscription id", func(t *testing.T) {
-		// removing 'a' from ws3
-		rl.clients[ws3][0].cancel = func(cause error) {} // set since removing will call it
-		rl.clients[ws3][1].cancel = func(cause error) {} // set since removing will call it
-		rl.removeListenerId(ws3, "a")
-
-		require.Equal(t, map[*WebSocket][]listenerSpec{
-			ws1: {
-				{"c", cancel, 0, rlx},
-				{"g", cancel, 1, rlz},
-			},
-			ws2: {
-				{"b", cancel, 0, rly},
-				{"g", cancel, 0, rlz},
-			},
-			ws3: {
-				{"f", cancel, 2, rly},
-			},
-			ws4: {
-				{"e", cancel, 1, rly},
-				{"e", cancel, 1, rlx},
-			},
-		}, rl.clients)
-
-		require.Equal(t, []listener{
-			{"c", f1, ws1},
-			{"e", f3, ws4},
-		}, rlx.listeners)
-
-		require.Equal(t, []listener{
-			{"b", f2, ws2},
-			{"e", f3, ws4},
-			{"f", f3, ws3},
-		}, rly.listeners)
-
-		require.Equal(t, []listener{
-			{"g", f2, ws2},
-			{"g", f1, ws1},
-		}, rlz.listeners)
-	})
-
-	t.Run("removing a connection", func(t *testing.T) {
-		rl.removeClientAndListeners(ws2)
-
-		require.Equal(t, map[*WebSocket][]listenerSpec{
-			ws1: {
-				{"c", cancel, 0, rlx},
-				{"g", cancel, 0, rlz},
-			},
-			ws3: {
-				{"f", cancel, 0, rly},
-			},
-			ws4: {
-				{"e", cancel, 1, rly},
-				{"e", cancel, 1, rlx},
-			},
-		}, rl.clients)
-
-		require.Equal(t, []listener{
-			{"c", f1, ws1},
-			{"e", f3, ws4},
-		}, rlx.listeners)
-
-		require.Equal(t, []listener{
-			{"f", f3, ws3},
-			{"e", f3, ws4},
-		}, rly.listeners)
-
-		require.Equal(t, []listener{
-			{"g", f1, ws1},
-		}, rlz.listeners)
-	})
-
-	t.Run("removing another subscription id", func(t *testing.T) {
-		// removing 'e' from ws4
-		rl.clients[ws4][0].cancel = func(cause error) {} // set since removing will call it
-		rl.clients[ws4][1].cancel = func(cause error) {} // set since removing will call it
-		rl.removeListenerId(ws4, "e")
-
-		require.Equal(t, map[*WebSocket][]listenerSpec{
-			ws1: {
-				{"c", cancel, 0, rlx},
-				{"g", cancel, 0, rlz},
-			},
-			ws3: {
-				{"f", cancel, 0, rly},
-			},
-			ws4: {},
-		}, rl.clients)
-
-		require.Equal(t, []listener{
-			{"c", f1, ws1},
-		}, rlx.listeners)
-
-		require.Equal(t, []listener{
-			{"f", f3, ws3},
-		}, rly.listeners)
-
-		require.Equal(t, []listener{
-			{"g", f1, ws1},
-		}, rlz.listeners)
-	})
+	// 	require.Equal(t, []listener{
+	// 		{"c", f1, ws1},
+	// 		{"d", f3, ws4},
+	// 		{"a", f3, ws3},
+	// 	}, rl.listeners)
+	// })
 }