11use collab:: core:: collab:: { CollabOptions , DataSource , default_client_id} ;
2- use collab:: core:: origin:: CollabOrigin ;
2+ use collab:: core:: origin:: { CollabClient , CollabOrigin } ;
33use collab:: entity:: EncoderVersion ;
44use collab:: preclude:: Collab ;
55use serde_json:: json;
@@ -8,7 +8,11 @@ use yrs::updates::decoder::Decode;
88
99#[ tokio:: test]
1010async fn create_restore_revision ( ) {
11- let mut collab = Collab :: new ( 1 , "1" , "1" , default_client_id ( ) ) ;
11+ let mut collab = Collab :: new_with_options (
12+ CollabOrigin :: Client ( CollabClient :: new ( 1 , "1" . to_string ( ) ) ) ,
13+ CollabOptions :: new ( "1" . into ( ) , default_client_id ( ) ) . with_gc ( false ) ,
14+ )
15+ . unwrap ( ) ;
1216 collab. insert ( "key" , "value1" ) ;
1317 let state1 = collab
1418 . encode_collab_v1 ( |_| Ok :: < _ , anyhow:: Error > ( ( ) ) )
@@ -37,7 +41,11 @@ async fn create_restore_revision() {
3741
3842#[ tokio:: test]
3943async fn remove_revision_cleanups_deleted_data ( ) {
40- let mut collab = Collab :: new ( 1 , "1" , "1" , default_client_id ( ) ) ;
44+ let mut collab = Collab :: new_with_options (
45+ CollabOrigin :: Client ( CollabClient :: new ( 1 , "1" . to_string ( ) ) ) ,
46+ CollabOptions :: new ( "1" . into ( ) , default_client_id ( ) ) . with_gc ( false ) ,
47+ )
48+ . unwrap ( ) ;
4149 collab. insert ( "key" , "value1" ) ;
4250 let r1 = collab. create_named_revision ( "r1" ) . unwrap ( ) ;
4351 collab. insert ( "key" , "value2" ) ;
@@ -70,7 +78,11 @@ async fn remove_revision_cleanups_deleted_data() {
7078
7179#[ tokio:: test]
7280async fn remove_revision_should_eventually_remove_revision_data ( ) {
73- let mut collab = Collab :: new ( 1 , "1" , "1" , default_client_id ( ) ) ;
81+ let mut collab = Collab :: new_with_options (
82+ CollabOrigin :: Client ( CollabClient :: new ( 1 , "1" . to_string ( ) ) ) ,
83+ CollabOptions :: new ( "1" . into ( ) , default_client_id ( ) ) . with_gc ( false ) ,
84+ )
85+ . unwrap ( ) ;
7486 collab. insert ( "key" , "value1" ) ;
7587 let r1 = collab. create_named_revision ( "revision1" ) . unwrap ( ) ;
7688 collab. insert ( "key" , "value2" ) ;
@@ -101,7 +113,11 @@ async fn remove_revision_should_eventually_remove_revision_data() {
101113
102114#[ tokio:: test]
103115async fn cleaning_all_revisions_doesnt_leave_garbage ( ) {
104- let mut collab = Collab :: new ( 1 , "1" , "1" , default_client_id ( ) ) ;
116+ let mut collab = Collab :: new_with_options (
117+ CollabOrigin :: Client ( CollabClient :: new ( 1 , "1" . to_string ( ) ) ) ,
118+ CollabOptions :: new ( "1" . into ( ) , default_client_id ( ) ) . with_gc ( false ) ,
119+ )
120+ . unwrap ( ) ;
105121 collab. insert ( "key" , "value1" ) ;
106122 let r1 = collab. create_named_revision ( "revision1" ) . unwrap ( ) ;
107123 collab. insert ( "key" , "value2" ) ;
@@ -128,14 +144,22 @@ async fn cleaning_all_revisions_doesnt_leave_garbage() {
128144
129145#[ tokio:: test]
130146async fn remote_updates_can_be_cleaned_up ( ) {
131- let mut c1 = Collab :: new ( 1 , "1" , "1" , default_client_id ( ) ) ;
147+ let mut c1 = Collab :: new_with_options (
148+ CollabOrigin :: Client ( CollabClient :: new ( 1 , "1" . to_string ( ) ) ) ,
149+ CollabOptions :: new ( "1" . into ( ) , default_client_id ( ) ) . with_gc ( false ) ,
150+ )
151+ . unwrap ( ) ;
132152 c1. insert ( "key" , "value1" ) ;
133153 let r1 = c1. create_named_revision ( "revision1" ) . unwrap ( ) ;
134154 c1. insert ( "key" , "value2" ) ;
135155 let _r2 = c1. create_named_revision ( "revision2" ) . unwrap ( ) ;
136156 c1. insert ( "key" , "value3" ) ;
137157
138- let mut c2 = Collab :: new ( 1 , "1" , "2" , default_client_id ( ) ) ;
158+ let mut c2 = Collab :: new_with_options (
159+ CollabOrigin :: Client ( CollabClient :: new ( 1 , "2" . to_string ( ) ) ) ,
160+ CollabOptions :: new ( "1" . into ( ) , default_client_id ( ) ) . with_gc ( false ) ,
161+ )
162+ . unwrap ( ) ;
139163 let state = c1. encode_collab_v2 ( ) ;
140164 c2. apply_update ( Update :: decode_v2 ( & state. doc_state ) . unwrap ( ) )
141165 . unwrap ( ) ;
0 commit comments