support for string inputs

commure · May 7, 2019 · a751b89 · a751b89
1 parent 84ad163
commit a751b89
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datatest"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Ivan Dubrov <[email protected]>"]
 edition = "2018"
 repository = "https://github.com/commure/datatest"
@@ -11,7 +11,7 @@ Data-driven tests in Rust
 """
 
 [dependencies]
-datatest-derive = { path = "datatest-derive", version = "0.3.0" }
+datatest-derive = { path = "datatest-derive", version = "0.3.1" }
 regex = "1.0.0"
 walkdir = "2.1.4"
 serde = "1.0.84"

diff --git a/datatest-derive/Cargo.toml b/datatest-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datatest-derive"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Ivan Dubrov <[email protected]>"]
 edition = "2018"
 repository = "https://github.com/commure/datatest"

diff --git a/src/data.rs b/src/data.rs
@@ -115,6 +115,9 @@ fn index_cases(source: &str) -> Vec<Marker> {
             Event::StreamEnd => {
                 break;
             }
+            Event::Scalar(_, _, _, _) if depth == 1 => {
+                index.push(marker);
+            }
             Event::MappingStart(_idx) if depth == 1 => {
                 index.push(marker);
                 depth += 1;

diff --git a/tests/datatest.rs b/tests/datatest.rs
@@ -159,3 +159,12 @@ impl fmt::Display for GreeterTestCaseNamed {
 fn data_test_name_and_line(data: &GreeterTestCaseNamed) {
     assert_eq!(data.expected, format!("Hi, {}!", data.name));
 }
+
+
+/// Can also take string inputs
+#[datatest::data("tests/strings.yaml")]
+#[test]
+fn data_test_string(data: String) {
+    let half = data.len() / 2;
+    assert_eq!(data[0..half], data[half..]);
+}
diff --git a/tests/strings.yaml b/tests/strings.yaml
@@ -0,0 +1,3 @@
+- "firstfirst"
+- "secondsecond"
+- "thirdthird"