Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit e96e9ed

Browse files
nrcnrc
committed
Fixup tests
1 parent f0a3c7a commit e96e9ed

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

‎src/test/mod.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ fn test_shutdown() {
120120
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
121121
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
122122
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
123+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
123124
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
124125
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
125126
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -167,6 +168,7 @@ fn test_goto_def() {
167168
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
168169
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
169170
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
171+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
170172
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
171173
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
172174
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -220,6 +222,7 @@ fn test_hover() {
220222
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
221223
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
222224
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
225+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
223226
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
224227
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
225228
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -305,6 +308,7 @@ fn test_hover_after_src_line_change() {
305308
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
306309
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
307310
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
311+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
308312
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
309313
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
310314
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -335,6 +339,7 @@ fn test_hover_after_src_line_change() {
335339
&[
336340
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
337341
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
342+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
338343
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
339344
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
340345
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -478,6 +483,7 @@ fn test_find_all_refs() {
478483
#[test]
479484
fn test_find_all_refs_no_cfg_test() {
480485
let mut env = Environment::new("find_all_refs_no_cfg_test");
486+
env.with_config(|c| c.all_targets = false);
481487

482488
let source_file_path = Path::new("src").join("main.rs");
483489

@@ -556,6 +562,7 @@ fn test_borrow_error() {
556562
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
557563
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
558564
ExpectedMessage::new(None).expect_contains("progress").expect_contains("borrow_error"),
565+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("borrow_error"),
559566
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
560567
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
561568
ExpectedMessage::new(None).expect_contains(
@@ -600,6 +607,7 @@ fn test_highlight() {
600607
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
601608
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
602609
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
610+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
603611
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
604612
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
605613
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -659,6 +667,7 @@ fn test_rename() {
659667
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
660668
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
661669
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
670+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
662671
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
663672
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
664673
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -721,6 +730,7 @@ fn test_reformat() {
721730
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
722731
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
723732
ExpectedMessage::new(None).expect_contains("progress").expect_contains("reformat"),
733+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("reformat"),
724734
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
725735
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
726736
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -782,6 +792,7 @@ fn test_reformat_with_range() {
782792
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
783793
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
784794
ExpectedMessage::new(None).expect_contains("progress").expect_contains("reformat_with_range"),
795+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("reformat_with_range"),
785796
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
786797
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
787798
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -821,6 +832,8 @@ fn test_multiple_binaries() {
821832
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
822833
// order of these is random
823834
ExpectedMessage::new(None).expect_contains("progress").expect_contains("bin"), // "bin1"),
835+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("bin"), // "bin1"),
836+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("bin"), // "bin2"),
824837
ExpectedMessage::new(None).expect_contains("progress").expect_contains("bin"), // "bin2"),
825838
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
826839
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
@@ -983,6 +996,7 @@ fn test_infer_lib() {
983996
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
984997
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
985998
ExpectedMessage::new(None).expect_contains("progress").expect_contains("infer_lib"),
999+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("infer_lib"),
9861000
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
9871001
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
9881002
ExpectedMessage::new(None).expect_contains("struct is never used: `UnusedLib`"),
@@ -1012,6 +1026,7 @@ fn test_infer_bin() {
10121026
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
10131027
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
10141028
ExpectedMessage::new(None).expect_contains("progress").expect_contains("infer_bin"),
1029+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("infer_bin"),
10151030
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
10161031
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
10171032
ExpectedMessage::new(None).expect_contains("struct is never used: `UnusedBin`"),
@@ -1041,6 +1056,7 @@ fn test_infer_custom_bin() {
10411056
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
10421057
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
10431058
ExpectedMessage::new(None).expect_contains("progress").expect_contains("custom_bin"),
1059+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("custom_bin"),
10441060
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
10451061
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
10461062
ExpectedMessage::new(None).expect_contains("struct is never used: `UnusedCustomBin`"),
@@ -1166,6 +1182,7 @@ fn test_find_impls() {
11661182
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
11671183
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
11681184
ExpectedMessage::new(None).expect_contains("progress").expect_contains("find_impls"),
1185+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("find_impls"),
11691186
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
11701187
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
11711188
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -1223,6 +1240,7 @@ fn test_features() {
12231240
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
12241241
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
12251242
ExpectedMessage::new(None).expect_contains("progress").expect_contains("features"),
1243+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("features"),
12261244
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
12271245
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
12281246
ExpectedMessage::new(None).expect_contains(
@@ -1255,6 +1273,7 @@ fn test_all_features() {
12551273
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
12561274
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
12571275
ExpectedMessage::new(None).expect_contains("progress").expect_contains("features"),
1276+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("features"),
12581277
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
12591278
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
12601279
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -1287,6 +1306,7 @@ fn test_no_default_features() {
12871306
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
12881307
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
12891308
ExpectedMessage::new(None).expect_contains("progress").expect_contains("features"),
1309+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("features"),
12901310
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
12911311
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
12921312
ExpectedMessage::new(None).expect_contains(
@@ -1406,6 +1426,7 @@ fn test_deglob() {
14061426
ExpectedMessage::new(Some(0)).expect_contains("rls.deglobImports"),
14071427
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
14081428
ExpectedMessage::new(None).expect_contains("progress").expect_contains("deglob"),
1429+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("deglob"),
14091430
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
14101431
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
14111432
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -1620,6 +1641,7 @@ fn ignore_uninitialized_notification() {
16201641
ExpectedMessage::new(Some(1)).expect_contains("capabilities"),
16211642
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
16221643
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
1644+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
16231645
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
16241646
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
16251647
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
@@ -1681,6 +1703,7 @@ fn fail_uninitialized_request() {
16811703
ExpectedMessage::new(Some(1)).expect_contains("capabilities"),
16821704
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
16831705
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
1706+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("completion"),
16841707
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
16851708
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
16861709
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),

‎tests/tests.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ fn cmd_test_infer_bin() {
4646
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
4747
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Building""#),
4848
ExpectedMessage::new(None).expect_contains("progress").expect_contains("foo"),
49+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("foo"),
4950
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
5051
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
5152
ExpectedMessage::new(None).expect_contains("struct is never used: `UnusedBin`"),
@@ -132,6 +133,8 @@ fn cmd_test_simple_workspace() {
132133
// order of member_lib/member_bin is undefined
133134
ExpectedMessage::new(None).expect_contains("progress").expect_contains("member_"),
134135
ExpectedMessage::new(None).expect_contains("progress").expect_contains("member_"),
136+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("member_"),
137+
ExpectedMessage::new(None).expect_contains("progress").expect_contains("member_"),
135138
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#""done":true"#),
136139
ExpectedMessage::new(None).expect_contains("progress").expect_contains(r#"title":"Indexing""#),
137140
ExpectedMessage::new(None).expect_contains("publishDiagnostics"),

0 commit comments

Comments
 (0)