fix tests

uutils · Jan 12, 2024 · 72334c1 · 72334c1
1 parent a4a3ba1
commit 72334c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/uu/env/src/split_iterator.rs b/src/uu/env/src/split_iterator.rs
@@ -193,6 +193,12 @@ impl<'a> SplitIterator<'a> {
 
         let pos_end = self.raw_parser.get_look_at_pos();
 
+        if pos_end == pos_start {
+            return Err(ParseError::ParsingOfVariableNameFailed {
+                pos: pos_start,
+                msg: "Missing variable name".into() });
+        }
+
         Ok(self.raw_parser.get_substring(&Range {
             start: pos_start,
             end: pos_end,

diff --git a/tests/by-util/test_env.rs b/tests/by-util/test_env.rs
@@ -697,7 +697,6 @@ mod tests_split_iterator {
             (r#""""#, &[""]),
             (r#""""""#, &[""]),
             (r#""a b c' d""#, &["a b c' d"]),
-            (r#""$""#, &["$"]),
             (r#""\$""#, &["$"]),
             (r#""`""#, &["`"]),
             (r#""\"""#, &["\""]),
@@ -767,6 +766,10 @@ mod tests_split_iterator {
             split("'\\"),
             Err(ParseError::MissingClosingQuote { pos: 2, c: '\'' })
         );
+        assert_eq!(
+            split(r#""$""#),
+            Err(ParseError::ParsingOfVariableNameFailed { pos: 2, msg: "Missing variable name".into() }),
+        );
     }
 
     #[test]
@@ -929,35 +932,29 @@ mod test_raw_string_parser {
     }
 
     #[test]
-    fn test_multi_byte_codes_skip_one_only_allowed_for_ascii_chars_skip_until_char_skip_until_end()
+    fn test_multi_byte_codes_skip_one_take_one_skip_until_ascii_char_or_end()
     {
         let input = "🦉🦉🦉x🦉🦉x🦉x🦉🦉🦉🦉";
         let mut uut = env::raw_string_parser::RawStringParser::new(input);
 
-        uut.skip_one().unwrap_err();
-        assert_eq!(uut.get_look_at_pos(), 0);
-        uut.take_one().unwrap(); // take 🦉🦉🦉
+        uut.skip_one().unwrap(); // skip 🦉🦉🦉
         assert_eq!(uut.get_look_at_pos(), 12);
 
         uut.skip_one().unwrap(); // skip x
         assert_eq!(uut.get_look_at_pos(), 13);
-        uut.skip_one().unwrap_err();
-        assert_eq!(uut.get_look_at_pos(), 13);
         uut.take_one().unwrap(); // take 🦉🦉
         assert_eq!(uut.get_look_at_pos(), 21);
 
         uut.skip_one().unwrap(); // skip x
         assert_eq!(uut.get_look_at_pos(), 22);
-        uut.skip_one().unwrap_err();
-        assert_eq!(uut.get_look_at_pos(), 22);
         uut.skip_until_ascii_char_or_end(b'x').unwrap(); // skip 🦉
         assert_eq!(uut.get_look_at_pos(), 26);
         uut.take_one().unwrap(); // take x
         uut.skip_until_ascii_char_or_end(b'x').unwrap(); // skip 🦉🦉🦉🦉 till end
         assert_eq!(uut.get_look_at_pos(), 43);
 
         uut.take_one().unwrap_err();
-        assert_eq!(uut.take_collected_output().unwrap(), "🦉🦉🦉🦉🦉x");
+        assert_eq!(uut.take_collected_output().unwrap(), "🦉🦉x");
     }
 
     #[test]