Skip to content

Commit 78ec327

Browse files
authored
fix: run all test (#438)
* fix: run all test * chore: clippy
1 parent 971f340 commit 78ec327

File tree

18 files changed

+65
-97
lines changed

18 files changed

+65
-97
lines changed

collab/Cargo.toml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ blake3.workspace = true
5959
[dev-dependencies]
6060
tokio = { workspace = true, features = ["macros", "sync", "rt"] }
6161
tempfile = "3.8.0"
62-
collab = { path = "", default-features = false }
62+
collab = { path = "", features = ["plugins"] }
6363
chrono.workspace = true
6464
assert-json-diff = "2.0.2"
6565
tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
@@ -77,10 +77,29 @@ lock_timeout = []
7777
rwlock_reason = []
7878
import_csv = []
7979

80+
[[test]]
81+
name = "database"
82+
path = "tests/database/main.rs"
83+
84+
[[test]]
85+
name = "document"
86+
path = "tests/document/main.rs"
87+
88+
[[test]]
89+
name = "folder"
90+
path = "tests/folder/main.rs"
91+
92+
[[test]]
93+
name = "importer"
94+
path = "tests/importer/main.rs"
95+
96+
[[test]]
97+
name = "user"
98+
path = "tests/user/main.rs"
99+
80100
[[test]]
81101
name = "plugins"
82102
path = "tests/plugins/main.rs"
83-
required-features = ["plugins"]
84103

85104
[build-dependencies]
86105
prost-build = "0.12"

collab/tests/database/database_test/view_observe_test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ async fn observe_move_database_row_test() {
156156
let cloned_database_test = database_test.clone();
157157
let cloned_row_id_1 = row_id_1;
158158

159-
let views = database_test.lock().await.get_all_views();
159+
let views = database_test.lock().await.get_all_views(false);
160160
assert_eq!(views.len(), 1);
161161
let view_id = views[0].id;
162162
let row_orders = database_test
@@ -275,7 +275,7 @@ async fn observe_move_database_view_row_test() {
275275
.unwrap();
276276

277277
let second_view_id = uuid::Uuid::new_v4().to_string();
278-
let first_view_id = database_test.get_all_views().first().unwrap().id;
278+
let first_view_id = database_test.get_all_views(false).first().unwrap().id;
279279
database_test
280280
.create_linked_view(CreateViewParams {
281281
database_id: database_uuid,
@@ -290,7 +290,7 @@ async fn observe_move_database_view_row_test() {
290290
let cloned_database_test = database_test.clone();
291291
let cloned_row_id_1 = row_id_1;
292292

293-
let views = database_test.lock().await.get_all_views();
293+
let views = database_test.lock().await.get_all_views(false);
294294
assert_eq!(views.len(), 2);
295295

296296
let cloned_row_id_3 = row_id_3;

collab/tests/database/database_test/view_test.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ async fn create_initial_database_test() {
3939
database_id
4040
);
4141

42-
let views = database_test.get_all_views();
42+
let views = database_test.get_all_views(false);
4343
assert_eq!(views.len(), 1);
4444
assert_eq!(views[0].database_id.to_string(), database_id);
4545
assert_ne!(views[0].database_id.to_string(), views[0].id.to_string());
@@ -213,13 +213,13 @@ async fn delete_database_view_test() {
213213
database_test.create_linked_view(params).unwrap();
214214
}
215215

216-
let views = database_test.get_all_views();
216+
let views = database_test.get_all_views(false);
217217
assert_eq!(views.len(), 4);
218218

219219
let deleted_view_id = view_ids[1].to_string();
220220
database_test.delete_view(&deleted_view_id);
221221
let views = database_test
222-
.get_all_views()
222+
.get_all_views(false)
223223
.iter()
224224
.map(|view| view.id)
225225
.map(|id| id.to_string())
@@ -233,15 +233,15 @@ async fn duplicate_database_view_test() {
233233
let database_id = uuid::Uuid::new_v4();
234234
let mut database_test = create_database_with_default_data(1, &database_id.to_string()).await;
235235

236-
let views = database_test.get_all_views();
236+
let views = database_test.get_all_views(false);
237237
assert_eq!(views.len(), 1);
238238

239239
let view = database_test.get_view(TEST_VIEW_ID_V1).unwrap();
240240
let duplicated_view = database_test
241241
.duplicate_linked_view(TEST_VIEW_ID_V1)
242242
.unwrap();
243243

244-
let views = database_test.get_all_views();
244+
let views = database_test.get_all_views(false);
245245
assert_eq!(views.len(), 2);
246246

247247
assert_eq!(duplicated_view.name, format!("{}-copy", view.name));

collab/tests/database/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "plugins")]
2-
31
pub mod database_test;
42
pub mod helper;
53
pub mod remapper;

collab/tests/database/user_test/database_test.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ async fn create_database_test() {
1919
.await;
2020

2121
// Inline view id should not appear in the database's linked views.
22-
let non_inline_views = database.get_all_views();
22+
let non_inline_views = database.get_all_views(false);
2323
assert_eq!(non_inline_views.len(), 1);
2424
assert_eq!(non_inline_views[0].id, view_id);
2525
}
@@ -170,17 +170,17 @@ async fn delete_database_linked_view_test() {
170170
})
171171
.unwrap();
172172

173-
let views = database.get_all_views();
173+
let views = database.get_all_views(false);
174174
assert_eq!(views.len(), 2);
175175

176176
database.delete_view(TEST_VIEW_ID_V2);
177177

178-
let views = database.get_all_views();
178+
let views = database.get_all_views(false);
179179
assert_eq!(views.len(), 1);
180180

181181
database.delete_view(TEST_VIEW_ID_V1);
182182

183-
let views = database.get_all_views();
183+
let views = database.get_all_views(false);
184184
assert_eq!(views.len(), 0);
185185
}
186186

@@ -209,11 +209,11 @@ async fn delete_database_inline_view_test() {
209209
}
210210

211211
// there should be 4 views: v1, v2, v3 and v4.
212-
let views = database.get_all_views();
212+
let views = database.get_all_views(false);
213213
assert_eq!(views.len(), 4);
214214

215215
database.delete_view(TEST_VIEW_ID_V1);
216-
let views = database.get_all_views();
216+
let views = database.get_all_views(false);
217217
assert_eq!(views.len(), 3);
218218
}
219219

collab/tests/document/block_parser/ai_meeting_test.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::blocks::block_test_core::{BlockTestCore, generate_id};
2-
use collab::document::block_parser::parsers::ai_meeting::AiMeetingParser;
3-
use collab::document::block_parser::{BlockParser, DocumentParser, OutputFormat, ParseContext};
2+
use collab::document::block_parser::{DocumentParser, OutputFormat, ParseContext};
43
use collab::document::blocks::{Block, BlockType};
54
use serde_json::json;
65
use std::collections::HashMap;

collab/tests/document/blocks/mention_integration_test.rs

Lines changed: 29 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -25,58 +25,33 @@ fn test_create_document_with_all_mention_types() {
2525
document.insert_block(block, None).unwrap();
2626

2727
// Build a rich delta with all mention types
28-
let mut deltas = Vec::new();
29-
30-
// Regular text
31-
deltas.push(TextDelta::Inserted("Hello ".to_string(), None));
32-
33-
// Person mention
34-
deltas.push(build_mention_person_delta(
35-
"person_123",
36-
"Alice",
37-
&page_id,
38-
Some(&block_id),
39-
None,
40-
));
41-
42-
// More text
43-
deltas.push(TextDelta::Inserted("! Check ".to_string(), None));
44-
45-
// Page mention
46-
deltas.push(build_mention_page_delta(
47-
MentionPageType::Page,
48-
"page_456",
49-
Some("block_789"),
50-
None,
51-
));
52-
53-
// Text
54-
deltas.push(TextDelta::Inserted(" and ".to_string(), None));
55-
56-
// Child page mention
57-
deltas.push(build_mention_page_delta(
58-
MentionPageType::ChildPage,
59-
"child_page_999",
60-
None,
61-
None,
62-
));
63-
64-
// Text
65-
deltas.push(TextDelta::Inserted(" on ".to_string(), None));
66-
67-
// Date mention with reminder
68-
deltas.push(build_mention_date_delta(
69-
"2025-01-30T10:00:00Z",
70-
Some("reminder_abc"),
71-
Some("atTimeOfEvent"),
72-
true,
73-
));
74-
75-
// Text
76-
deltas.push(TextDelta::Inserted(". Link: ".to_string(), None));
77-
78-
// External link mention
79-
deltas.push(build_mention_external_link_delta("https://appflowy.io"));
28+
let deltas = vec![
29+
// Regular text
30+
TextDelta::Inserted("Hello ".to_string(), None),
31+
// Person mention
32+
build_mention_person_delta("person_123", "Alice", &page_id, Some(&block_id), None),
33+
// More text
34+
TextDelta::Inserted("! Check ".to_string(), None),
35+
// Page mention
36+
build_mention_page_delta(MentionPageType::Page, "page_456", Some("block_789"), None),
37+
// Text
38+
TextDelta::Inserted(" and ".to_string(), None),
39+
// Child page mention
40+
build_mention_page_delta(MentionPageType::ChildPage, "child_page_999", None, None),
41+
// Text
42+
TextDelta::Inserted(" on ".to_string(), None),
43+
// Date mention with reminder
44+
build_mention_date_delta(
45+
"2025-01-30T10:00:00Z",
46+
Some("reminder_abc"),
47+
Some("atTimeOfEvent"),
48+
true,
49+
),
50+
// Text
51+
TextDelta::Inserted(". Link: ".to_string(), None),
52+
// External link mention
53+
build_mention_external_link_delta("https://appflowy.io"),
54+
];
8055

8156
// Apply deltas to document
8257
let delta_json = serde_json::to_string(&deltas).unwrap();
@@ -307,7 +282,7 @@ fn test_mention_data_enum() {
307282
date, include_time, ..
308283
}) => {
309284
assert_eq!(date, "2025-01-30T10:00:00Z");
310-
assert_eq!(include_time, false);
285+
assert!(!include_time);
311286
},
312287
_ => panic!("Expected Date mention data"),
313288
}
@@ -334,7 +309,7 @@ fn test_date_without_time() {
334309
reminder_option,
335310
}) => {
336311
assert_eq!(date, "2025-01-30T00:00:00Z");
337-
assert_eq!(include_time, false);
312+
assert!(!include_time);
338313
assert_eq!(reminder_id, None);
339314
assert_eq!(reminder_option, None);
340315
},

collab/tests/document/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "plugins")]
2-
31
mod block_parser;
42
mod blocks;
53
mod conversions;

collab/tests/folder/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "plugins")]
2-
31
mod child_views_test;
42
mod custom_section;
53
mod favorite_test;

collab/tests/plugins/disk/delete_test.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "plugins")]
2-
31
use crate::disk::script::CollabPersistenceTest;
42
use collab::plugins::local_storage::CollabPersistenceConfig;
53

0 commit comments

Comments
 (0)