diff options
Diffstat (limited to 'crates/ra_lsp_server/tests')
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/support.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs index f952a03a3..75912afdd 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/support.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs | |||
@@ -94,14 +94,9 @@ impl Server { | |||
94 | let worker = Worker::<RawMessage, RawMessage>::spawn( | 94 | let worker = Worker::<RawMessage, RawMessage>::spawn( |
95 | "test server", | 95 | "test server", |
96 | 128, | 96 | 128, |
97 | move |mut msg_receiver, mut msg_sender| { | 97 | move |msg_receiver, msg_sender| { |
98 | main_loop( | 98 | main_loop(roots, InitializationOptions::default(), &msg_receiver, &msg_sender) |
99 | roots, | 99 | .unwrap() |
100 | InitializationOptions::default(), | ||
101 | &mut msg_receiver, | ||
102 | &mut msg_sender, | ||
103 | ) | ||
104 | .unwrap() | ||
105 | }, | 100 | }, |
106 | ); | 101 | ); |
107 | let res = Server { req_id: Cell::new(1), dir, messages: Default::default(), worker }; | 102 | let res = Server { req_id: Cell::new(1), dir, messages: Default::default(), worker }; |
@@ -141,15 +136,14 @@ impl Server { | |||
141 | R::Params: Serialize, | 136 | R::Params: Serialize, |
142 | { | 137 | { |
143 | let actual = self.send_request::<R>(params); | 138 | let actual = self.send_request::<R>(params); |
144 | match find_mismatch(&expected_resp, &actual) { | 139 | if let Some((expected_part, actual_part)) = find_mismatch(&expected_resp, &actual) { |
145 | Some((expected_part, actual_part)) => panic!( | 140 | panic!( |
146 | "JSON mismatch\nExpected:\n{}\nWas:\n{}\nExpected part:\n{}\nActual part:\n{}\n", | 141 | "JSON mismatch\nExpected:\n{}\nWas:\n{}\nExpected part:\n{}\nActual part:\n{}\n", |
147 | to_string_pretty(&expected_resp).unwrap(), | 142 | to_string_pretty(&expected_resp).unwrap(), |
148 | to_string_pretty(&actual).unwrap(), | 143 | to_string_pretty(&actual).unwrap(), |
149 | to_string_pretty(expected_part).unwrap(), | 144 | to_string_pretty(expected_part).unwrap(), |
150 | to_string_pretty(actual_part).unwrap(), | 145 | to_string_pretty(actual_part).unwrap(), |
151 | ), | 146 | ); |
152 | None => {} | ||
153 | } | 147 | } |
154 | } | 148 | } |
155 | 149 | ||