1 files changed, 86 insertions, 12 deletions
diff --git a/subplot/data.yaml b/subplot/data.yaml
index 7659319..533237f 100644
--- a/subplot/data.yaml
+++ b/subplot/data.yaml
@@ -1,25 +1,99 @@
-- given: >
-    a file (?P<filename>\\S+) containing "(?P<data>.*)"
-  regex: true
-  function: create_file_with_given_data
+- given: a file {filename} containing "{data:text}"
+  impl:
+    python:
+      function: create_file_with_given_data
 
 - given: "a file {filename} containing some random data"
-  function: create_file_with_random_data
+  impl:
+    python:
+      function: create_file_with_random_data
+
+- given: "a Unix socket {filename}"
+  impl:
+    python:
+      function: create_unix_socket
+
+- given: "a named pipe {filename}"
+  impl:
+    python:
+      function: create_fifo
+
+- given: a cache directory tag in {dirpath}
+  impl:
+    python:
+      function: create_cachedir_tag_in
 
 - given: "a file in {dirname} with a non-UTF8 filename"
-  function: create_nonutf8_filename
+  impl:
+    python:
+      function: create_nonutf8_filename
 
 - given: file {filename} has mode {mode}
-  function: chmod_file
+  impl:
+    python:
+      function: chmod_file
 
 - given: symbolink link {linkname} that points at {target}
-  function: create_symlink
+  impl:
+    python:
+      function: create_symlink
 
 - given: a manifest of the directory {dirname} in {manifest}
-  function: create_manifest_of_live
+  impl:
+    python:
+      function: create_manifest_of_live
 
 - given: a manifest of the directory {dirname} restored in {restored} in {manifest}
-  function: create_manifest_of_restored
+  impl:
+    python:
+      function: create_manifest_of_restored
+
+- given: "JSON file {json_name} converted from YAML file {yaml_name}"
+  impl:
+    python:
+      function: convert_yaml_to_json
+
+- then: "stdout, as JSON, exactly matches file {filename}"
+  impl:
+    python:
+      function: match_stdout_to_json_file_exactly
+
+- then: "stdout, as JSON, has all the values in file {filename}"
+  impl:
+    python:
+      function: match_stdout_to_json_file_superset
+
+- then: "file {filename} is restored to {restored}"
+  impl:
+    python:
+      function: file_is_restored
+
+- then: "file {filename} is not restored to {restored}"
+  impl:
+    python:
+      function: file_is_not_restored
+
+- then: "manifests {expected} and {actual} match"
+  impl:
+    python:
+      function: manifests_match
+
+- then: "file {filename} is only readable by owner"
+  impl:
+    python:
+      function: file_is_readable_by_owner
+
+- then: "file {filename} does not contain \"{pattern:text}\""
+  impl:
+    python:
+      function: file_does_not_contain
+
+- then: "files {filename1} and {filename2} are different"
+  impl:
+    python:
+      function: files_are_different
 
-- then: files {first} and {second} match
-  function: files_match
+- then: "files {filename1} and {filename2} are identical"
+  impl:
+    python:
+      function: files_are_identical