Skip to content

Commit bcc2d78

Browse files
PSU3D0PSU3D0
committed
Fix tests
1 parent 56c98ba commit bcc2d78

File tree

4 files changed

+47
-39
lines changed

4 files changed

+47
-39
lines changed

‎src/tools/mod.rs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -978,9 +978,10 @@ pub async fn sheet_formula_map(
978978
}
979979

980980
if let Some(max_items) = max_items
981-
&& groups.len() > max_items {
982-
groups.truncate(max_items);
983-
}
981+
&& groups.len() > max_items
982+
{
983+
groups.truncate(max_items);
984+
}
984985

985986
if let Some(max_bytes) = max_payload_bytes {
986987
let group_limit = cap_rows_by_payload_bytes(groups.len(), Some(max_bytes), |count| {
@@ -2738,9 +2739,10 @@ pub async fn scan_volatiles(
27382739
let total_items = items.len();
27392740

27402741
if let Some(max_items) = max_items
2741-
&& items.len() > max_items {
2742-
items.truncate(max_items);
2743-
}
2742+
&& items.len() > max_items
2743+
{
2744+
items.truncate(max_items);
2745+
}
27442746

27452747
if let Some(max_bytes) = max_payload_bytes {
27462748
let item_limit = cap_rows_by_payload_bytes(items.len(), Some(max_bytes), |count| {
@@ -3660,9 +3662,10 @@ pub async fn table_profile(
36603662
let max_payload_bytes = config.max_payload_bytes();
36613663

36623664
if let Some(max_items) = max_items
3663-
&& headers.len() > max_items {
3664-
headers.truncate(max_items);
3665-
}
3665+
&& headers.len() > max_items
3666+
{
3667+
headers.truncate(max_items);
3668+
}
36663669

36673670
let mut column_types = summarize_columns(&headers, &rows);
36683671

@@ -3676,9 +3679,10 @@ pub async fn table_profile(
36763679

36773680
if !summary_only {
36783681
if let Some(max_items) = max_items
3679-
&& samples.len() > max_items {
3680-
samples.truncate(max_items);
3681-
}
3682+
&& samples.len() > max_items
3683+
{
3684+
samples.truncate(max_items);
3685+
}
36823686

36833687
if let Some(max_bytes) = max_payload_bytes {
36843688
let sample_limit = cap_rows_by_payload_bytes(samples.len(), Some(max_bytes), |count| {

‎src/workbook.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -919,10 +919,11 @@ fn detect_regions(sheet: &Worksheet, metrics: &SheetMetrics) -> DetectRegionsRes
919919
notes.push("Region detection truncated due to time/complexity caps.".to_string());
920920
}
921921
if regions.is_empty()
922-
&& let Some(bounds) = occupancy.dense_bounds() {
923-
regions.push(build_fallback_region(&bounds, metrics));
924-
notes.push("Region detection returned no regions; fallback bounds used.".to_string());
925-
}
922+
&& let Some(bounds) = occupancy.dense_bounds()
923+
{
924+
regions.push(build_fallback_region(&bounds, metrics));
925+
notes.push("Region detection returned no regions; fallback bounds used.".to_string());
926+
}
926927

927928
DetectRegionsResult { regions, notes }
928929
}

‎tests/recalc_docker.rs‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async fn test_recalc_sum_formula() -> Result<()> {
100100
"workbook_or_fork_id": fork_id,
101101
"sheet_name": "Data",
102102
"start_row": 1,
103-
"page_size": 10
103+
"page_size": 10, "format": "full"
104104
}),
105105
))
106106
.await?,
@@ -164,7 +164,7 @@ async fn test_recalc_cross_sheet_reference() -> Result<()> {
164164
"workbook_or_fork_id": fork_id,
165165
"sheet_name": "Output",
166166
"start_row": 1,
167-
"page_size": 10
167+
"page_size": 10, "format": "full"
168168
}),
169169
))
170170
.await?,
@@ -241,7 +241,7 @@ async fn test_recalc_complex_formulas() -> Result<()> {
241241
"workbook_or_fork_id": fork_id,
242242
"sheet_name": "Sheet1",
243243
"start_row": 1,
244-
"page_size": 10
244+
"page_size": 10, "format": "full"
245245
}),
246246
))
247247
.await?,
@@ -327,7 +327,7 @@ async fn test_recalc_chain_dependencies() -> Result<()> {
327327
"workbook_or_fork_id": fork_id,
328328
"sheet_name": "Chain",
329329
"start_row": 1,
330-
"page_size": 10
330+
"page_size": 10, "format": "full"
331331
}),
332332
))
333333
.await?,
@@ -437,7 +437,7 @@ async fn test_edit_and_recalc_workflow() -> Result<()> {
437437
"workbook_or_fork_id": fork_id,
438438
"sheet_name": "Data",
439439
"start_row": 1,
440-
"page_size": 10
440+
"page_size": 10, "format": "full"
441441
}),
442442
))
443443
.await?,
@@ -514,7 +514,7 @@ async fn test_edit_formula_and_recalc() -> Result<()> {
514514
"workbook_or_fork_id": fork_id,
515515
"sheet_name": "Data",
516516
"start_row": 1,
517-
"page_size": 10
517+
"page_size": 10, "format": "full"
518518
}),
519519
))
520520
.await?,
@@ -733,7 +733,8 @@ async fn test_vlookup_recalc_with_real_workbook() -> Result<()> {
733733
"workbook_or_fork_id": fork_id,
734734
"sheet_name": "Calculations",
735735
"start_row": 1,
736-
"page_size": 15
736+
"page_size": 15,
737+
"format": "full"
737738
}),
738739
))
739740
.await?,
@@ -816,7 +817,7 @@ async fn test_recalc_division_by_zero_error() -> Result<()> {
816817
"workbook_or_fork_id": fork_id,
817818
"sheet_name": "Data",
818819
"start_row": 1,
819-
"page_size": 10
820+
"page_size": 10, "format": "full"
820821
}),
821822
))
822823
.await?,
@@ -892,7 +893,7 @@ async fn test_recalc_error_propagation() -> Result<()> {
892893
"workbook_or_fork_id": fork_id,
893894
"sheet_name": "Data",
894895
"start_row": 1,
895-
"page_size": 10
896+
"page_size": 10, "format": "full"
896897
}),
897898
))
898899
.await?,
@@ -975,7 +976,7 @@ async fn test_recalc_date_arithmetic() -> Result<()> {
975976
"workbook_or_fork_id": fork_id,
976977
"sheet_name": "Data",
977978
"start_row": 1,
978-
"page_size": 10
979+
"page_size": 10, "format": "full"
979980
}),
980981
))
981982
.await?,
@@ -1087,7 +1088,7 @@ async fn test_recalc_large_dataset_sumif() -> Result<()> {
10871088
"workbook_or_fork_id": fork_id,
10881089
"sheet_name": "Data",
10891090
"start_row": 1,
1090-
"page_size": 10
1091+
"page_size": 10, "format": "full"
10911092
}),
10921093
))
10931094
.await?,
@@ -1189,7 +1190,7 @@ async fn test_recalc_multiple_batch_edits() -> Result<()> {
11891190
"workbook_or_fork_id": fork_id,
11901191
"sheet_name": "Data",
11911192
"start_row": 1,
1192-
"page_size": 10
1193+
"page_size": 10, "format": "full"
11931194
}),
11941195
))
11951196
.await?,
@@ -1319,7 +1320,7 @@ async fn test_concurrent_forks_isolation() -> Result<()> {
13191320
"workbook_or_fork_id": fork1_id,
13201321
"sheet_name": "Data",
13211322
"start_row": 1,
1322-
"page_size": 10
1323+
"page_size": 10, "format": "full"
13231324
}),
13241325
))
13251326
.await?,
@@ -1333,7 +1334,7 @@ async fn test_concurrent_forks_isolation() -> Result<()> {
13331334
"workbook_or_fork_id": fork2_id,
13341335
"sheet_name": "Data",
13351336
"start_row": 1,
1336-
"page_size": 10
1337+
"page_size": 10, "format": "full"
13371338
}),
13381339
))
13391340
.await?,
@@ -1369,7 +1370,7 @@ async fn test_concurrent_forks_isolation() -> Result<()> {
13691370
"workbook_or_fork_id": workbook_id,
13701371
"sheet_name": "Data",
13711372
"start_row": 1,
1372-
"page_size": 10
1373+
"page_size": 10, "format": "full"
13731374
}),
13741375
))
13751376
.await?,
@@ -1450,7 +1451,7 @@ async fn test_recalc_empty_cells_in_range() -> Result<()> {
14501451
"workbook_or_fork_id": fork_id,
14511452
"sheet_name": "Data",
14521453
"start_row": 1,
1453-
"page_size": 10
1454+
"page_size": 10, "format": "full"
14541455
}),
14551456
))
14561457
.await?,
@@ -1552,7 +1553,7 @@ async fn test_recalc_text_and_boolean_handling() -> Result<()> {
15521553
"workbook_or_fork_id": fork_id,
15531554
"sheet_name": "Data",
15541555
"start_row": 1,
1555-
"page_size": 10
1556+
"page_size": 10, "format": "full"
15561557
}),
15571558
))
15581559
.await?,
@@ -2077,7 +2078,7 @@ async fn test_save_then_load_as_new_original() -> Result<()> {
20772078
"workbook_or_fork_id": fork2_id,
20782079
"sheet_name": "Data",
20792080
"start_row": 1,
2080-
"page_size": 10
2081+
"page_size": 10, "format": "full"
20812082
}),
20822083
))
20832084
.await?,
@@ -2116,7 +2117,7 @@ async fn test_save_then_load_as_new_original() -> Result<()> {
21162117
"workbook_or_fork_id": fork2_id,
21172118
"sheet_name": "Data",
21182119
"start_row": 1,
2119-
"page_size": 10
2120+
"page_size": 10, "format": "full"
21202121
}),
21212122
))
21222123
.await?,

‎tests/screenshot_docker.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ use base64::Engine;
1414
use image::ImageFormat;
1515

1616
fn workbook_id_by_name(workbooks: &Value, name: &str) -> String {
17+
// Use slug instead of path since token-dense defaults hide paths
18+
let name_without_ext = name.strip_suffix(".xlsx").unwrap_or(name);
1719
workbooks["workbooks"]
1820
.as_array()
1921
.and_then(|arr| {
2022
arr.iter().find(|w| {
21-
w["path"]
23+
w["slug"]
2224
.as_str()
23-
.map(|p| p.ends_with(name))
25+
.map(|s| s == name_without_ext)
2426
.unwrap_or(false)
2527
})
2628
})
@@ -609,7 +611,7 @@ async fn test_screenshot_visual_scenarios_original_and_forked() -> Result<()> {
609611
"workbook_or_fork_id": forked_workbook_id,
610612
"sheet_name": "Data",
611613
"start_row": 1,
612-
"page_size": 3
614+
"page_size": 3, "format": "full"
613615
}),
614616
))
615617
.await?,
@@ -622,7 +624,7 @@ async fn test_screenshot_visual_scenarios_original_and_forked() -> Result<()> {
622624
"workbook_or_fork_id": fork_id,
623625
"sheet_name": "Data",
624626
"start_row": 1,
625-
"page_size": 3
627+
"page_size": 3, "format": "full"
626628
}),
627629
))
628630
.await?,

0 commit comments

Comments
 (0)