Skip to content

Commit 089063a

Browse files
mmahroussfda-odoo
authored andcommitted
[FIX] fix test_get_symbol line numbers
1 parent 4cabb30 commit 089063a

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

server/tests/test_get_symbol.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn test_hover_on_model_field_and_method() {
7171
);
7272

7373
// Hover on the method "get_test_int"
74-
let hover_method = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 12, 8).unwrap_or_default();
74+
let hover_method = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 14, 8).unwrap_or_default();
7575
assert!(
7676
hover_method.contains("get_test_int"),
7777
"Hover on method should show method name"
@@ -83,67 +83,67 @@ fn test_hover_on_model_field_and_method() {
8383
);
8484

8585
// Hover on a reference to a constant (CONSTANT_1)
86-
let hover_const = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 17, 23).unwrap_or_default();
86+
let hover_const = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 19, 23).unwrap_or_default();
8787
assert!(
8888
hover_const.contains("CONSTANT_1: int"),
8989
"Hover on constant should show constant name amd type int"
9090
);
9191

9292
// Hover on onchange decorator
93-
let hover_onchange = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 23, 22).unwrap_or_default();
93+
let hover_onchange = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 25, 22).unwrap_or_default();
9494
assert!(
9595
hover_onchange.contains("test_int: int"),
9696
"Hover on field_name in onchange should show field name and field type"
9797
);
9898

9999
// Hover on depends decorator, on different sections
100-
let hover_partner_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 27, 22).unwrap_or_default();
100+
let hover_partner_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 29, 22).unwrap_or_default();
101101
assert!(
102102
hover_partner_id.contains(&format!("partner_id: {}", partner_class_name)),
103103
"Hover on field_name in depends should show field name and field type"
104104
);
105-
let hover_country_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 27, 35).unwrap_or_default();
105+
let hover_country_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 29, 35).unwrap_or_default();
106106
assert!(
107107
hover_country_id.contains(&format!("country_id: {}", country_class_name)),
108108
"Hover on field_name in depends should show field name and field type"
109109
);
110-
let hover_code = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 27, 43).unwrap_or_default();
110+
let hover_code = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 29, 43).unwrap_or_default();
111111
assert!(
112112
hover_code.contains("code: str"),
113113
"Hover on field_name in depends should show field name and field type"
114114
);
115115

116116
//Hover on self.env with res.partner and test model name
117-
let hover_partner = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 29, 24).unwrap_or_default();
117+
let hover_partner = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 31, 24).unwrap_or_default();
118118
assert!(
119119
hover_partner.contains("Partner"),
120120
"Hover on self.env[\"res.partner\"] should show Partner model name"
121121
);
122-
let hover_test_class = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 30, 24).unwrap_or_default();
122+
let hover_test_class = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 32, 24).unwrap_or_default();
123123
assert!(
124124
hover_test_class.contains("BaseTestModel"),
125125
"Hover on self.env[\"pygls.tests.base_test_model\"] should show Partner model name"
126126
);
127127

128128
// Hover on domains, on different sections
129-
let hover_partner_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 31, 25).unwrap_or_default();
129+
let hover_partner_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 33, 25).unwrap_or_default();
130130
assert!(
131131
hover_partner_id.contains(&format!("partner_id: {}", partner_class_name)),
132132
"Hover on field_name in search domain should show field name and field type"
133133
);
134-
let hover_country_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 31, 39).unwrap_or_default();
134+
let hover_country_id = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 33, 39).unwrap_or_default();
135135
assert!(
136136
hover_country_id.contains(&format!("country_id: {}", country_class_name)),
137137
"Hover on field_name in search domain should show field name and field type"
138138
);
139-
let hover_code = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 31, 48).unwrap_or_default();
139+
let hover_code = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 33, 48).unwrap_or_default();
140140
assert!(
141141
hover_code.contains("code: str"),
142142
"Hover on field_name in search domain should show field name and field type"
143143
);
144144

145145
// Hover on a variable assignment (baseInstance1)
146-
let hover_var = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 33, 0).unwrap_or_default();
146+
let hover_var = test_utils::get_hover_markdown(&mut session, &file_symbol, &file_info, 35, 0).unwrap_or_default();
147147
assert!(
148148
hover_var.contains("BaseTestModel"),
149149
"Hover on variable should show type info"
@@ -200,13 +200,13 @@ fn test_definition() {
200200
assert_eq!(file_mgr.borrow().text_range_to_range(&mut session, &module1_test_file, sym_compute_something[0].borrow().range()), compute_arg_locs[0].target_range, "Expected _compute_something to be at the same location as the compute argument");
201201

202202
// Test definition for model class BaseTestModel compute something in module_2, first on the super call
203-
let compute_arg_locs = test_utils::get_definition_locs(&mut session, &m2_tf_file_symbol, &m2_tf_file_info, 6, 36);
203+
let compute_arg_locs = test_utils::get_definition_locs(&mut session, &m2_tf_file_symbol, &m2_tf_file_info, 10, 36);
204204
assert_eq!(compute_arg_locs.len(), 1, "Expected 1 location for compute method '_compute_something'");
205205
assert_eq!(compute_arg_locs[0].target_uri.to_file_path().unwrap().sanitize(), module1_test_file, "Expected location to be in module_1 file");
206206
assert_eq!(file_mgr.borrow().text_range_to_range(&mut session, &module1_test_file, sym_compute_something[0].borrow().range()), compute_arg_locs[0].target_range, "Expected _compute_something to be at the same location as the compute argument");
207207

208208
// Then on the compute keyword argument in module_2, it should point to both methods in module_1 and module_2
209-
let compute_kwarg_locs = test_utils::get_definition_locs(&mut session, &m2_tf_file_symbol, &m2_tf_file_info, 3, 50);
209+
let compute_kwarg_locs = test_utils::get_definition_locs(&mut session, &m2_tf_file_symbol, &m2_tf_file_info, 6, 50);
210210
assert_eq!(compute_kwarg_locs.len(), 2, "Expected 2 locations for compute method '_compute_something'");
211211
assert!(compute_kwarg_locs.iter().any(|loc| loc.target_uri.to_file_path().unwrap().sanitize() == module1_test_file), "Expected one location to be in module_1 file");
212212
assert!(compute_kwarg_locs.iter().any(|loc| loc.target_uri.to_file_path().unwrap().sanitize() == module2_test_file), "Expected one location to be in module_2 file");
@@ -218,7 +218,7 @@ fn test_definition() {
218218
assert!(compute_kwarg_locs.iter().any(|loc| file_mgr.borrow().text_range_to_range(&mut session, &module2_test_file, sym_compute_something_m2[0].borrow().range()) == loc.target_range), "Expected _compute_something to be at the same location as the compute keyword argument in module_2");
219219

220220
// Now test go to def of `partner_id.country_id.phone_code` on each field.
221-
let partner_id_locs = test_utils::get_definition_locs(&mut session, &m1_tf_file_symbol, &m1_tf_file_info, 31, 25);
221+
let partner_id_locs = test_utils::get_definition_locs(&mut session, &m1_tf_file_symbol, &m1_tf_file_info, 33, 25);
222222
assert_eq!(partner_id_locs.len(), 1, "Expected 1 location for partner_id");
223223
assert_eq!(partner_id_locs[0].target_uri.to_file_path().unwrap().sanitize(), module1_test_file, "Expected location to be in the same file");
224224
let sym_partner_id = m1_tf_file_symbol.borrow().get_symbol(&(vec![], vec![Sy!("BaseTestModel"), Sy!("partner_id")]), u32::MAX);

0 commit comments

Comments
 (0)