Skip to content

Commit

Permalink
Minor test cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jpschorr committed Feb 5, 2025
1 parent 6aa05ac commit f8a7900
Show file tree
Hide file tree
Showing 21 changed files with 40 additions and 13 deletions.
3 changes: 2 additions & 1 deletion extension/partiql-extension-ion/resources/test/test.ion
Original file line number Diff line number Diff line change
Expand Up @@ -216,5 +216,6 @@ degrees::'celsius'::100 // You can have multiple annotaions on

{ field: some_annotation::value } // Field's name must precede annotations of its value


bool :: null.int // A very misleading annotation on the integer null
'' :: 1 // An empty annotation

10 changes: 1 addition & 9 deletions extension/partiql-extension-ion/src/boxed_ion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -573,15 +573,7 @@ impl BoxedIon {
} else if let BoxedIonValue::Sequence(seq) = &self.doc {
Element::from(ion_rs::Value::List(seq.clone()))
} else {
todo!()
/*
let mut elts = Vec::new();
for ion in self.try_into_iter()? {
elts.push(ion?.try_into_element()?);
}
Element::from(ion_rs::Value::List(elts.into()))
*/
todo!("try_into_element for &BoxedIon")
};
Ok(elt)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: extension/partiql-extension-ion/tests/test.rs
expression: dump_owned(read())
expression: "dump_owned(read(IonDataFormat::StreamText))"
---
`null`
is_null:true, is_missing:false, is_absent:true, is_present:false, is_sequence:false, is_ordered:false
Expand Down Expand Up @@ -455,3 +455,8 @@ expression: dump_owned(read())
「len:1, is_empty:false」
field: `some_annotation::value`
「is_null:false, is_missing:false, is_absent:false, is_present:true, is_sequence:false, is_ordered:false」
`bool::null.int`
「is_null:true, is_missing:false, is_absent:true, is_present:false, is_sequence:false, is_ordered:false」
NULL
`''::1`
「is_null:false, is_missing:false, is_absent:false, is_present:true, is_sequence:false, is_ordered:false」
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: extension/partiql-extension-ion/tests/test.rs
expression: dump_ref(read())
expression: "dump_ref(read(IonDataFormat::StreamText))"
---
`null`
is_null:true, is_missing:false, is_absent:true, is_present:false, is_sequence:false, is_ordered:false
Expand Down Expand Up @@ -455,3 +455,8 @@ expression: dump_ref(read())
「len:1, is_empty:false」
field: `some_annotation::value`
「is_null:false, is_missing:false, is_absent:false, is_present:true, is_sequence:false, is_ordered:false」
`bool::null.int`
「is_null:true, is_missing:false, is_absent:true, is_present:false, is_sequence:false, is_ordered:false」
NULL
`''::1`
「is_null:false, is_missing:false, is_absent:false, is_present:true, is_sequence:false, is_ordered:false」
Original file line number Diff line number Diff line change
Expand Up @@ -980,3 +980,5 @@ expression: "dump_eq::<true, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -972,3 +972,5 @@ expression: "dump_eq::<true, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -980,3 +980,5 @@ expression: "dump_eq::<true, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -972,3 +972,5 @@ expression: "dump_eq::<true, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -979,3 +979,5 @@ expression: "dump_eq::<true, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -971,3 +971,5 @@ expression: "dump_eq::<true, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -979,3 +979,5 @@ expression: "dump_eq::<true, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -971,3 +971,5 @@ expression: "dump_eq::<true, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`bool::null.int` = `bool::null.int` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,4 @@ expression: "dump_eq::<false, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,4 @@ expression: "dump_eq::<false, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,4 @@ expression: "dump_eq::<false, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,4 @@ expression: "dump_eq::<false, true>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,4 @@ expression: "dump_eq::<false, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,4 @@ expression: "dump_eq::<false, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,4 @@ expression: "dump_eq::<false, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,4 @@ expression: "dump_eq::<false, false>(fmt)"
`degrees::celsius::100` = `degrees::celsius::100` true
`'my.custom.type'::{x: 12, y: -1}` = `'my.custom.type'::{x: 12, y: -1}` true
`{field: some_annotation::value}` = `{field: some_annotation::value}` true
`''::1` = `''::1` true
2 changes: 1 addition & 1 deletion extension/partiql-extension-ion/tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ fn encode_ion_text(value: &Value, encoding: Encoding) -> Result<String, IonEncod
}

#[test]
fn rountrip() {
fn roundtrip() {
let data = read(IonDataFormat::StreamText);
let bag: Bag = data.into_iter().collect();
let val = Value::from(bag);
Expand Down

0 comments on commit f8a7900

Please sign in to comment.