From 122d766a608f7b113c5a7027d0cef159dd0835b4 Mon Sep 17 00:00:00 2001
From: Yohei Tamura <tamuhey@gmail.com>
Date: Fri, 2 Apr 2021 00:46:54 +0900
Subject: [PATCH] update tokenizations version

---
 Cargo.toml |  9 +++++----
 src/lib.rs | 48 +++++++++++++++++++++++-------------------------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 029fb7f..83f628e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,9 +15,10 @@ documentation = "https://docs.rs/textspan"
 
 [dependencies]
 
-tokenizations = "0.4.1" 
+tokenizations = "0.4.2" 
 
 [dev-dependencies]
-quickcheck = "0.9"           
-quickcheck_macros = "0.9"  
-proptest = "0.10" 
+quickcheck = "1.0"           
+quickcheck_macros = "1.0"  
+proptest = "1.0" 
+rstest = "0.7.0"
diff --git a/src/lib.rs b/src/lib.rs
index ba43364..b62b989 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -298,6 +298,7 @@ mod tests {
     use proptest::collection as pc;
     use proptest::prelude::*;
     use proptest::strategy::Strategy;
+    use rstest::*;
     #[quickcheck]
     fn test_lift_spans_index(spans: Vec<Span>, target_spans: Vec<Span>) {
         let sanitize = |spans: Vec<Span>| {
@@ -478,46 +479,43 @@ mod tests {
         spans == output
     }
 
-    #[test]
-    fn get_original_spans_handmade() {
-        let testcases = vec![
-            (
+    #[rstest(input, expected,
+            case(
                 (vec!["fあo①が", "bar"], "fあo1かbar"),
-                (vec![vec![(0, 5)], vec![(5, 8)]]),
+                vec![vec![(0, 5)], vec![(5, 8)]],
             ),
-            ((vec!["New York"], "NewYork"), (vec![vec![(0, 7)]])),
-            (
+            case((vec!["New York"], "NewYork"), vec![vec![(0, 7)]]),
+            case(
                 (vec!["A'B", "", ""], "A B"),
-                (vec![vec![(0, 1), (2, 3)], vec![], vec![]]),
+                vec![vec![(0, 1), (2, 3)], vec![], vec![]],
             ),
-            (
+            case(
                 (vec!["A'b", ""], "a b"),
-                (vec![vec![(0, 1), (2, 3)], vec![]]),
+                vec![vec![(0, 1), (2, 3)], vec![]],
             ),
-            ((vec!["", "", ""], ""), (vec![vec![], vec![], vec![]])),
-            (
+            case((vec!["", "", ""], ""), vec![vec![], vec![], vec![]]),
+            case(
                 (vec!["hello", "``world``"], "Hello \"world\""),
                 vec![vec![(0, 5)], vec![(7, 12)]],
             ),
-            (
+            case(
                 (vec!["à", " ", "", "la", "gorge", ""], "a     lagorge"),
-                (vec![
+                vec![
                     vec![(0, 1)],
-                    vec![(1, 2)],
+                    vec![(5, 6)],
                     vec![],
                     vec![(6, 8)],
                     vec![(8, 13)],
                     vec![],
-                ]),
+                ],
             ),
-        ];
-        for (input, expected) in testcases.into_iter() {
-            assert_eq!(
-                get_original_spans(&input.0, input.1),
-                expected,
-                "{:?}",
-                input
-            );
-        }
+             )]
+    fn hm_get_original_spans(input: (Vec<&str>, &str), expected: Vec<Vec<(usize, usize)>>) {
+        assert_eq!(
+            get_original_spans(&input.0, input.1),
+            expected,
+            "{:?}",
+            input
+        );
     }
 }