Simplify initialization with params

rust-lang · Feb 24, 2019 · 5c08df5 · 5c08df5
1 parent 0fefebc
commit 5c08df5
Showing 1 changed file with 3 additions and 33 deletions.
diff --git a/tests/client.rs b/tests/client.rs
@@ -1319,7 +1319,7 @@ fn client_init_duplicated_and_unknown_settings() {
     let root_path = p.root();
     let mut rls = p.spawn_rls_async();
 
-    let init_options = json!({
+    let opts = json!({
         "settings": {
             "rust": {
                 "features": ["some_feature"],
@@ -1335,22 +1335,7 @@ fn client_init_duplicated_and_unknown_settings() {
         }
     });
 
-    rls.request::<Initialize>(
-        0,
-        lsp_types::InitializeParams {
-            process_id: None,
-            root_uri: None,
-            root_path: Some(root_path.display().to_string()),
-            initialization_options: Some(init_options),
-            capabilities: lsp_types::ClientCapabilities {
-                workspace: None,
-                text_document: None,
-                experimental: None,
-            },
-            trace: None,
-            workspace_folders: None,
-        },
-    );
+    rls.request::<Initialize>(0, initialize_params_with_opts(root_path, opts));
 
     assert!(rls.messages().iter().any(is_notification_for_unknown_config));
     assert!(rls.messages().iter().any(is_notification_for_duplicated_config));
@@ -1374,22 +1359,7 @@ fn client_did_change_configuration_duplicated_and_unknown_settings() {
     let root_path = p.root();
     let mut rls = p.spawn_rls_async();
 
-    rls.request::<Initialize>(
-        0,
-        lsp_types::InitializeParams {
-            process_id: None,
-            root_uri: None,
-            root_path: Some(root_path.display().to_string()),
-            initialization_options: None,
-            capabilities: lsp_types::ClientCapabilities {
-                workspace: None,
-                text_document: None,
-                experimental: None,
-            },
-            trace: None,
-            workspace_folders: None,
-        },
-    );
+    rls.request::<Initialize>(0, initialize_params(root_path));
 
     assert!(!rls.messages().iter().any(is_notification_for_unknown_config));
     assert!(!rls.messages().iter().any(is_notification_for_duplicated_config));