Create new on SourceInfo and Pos.

Orange-OpenSource · Nov 27, 2023 · a8e7fe9 · a8e7fe9
1 parent ce245c2
commit a8e7fe9
Show file tree

Hide file tree

Showing 55 changed files with 614 additions and 644 deletions.
diff --git a/packages/hurl/src/output/raw.rs b/packages/hurl/src/output/raw.rs
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-use hurl_core::ast::SourceInfo;
+use hurl_core::ast::{Pos, SourceInfo};
 use hurl_core::error::Error;
 
 use crate::runner::HurlResult;
@@ -54,7 +54,7 @@ pub fn write_body(
                         // FIXME: we convert to a runner::Error to be able to use fixme
                         // method. Can we do otherwise (without creating an artificial
                         // error a first character).
-                        let source_info = SourceInfo::new(0, 0, 0, 0);
+                        let source_info = SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0));
                         let error = runner::Error::new(source_info, e.into(), false);
                         let message = error.fixme();
                         return Err(output::error::Error::new(&message));

diff --git a/packages/hurl/src/report/html/source.rs b/packages/hurl/src/report/html/source.rs
@@ -83,7 +83,7 @@ fn underline_errors(content: &str, errors: &[RunnerError]) -> String {
 
 #[cfg(test)]
 mod tests {
-    use hurl_core::ast::SourceInfo;
+    use hurl_core::ast::{Pos, SourceInfo};
 
     use super::*;
     use crate::runner::RunnerError::QueryHeaderNotFound;
@@ -137,7 +137,7 @@ mod tests {
         </pre>"#;
 
         let errors = vec![RunnerError {
-            source_info: SourceInfo::new(2, 1, 2, 4),
+            source_info: SourceInfo::new(Pos::new(2, 1), Pos::new(2, 4)),
             inner: QueryHeaderNotFound,
             assert: true,
         }];

diff --git a/packages/hurl/src/report/junit/mod.rs b/packages/hurl/src/report/junit/mod.rs
@@ -128,7 +128,7 @@ fn create_testsuite(testcases: &[Testcase]) -> Element {
 
 #[cfg(test)]
 mod tests {
-    use hurl_core::ast::SourceInfo;
+    use hurl_core::ast::{Pos, SourceInfo};
 
     use crate::report::junit::xml::XmlDocument;
     use crate::report::junit::{create_testsuite, Testcase};
@@ -157,7 +157,7 @@ mod tests {
                 captures: vec![],
                 asserts: vec![],
                 errors: vec![Error::new(
-                    SourceInfo::new(2, 10, 2, 13),
+                    SourceInfo::new(Pos::new(2, 10), Pos::new(2, 13)),
                     RunnerError::AssertStatus {
                         actual: "404".to_string(),
                     },
@@ -181,7 +181,7 @@ mod tests {
                 captures: vec![],
                 asserts: vec![],
                 errors: vec![Error::new(
-                    SourceInfo::new(1, 5, 1, 19),
+                    SourceInfo::new(Pos::new(1, 5), Pos::new(1, 19)),
                     RunnerError::HttpConnection("(6) Could not resolve host: unknown".to_string()),
                     false,
                 )],

diff --git a/packages/hurl/src/report/junit/testcase.rs b/packages/hurl/src/report/junit/testcase.rs
@@ -84,7 +84,7 @@ impl Testcase {
 
 #[cfg(test)]
 mod test {
-    use hurl_core::ast::SourceInfo;
+    use hurl_core::ast::{Pos, SourceInfo};
 
     use crate::report::junit::testcase::Testcase;
     use crate::report::junit::xml::XmlDocument;
@@ -123,7 +123,7 @@ HTTP/1.0 200
                 captures: vec![],
                 asserts: vec![],
                 errors: vec![Error::new(
-                    SourceInfo::new(2, 10, 2, 13),
+                    SourceInfo::new(Pos::new(2, 10), Pos::new(2, 13)),
                     RunnerError::AssertStatus {
                         actual: "404".to_string(),
                     },
@@ -162,7 +162,7 @@ HTTP/1.0 200
                 captures: vec![],
                 asserts: vec![],
                 errors: vec![Error::new(
-                    SourceInfo::new(1, 5, 1, 19),
+                    SourceInfo::new(Pos::new(1, 5), Pos::new(1, 19)),
                     RunnerError::HttpConnection("(6) Could not resolve host: unknown".to_string()),
                     false,
                 )],

diff --git a/packages/hurl/src/runner/assert.rs b/packages/hurl/src/runner/assert.rs
@@ -175,13 +175,13 @@ pub mod tests {
     pub fn assert_count_user() -> Assert {
         let whitespace = Whitespace {
             value: String::from(" "),
-            source_info: SourceInfo::new(1, 1, 1, 1),
+            source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 1)),
         };
         let predicate = Predicate {
             not: false,
             space0: whitespace.clone(),
             predicate_func: PredicateFunc {
-                source_info: SourceInfo::new(1, 22, 1, 24),
+                source_info: SourceInfo::new(Pos::new(1, 22), Pos::new(1, 24)),
                 value: PredicateFuncValue::Equal {
                     space0: whitespace.clone(),
                     value: PredicateValue::Number(hurl_core::ast::Number::Integer(3)),
@@ -196,7 +196,7 @@ pub mod tests {
             filters: vec![(
                 whitespace.clone(),
                 Filter {
-                    source_info: SourceInfo::new(1, 16, 1, 21),
+                    source_info: SourceInfo::new(Pos::new(1, 16), Pos::new(1, 21)),
                     value: FilterValue::Count,
                 },
             )],
@@ -224,7 +224,7 @@ pub mod tests {
             ),
             AssertResult::Explicit {
                 actual: Ok(Some(Value::Number(Number::Integer(3)))),
-                source_info: SourceInfo::new(1, 22, 1, 24),
+                source_info: SourceInfo::new(Pos::new(1, 22), Pos::new(1, 24)),
                 predicate_result: Some(Ok(())),
             }
         );

diff --git a/packages/hurl/src/runner/body.rs b/packages/hurl/src/runner/body.rs
@@ -95,14 +95,14 @@ mod tests {
         // file, data.bin;
         let whitespace = Whitespace {
             value: String::from(" "),
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
         };
 
         let bytes = Bytes::File(File {
             space0: whitespace.clone(),
             filename: Filename {
                 value: String::from("tests/data.bin"),
-                source_info: SourceInfo::new(1, 7, 1, 15),
+                source_info: SourceInfo::new(Pos::new(1, 7), Pos::new(1, 15)),
             },
             space1: whitespace,
         });
@@ -122,14 +122,14 @@ mod tests {
         // file, data.bin;
         let whitespace = Whitespace {
             value: String::from(" "),
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
         };
 
         let bytes = Bytes::File(File {
             space0: whitespace.clone(),
             filename: Filename {
                 value: String::from("data.bin"),
-                source_info: SourceInfo::new(1, 7, 1, 15),
+                source_info: SourceInfo::new(Pos::new(1, 7), Pos::new(1, 15)),
             },
             space1: whitespace,
         });
@@ -146,6 +146,9 @@ mod tests {
                 value: "data.bin".to_string()
             }
         );
-        assert_eq!(error.source_info, SourceInfo::new(1, 7, 1, 15));
+        assert_eq!(
+            error.source_info,
+            SourceInfo::new(Pos::new(1, 7), Pos::new(1, 15))
+        );
     }
 }
diff --git a/packages/hurl/src/runner/capture.rs b/packages/hurl/src/runner/capture.rs
@@ -77,7 +77,7 @@ pub mod tests {
         // non scalar value
         let whitespace = Whitespace {
             value: String::new(),
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
         };
         Capture {
             line_terminators: vec![],
@@ -88,7 +88,7 @@ pub mod tests {
                     value: "UserCount".to_string(),
                     encoded: "UserCount".to_string(),
                 }],
-                source_info: SourceInfo::new(0, 0, 0, 0),
+                source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
             },
             space1: whitespace.clone(),
             space2: whitespace.clone(),
@@ -108,7 +108,7 @@ pub mod tests {
         // non scalar value
         let whitespace = Whitespace {
             value: String::new(),
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
         };
         Capture {
             line_terminators: vec![],
@@ -119,7 +119,7 @@ pub mod tests {
                     value: "duration".to_string(),
                     encoded: "duration".to_string(),
                 }],
-                source_info: SourceInfo::new(0, 0, 0, 0),
+                source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
             },
             space1: whitespace.clone(),
             space2: whitespace.clone(),
@@ -140,7 +140,7 @@ pub mod tests {
         let variables = HashMap::new();
         let whitespace = Whitespace {
             value: String::new(),
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
         };
         let capture = Capture {
             line_terminators: vec![],
@@ -151,7 +151,7 @@ pub mod tests {
                     value: "count".to_string(),
                     encoded: "count".to_string(),
                 }],
-                source_info: SourceInfo::new(0, 0, 0, 0),
+                source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
             },
             filters: vec![],
             space1: whitespace.clone(),
@@ -177,7 +177,7 @@ pub mod tests {
         // non scalar value
         let whitespace = Whitespace {
             value: String::new(),
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
         };
         let _capture = Capture {
             line_terminators: vec![],
@@ -188,14 +188,14 @@ pub mod tests {
                     value: "???".to_string(),
                     encoded: "???".to_string(),
                 }],
-                source_info: SourceInfo::new(0, 0, 0, 0),
+                source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
             },
             space1: whitespace.clone(),
             space2: whitespace.clone(),
 
             // xpath //user
             query: Query {
-                source_info: SourceInfo::new(1, 1, 1, 13),
+                source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 13)),
                 value: QueryValue::Xpath {
                     space0: whitespace.clone(),
                     expr: Template {
@@ -204,7 +204,7 @@ pub mod tests {
                             value: "//user".to_string(),
                             encoded: "//user".to_string(),
                         }],
-                        source_info: SourceInfo::new(1, 7, 1, 13),
+                        source_info: SourceInfo::new(Pos::new(1, 7), Pos::new(1, 13)),
                     },
                 },
             },

diff --git a/packages/hurl/src/runner/filter/count.rs b/packages/hurl/src/runner/filter/count.rs
@@ -39,7 +39,7 @@ pub fn eval_count(
 #[cfg(test)]
 pub mod tests {
     use crate::runner::filter::eval::eval_filter;
-    use hurl_core::ast::{Filter, FilterValue, SourceInfo};
+    use hurl_core::ast::{Filter, FilterValue, Pos, SourceInfo};
     use std::collections::HashMap;
 
     use super::*;
@@ -49,7 +49,7 @@ pub mod tests {
         let variables = HashMap::new();
 
         let filter = Filter {
-            source_info: SourceInfo::new(1, 1, 1, 6),
+            source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 6)),
             value: FilterValue::Count,
         };
         assert_eq!(
@@ -71,7 +71,10 @@ pub mod tests {
         let error = eval_filter(&filter, &Value::Bool(true), &variables, false)
             .err()
             .unwrap();
-        assert_eq!(error.source_info, SourceInfo::new(1, 1, 1, 6));
+        assert_eq!(
+            error.source_info,
+            SourceInfo::new(Pos::new(1, 1), Pos::new(1, 6))
+        );
         assert_eq!(
             error.inner,
             RunnerError::FilterInvalidInput("boolean".to_string())

diff --git a/packages/hurl/src/runner/filter/days_after_now.rs b/packages/hurl/src/runner/filter/days_after_now.rs
@@ -44,7 +44,7 @@ pub mod tests {
     use crate::runner::filter::eval::eval_filter;
     use chrono::offset::Utc;
     use chrono::Duration;
-    use hurl_core::ast::{Filter, FilterValue, SourceInfo};
+    use hurl_core::ast::{Filter, FilterValue, Pos, SourceInfo};
     use std::collections::HashMap;
 
     use super::*;
@@ -57,7 +57,7 @@ pub mod tests {
         assert_eq!(
             eval_filter(
                 &Filter {
-                    source_info: SourceInfo::new(1, 1, 1, 1),
+                    source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 1)),
                     value: FilterValue::DaysAfterNow,
                 },
                 &Value::Date(now),
@@ -73,7 +73,7 @@ pub mod tests {
         assert_eq!(
             eval_filter(
                 &Filter {
-                    source_info: SourceInfo::new(1, 1, 1, 1),
+                    source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 1)),
                     value: FilterValue::DaysAfterNow,
                 },
                 &Value::Date(now_plus_30hours),
@@ -87,7 +87,7 @@ pub mod tests {
         assert_eq!(
             eval_filter(
                 &Filter {
-                    source_info: SourceInfo::new(1, 1, 1, 1),
+                    source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 1)),
                     value: FilterValue::DaysBeforeNow,
                 },
                 &Value::Date(now_plus_30hours),

diff --git a/packages/hurl/src/runner/filter/decode.rs b/packages/hurl/src/runner/filter/decode.rs
@@ -58,15 +58,15 @@ pub fn eval_decode(
 #[cfg(test)]
 pub mod tests {
     use crate::runner::filter::eval::eval_filter;
-    use hurl_core::ast::{Filter, FilterValue, SourceInfo};
+    use hurl_core::ast::{Filter, FilterValue, Pos, SourceInfo};
 
     use super::*;
 
     #[test]
     pub fn eval_filter_url_decode() {
         let variables = HashMap::new();
         let filter = Filter {
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
             value: FilterValue::UrlDecode,
         };
         assert_eq!(

diff --git a/packages/hurl/src/runner/filter/eval.rs b/packages/hurl/src/runner/filter/eval.rs
@@ -119,7 +119,7 @@ pub fn eval_filter(
 pub mod tests {
     use crate::runner::filter::eval::eval_filters;
     use crate::runner::{Number, Value};
-    use hurl_core::ast::{Filter, FilterValue, SourceInfo};
+    use hurl_core::ast::{Filter, FilterValue, Pos, SourceInfo};
     use std::collections::HashMap;
 
     #[test]
@@ -129,7 +129,7 @@ pub mod tests {
         assert_eq!(
             eval_filters(
                 &vec![Filter {
-                    source_info: SourceInfo::new(1, 1, 1, 6),
+                    source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 6)),
                     value: FilterValue::Count,
                 }],
                 &Value::List(vec![

diff --git a/packages/hurl/src/runner/filter/format.rs b/packages/hurl/src/runner/filter/format.rs
@@ -46,15 +46,15 @@ pub fn eval_format(
 #[cfg(test)]
 pub mod tests {
     use crate::runner::filter::eval::eval_filter;
-    use hurl_core::ast::{Filter, FilterValue, SourceInfo};
+    use hurl_core::ast::{Filter, FilterValue, Pos, SourceInfo};
 
     use super::*;
 
     #[test]
     pub fn eval_filter_url_decode() {
         let variables = HashMap::new();
         let filter = Filter {
-            source_info: SourceInfo::new(0, 0, 0, 0),
+            source_info: SourceInfo::new(Pos::new(0, 0), Pos::new(0, 0)),
             value: FilterValue::UrlDecode,
         };
         assert_eq!(

diff --git a/packages/hurl/src/runner/filter/html_escape.rs b/packages/hurl/src/runner/filter/html_escape.rs
@@ -42,14 +42,14 @@ pub fn eval_html_escape(
 pub mod tests {
     use crate::runner::filter::eval::eval_filter;
     use crate::runner::Value;
-    use hurl_core::ast::{Filter, FilterValue, SourceInfo};
+    use hurl_core::ast::{Filter, FilterValue, Pos, SourceInfo};
     use std::collections::HashMap;
 
     #[test]
     pub fn eval_filter_html_escape() {
         let variables = HashMap::new();
         let filter = Filter {
-            source_info: SourceInfo::new(1, 1, 1, 1),
+            source_info: SourceInfo::new(Pos::new(1, 1), Pos::new(1, 1)),
             value: FilterValue::HtmlEscape,
         };