Skip to content

Commit 2893239

Browse files
flying-sheepflying-sheep
committed
fix tests
1 parent e94fce8 commit 2893239

File tree

5 files changed

+43
-8
lines changed

5 files changed

+43
-8
lines changed

‎.vscode/settings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"python.testing.pytestArgs": [],
3+
"python.testing.pytestEnabled": true
4+
}

‎pyproject-fmt/rust/src/dependency_groups.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use common::util::iter;
77
use lexical_sort::natural_lexical_cmp;
88
use std::cmp::Ordering;
99

10-
pub fn fix(tables: &mut Tables, keep_full_version: bool, do_not_collapse: &[Vec<String>]) {
11-
collapse_sub_tables(tables, "dependency-groups", do_not_collapse);
10+
pub fn fix(tables: &mut Tables, keep_full_version: bool) {
11+
collapse_sub_tables(tables, "dependency-groups", &[]);
1212
let table_element = tables.get("dependency-groups");
1313
if table_element.is_none() {
1414
return;

‎pyproject-fmt/rust/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ pub fn format_toml(content: &str, opt: &Settings) -> String {
7171
opt.generate_python_version_classifiers,
7272
opt.do_not_collapse.as_slice(),
7373
);
74-
dependency_groups::fix(&mut tables, opt.keep_full_version, opt.do_not_collapse.as_slice());
74+
dependency_groups::fix(&mut tables, opt.keep_full_version);
7575
ruff::fix(&mut tables, opt.do_not_collapse.as_slice());
7676
reorder_tables(&root_ast, &tables);
7777

‎pyproject-fmt/rust/src/tests/project_tests.rs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ fn evaluate(
1212
keep_full_version: bool,
1313
max_supported_python: (u8, u8),
1414
generate_python_version_classifiers: bool,
15+
do_not_collapse: &[Vec<String>]
1516
) -> String {
1617
let root_ast = parse(start).into_syntax().clone_for_update();
1718
let count = root_ast.children_with_tokens().count();
@@ -22,6 +23,7 @@ fn evaluate(
2223
max_supported_python,
2324
(3, 9),
2425
generate_python_version_classifiers,
26+
do_not_collapse,
2527
);
2628
let entries = tables
2729
.table_set
@@ -43,6 +45,7 @@ fn evaluate(
4345
false,
4446
(3, 9),
4547
true,
48+
&[],
4649
)]
4750
#[case::project_requires_no_keep(
4851
indoc ! {r#"
@@ -63,6 +66,7 @@ fn evaluate(
6366
false,
6467
(3, 9),
6568
true,
69+
&[],
6670
)]
6771
#[case::project_requires_keep(
6872
indoc ! {r#"
@@ -83,6 +87,7 @@ fn evaluate(
8387
true,
8488
(3, 9),
8589
true,
90+
&[],
8691
)]
8792
#[case::project_requires_ge(
8893
indoc ! {r#"
@@ -121,6 +126,7 @@ fn evaluate(
121126
true,
122127
(3, 10),
123128
true,
129+
&[],
124130
)]
125131
#[case::project_requires_gt(
126132
indoc ! {r#"
@@ -138,6 +144,7 @@ fn evaluate(
138144
true,
139145
(3, 9),
140146
true,
147+
&[],
141148
)]
142149
#[case::project_requires_eq(
143150
indoc ! {r#"
@@ -155,6 +162,7 @@ fn evaluate(
155162
true,
156163
(3, 9),
157164
true,
165+
&[],
158166
)]
159167
#[case::project_sort_keywords(
160168
indoc ! {r#"
@@ -177,6 +185,7 @@ fn evaluate(
177185
true,
178186
(3, 9),
179187
true,
188+
&[],
180189
)]
181190
#[case::project_sort_dynamic(
182191
indoc ! {r#"
@@ -201,6 +210,7 @@ fn evaluate(
201210
true,
202211
(3, 9),
203212
true,
213+
&[],
204214
)]
205215
#[case::project_name_norm(
206216
indoc ! {r#"
@@ -218,6 +228,7 @@ fn evaluate(
218228
true,
219229
(3, 9),
220230
true,
231+
&[],
221232
)]
222233
#[case::project_name_literal(
223234
indoc ! {r"
@@ -235,6 +246,7 @@ fn evaluate(
235246
true,
236247
(3, 9),
237248
true,
249+
&[],
238250
)]
239251
#[case::project_requires_gt_old(
240252
indoc ! {r#"
@@ -253,6 +265,7 @@ fn evaluate(
253265
true,
254266
(3, 9),
255267
true,
268+
&[],
256269
)]
257270
#[case::project_requires_range(
258271
indoc ! {r#"
@@ -275,6 +288,7 @@ fn evaluate(
275288
true,
276289
(3, 9),
277290
true,
291+
&[],
278292
)]
279293
#[case::project_requires_high_range(
280294
indoc ! {r#"
@@ -294,6 +308,7 @@ fn evaluate(
294308
true,
295309
(3, 9),
296310
true,
311+
&[],
297312
)]
298313
#[case::project_requires_range_neq(
299314
indoc ! {r#"
@@ -312,6 +327,7 @@ fn evaluate(
312327
true,
313328
(3, 13),
314329
true,
330+
&[],
315331
)]
316332
#[case::project_description_whitespace(
317333
"[project]\ndescription = ' A magic stuff \t is great\t\t.\r\n Like really . Works on .rst and .NET :)\t\'\nrequires-python = '==3.12'",
@@ -327,6 +343,7 @@ fn evaluate(
327343
true,
328344
(3, 13),
329345
true,
346+
&[],
330347
)]
331348
#[case::project_description_multiline(
332349
indoc ! {r#"
@@ -349,6 +366,7 @@ fn evaluate(
349366
true,
350367
(3, 13),
351368
true,
369+
&[],
352370
)]
353371
#[case::project_dependencies_with_double_quotes(
354372
indoc ! {r#"
@@ -374,6 +392,7 @@ fn evaluate(
374392
true,
375393
(3, 13),
376394
true,
395+
&[],
377396
)]
378397
#[case::project_platform_dependencies(
379398
indoc ! {r#"
@@ -401,6 +420,7 @@ fn evaluate(
401420
true,
402421
(3, 13),
403422
true,
423+
&[],
404424
)]
405425
#[case::project_opt_inline_dependencies(
406426
indoc ! {r#"
@@ -432,6 +452,7 @@ fn evaluate(
432452
true,
433453
(3, 13),
434454
true,
455+
&[],
435456
)]
436457
#[case::project_opt_dependencies(
437458
indoc ! {r#"
@@ -457,6 +478,7 @@ fn evaluate(
457478
true,
458479
(3, 9),
459480
true,
481+
&[],
460482
)]
461483
#[case::project_scripts_collapse(
462484
indoc ! {r#"
@@ -476,6 +498,7 @@ fn evaluate(
476498
true,
477499
(3, 9),
478500
true,
501+
&[],
479502
)]
480503
#[case::project_entry_points_collapse(
481504
indoc ! {r#"
@@ -514,6 +537,7 @@ fn evaluate(
514537
true,
515538
(3, 9),
516539
true,
540+
&[],
517541
)]
518542
#[case::project_preserve_implementation_classifiers(
519543
indoc ! {r#"
@@ -543,6 +567,7 @@ fn evaluate(
543567
true,
544568
(3, 10),
545569
true,
570+
&[],
546571
)]
547572
#[case::remove_existing_python_classifiers(
548573
indoc! {r#"
@@ -569,6 +594,7 @@ fn evaluate(
569594
true,
570595
(3, 10),
571596
false,
597+
&[],
572598
)]
573599
#[case::missing_classifiers(
574600
indoc! {r#"
@@ -584,6 +610,7 @@ fn evaluate(
584610
true,
585611
(3, 10),
586612
false,
613+
&[],
587614
)]
588615
#[case::empty_classifiers(
589616
indoc! {r#"
@@ -602,6 +629,7 @@ fn evaluate(
602629
true,
603630
(3, 10),
604631
false,
632+
&[],
605633
)]
606634
#[case::preserve_non_python_classifiers(
607635
indoc! {r#"
@@ -625,20 +653,23 @@ fn evaluate(
625653
true,
626654
(3, 10),
627655
false,
656+
&[],
628657
)]
629658
fn test_format_project(
630659
#[case] start: &str,
631660
#[case] expected: &str,
632661
#[case] keep_full_version: bool,
633662
#[case] max_supported_python: (u8, u8),
634663
#[case] generate_python_version_classifiers: bool,
664+
#[case] do_not_collapse: &[Vec<String>],
635665
) {
636666
assert_eq!(
637667
evaluate(
638668
start,
639669
keep_full_version,
640670
max_supported_python,
641-
generate_python_version_classifiers
671+
generate_python_version_classifiers,
672+
do_not_collapse,
642673
),
643674
expected
644675
);

‎pyproject-fmt/rust/src/tests/ruff_tests.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ use rstest::{fixture, rstest};
99
use crate::ruff::fix;
1010
use common::table::Tables;
1111

12-
fn evaluate(start: &str) -> String {
12+
fn evaluate(start: &str, do_not_collapse: &[Vec<String>]) -> String {
1313
let root_ast = parse(start).into_syntax().clone_for_update();
1414
let count = root_ast.children_with_tokens().count();
1515
let mut tables = Tables::from_ast(&root_ast);
16-
fix(&mut tables);
16+
fix(&mut tables, do_not_collapse);
1717
let entries = tables
1818
.table_set
1919
.iter()
@@ -37,15 +37,15 @@ fn data() -> PathBuf {
3737
#[rstest]
3838
fn test_order_ruff(data: PathBuf) {
3939
let start = read_to_string(data.join("ruff-order.start.toml")).unwrap();
40-
let got = evaluate(start.as_str());
40+
let got = evaluate(start.as_str(), &[]);
4141
let expected = read_to_string(data.join("ruff-order.expected.toml")).unwrap();
4242
assert_eq!(got, expected);
4343
}
4444

4545
#[rstest]
4646
fn test_ruff_comment_21(data: PathBuf) {
4747
let start = read_to_string(data.join("ruff-21.start.toml")).unwrap();
48-
let got = evaluate(start.as_str());
48+
let got = evaluate(start.as_str(), &[]);
4949
let expected = read_to_string(data.join("ruff-21.expected.toml")).unwrap();
5050
assert_eq!(got, expected);
5151
}

0 commit comments

Comments
 (0)