From ad4169d81ebb40e29e44d42d840c80dd1a198afa Mon Sep 17 00:00:00 2001
From: Vaughn Kottler <vaughnkottler@gmail.com>
Date: Thu, 5 Oct 2023 18:49:31 -0500
Subject: [PATCH] Unit-test output changes

---
 tests/data/valid/datazen-out-test/a.yaml      |  97 +++++++++++-----
 tests/data/valid/datazen-out-test/c.yaml      |  28 ++++-
 tests/data/valid/datazen-out-test/child.html  |   2 +-
 .../data/valid/datazen-out-test/comp1-a.yaml  |  99 ++++++++++++-----
 .../data/valid/datazen-out-test/comp2-c.yaml  |  93 +++++++++++-----
 .../data/valid/datazen-out-test/comp2-e.yaml  |  93 +++++++++++-----
 .../data/valid/datazen-out-test/comp3-a.yaml  | 104 +++++++++++++-----
 tests/data/valid/datazen-out-test/comp4.yaml  |   5 +-
 tests/data/valid/datazen-out-test/e.yaml      |   5 +-
 tests/data/valid/datazen-out-test/test.md     |   2 +-
 10 files changed, 386 insertions(+), 142 deletions(-)

diff --git a/tests/data/valid/datazen-out-test/a.yaml b/tests/data/valid/datazen-out-test/a.yaml
index 54b4a39..6e4b61c 100644
--- a/tests/data/valid/datazen-out-test/a.yaml
+++ b/tests/data/valid/datazen-out-test/a.yaml
@@ -1,32 +1,77 @@
-a: {a: a, b: b, c: c}
-b: {a: a, b: b, c: c}
+---
+json: json
+yaml: yaml
+top_list:
+  - d
+  - e
+  - f
+  - a
+  - b
+  - c
+top_dict:
+  b:
+    b: b
+  a:
+    a: a
 bad: 5
-c: {a: a, b: b, c: c}
-custom:
-  a: [test1, test2]
-  b: [test1, test2]
-  c: [test1, test2]
-  nested:
-    a: {a: a, b: b, c: c}
-    b: {a: a, b: b, c: c}
-    c: {a: a, b: b, c: c}
-    custom:
-      a: [test1, test2]
-      b: [test1, test2]
-      c: [test1, test2]
-d: {d: d}
-e: {e: e}
+b:
+  a: a
+  b: b
+  c: c
+c:
+  a: a
+  b: b
+  c: c
+d:
+  d: d
+e:
+  e: e
+f:
+  f: f
+a:
+  a: a
+  b: b
+  c: c
 empty:
   a:
-    a: {a: a}
-f: {f: f}
-json: json
+    a:
+      a: a
 json2: json
-top_dict:
-  a: {a: a}
-  b: {b: b}
-top_list: [d, e, f, a, b, c]
-yaml: yaml
 yaml2: yaml
+custom:
+  a:
+    - test1
+    - test2
+  b:
+    - test1
+    - test2
+  c:
+    - test1
+    - test2
+  nested:
+    a:
+      a: a
+      b: b
+      c: c
+    b:
+      a: a
+      b: b
+      c: c
+    c:
+      a: a
+      b: b
+      c: c
+    custom:
+      a:
+        - test1
+        - test2
+      b:
+        - test1
+        - test2
+      c:
+        - test1
+        - test2
 yaml3: yaml
-yaml3_dict: {a: a, b: b}
+yaml3_dict:
+  a: a
+  b: b
diff --git a/tests/data/valid/datazen-out-test/c.yaml b/tests/data/valid/datazen-out-test/c.yaml
index 6c1a55f..b6b41bf 100644
--- a/tests/data/valid/datazen-out-test/c.yaml
+++ b/tests/data/valid/datazen-out-test/c.yaml
@@ -1,7 +1,23 @@
-a: {a: a, b: b, c: c}
-b: {a: a, b: b, c: c}
-c: {a: a, b: b, c: c}
+---
+a:
+  a: a
+  b: b
+  c: c
+b:
+  a: a
+  b: b
+  c: c
+c:
+  a: a
+  b: b
+  c: c
 custom:
-  a: [test1, test2]
-  b: [test1, test2]
-  c: [test1, test2]
+  a:
+    - test1
+    - test2
+  b:
+    - test1
+    - test2
+  c:
+    - test1
+    - test2
diff --git a/tests/data/valid/datazen-out-test/child.html b/tests/data/valid/datazen-out-test/child.html
index c74d649..298f7cc 100644
--- a/tests/data/valid/datazen-out-test/child.html
+++ b/tests/data/valid/datazen-out-test/child.html
@@ -1,7 +1,7 @@
 <!--
     =====================================
     generator=datazen
-    version=3.1.3
+    version=3.1.4
     hash=2484372c47afe099f7d18f760fe57ce7
     =====================================
 -->
diff --git a/tests/data/valid/datazen-out-test/comp1-a.yaml b/tests/data/valid/datazen-out-test/comp1-a.yaml
index adaa2ff..6877bc9 100644
--- a/tests/data/valid/datazen-out-test/comp1-a.yaml
+++ b/tests/data/valid/datazen-out-test/comp1-a.yaml
@@ -1,33 +1,78 @@
-a: {a: a, b: b, c: c}
-b: {a: a, b: b, c: c}
+---
+json: json
+yaml: yaml
+top_list:
+  - d
+  - e
+  - f
+  - a
+  - b
+  - c
+top_dict:
+  b:
+    b: b
+  a:
+    a: a
 bad: 5
-c: {a: a, b: b, c: c}
-custom:
-  a: [test1, test2]
-  b: [test1, test2]
-  c: [test1, test2]
-  nested:
-    a: {a: a, b: b, c: c}
-    b: {a: a, b: b, c: c}
-    c: {a: a, b: b, c: c}
-    custom:
-      a: [test1, test2]
-      b: [test1, test2]
-      c: [test1, test2]
-d: {d: d}
-e: {e: e}
+b:
+  a: a
+  b: b
+  c: c
+c:
+  a: a
+  b: b
+  c: c
+d:
+  d: d
+e:
+  e: e
+f:
+  f: f
+a:
+  a: a
+  b: b
+  c: c
 empty:
   a:
-    a: {a: a}
-f: {f: f}
-json: json
+    a:
+      a: a
 json2: json
-test: a
-top_dict:
-  a: {a: a}
-  b: {b: b}
-top_list: [d, e, f, a, b, c]
-yaml: yaml
 yaml2: yaml
+custom:
+  a:
+    - test1
+    - test2
+  b:
+    - test1
+    - test2
+  c:
+    - test1
+    - test2
+  nested:
+    a:
+      a: a
+      b: b
+      c: c
+    b:
+      a: a
+      b: b
+      c: c
+    c:
+      a: a
+      b: b
+      c: c
+    custom:
+      a:
+        - test1
+        - test2
+      b:
+        - test1
+        - test2
+      c:
+        - test1
+        - test2
 yaml3: yaml
-yaml3_dict: {a: a, b: b}
+yaml3_dict:
+  a: a
+  b: b
+test: a
diff --git a/tests/data/valid/datazen-out-test/comp2-c.yaml b/tests/data/valid/datazen-out-test/comp2-c.yaml
index bdcb391..a51941a 100644
--- a/tests/data/valid/datazen-out-test/comp2-c.yaml
+++ b/tests/data/valid/datazen-out-test/comp2-c.yaml
@@ -1,30 +1,73 @@
-a: {a: a, b: b, c: c}
-b: {a: a, b: b, c: c}
+---
+json: json
+yaml: yaml
+top_list:
+  - d
+  - e
+  - f
+  - a
+  - b
+  - c
+top_dict:
+  b:
+    b: b
+  a:
+    a: a
 bad: 5
-c: {a: a, b: b, c: c}
-custom:
-  a: [test1, test2]
-  b: [test1, test2]
-  c: [test1, test2]
-  nested:
-    a: {a: a, b: b, c: c}
-    b: {a: a, b: b, c: c}
-    c: {a: a, b: b, c: c}
-    custom:
-      a: [test1, test2]
-      b: [test1, test2]
-      c: [test1, test2]
-d: {d: d}
-e: {e: e}
+b:
+  a: a
+  b: b
+  c: c
+c:
+  a: a
+  b: b
+  c: c
+d:
+  d: d
+e:
+  e: e
+f:
+  f: f
+a:
+  a: a
+  b: b
+  c: c
 empty:
   a:
-    a: {a: a}
-f: {f: f}
-json: json
+    a:
+      a: a
 json2: json
-top_dict:
-  a: {a: a}
-  b: {b: b}
-top_list: [d, e, f, a, b, c]
-yaml: yaml
 yaml2: yaml
+custom:
+  a:
+    - test1
+    - test2
+  b:
+    - test1
+    - test2
+  c:
+    - test1
+    - test2
+  nested:
+    a:
+      a: a
+      b: b
+      c: c
+    b:
+      a: a
+      b: b
+      c: c
+    c:
+      a: a
+      b: b
+      c: c
+    custom:
+      a:
+        - test1
+        - test2
+      b:
+        - test1
+        - test2
+      c:
+        - test1
+        - test2
diff --git a/tests/data/valid/datazen-out-test/comp2-e.yaml b/tests/data/valid/datazen-out-test/comp2-e.yaml
index bdcb391..a51941a 100644
--- a/tests/data/valid/datazen-out-test/comp2-e.yaml
+++ b/tests/data/valid/datazen-out-test/comp2-e.yaml
@@ -1,30 +1,73 @@
-a: {a: a, b: b, c: c}
-b: {a: a, b: b, c: c}
+---
+json: json
+yaml: yaml
+top_list:
+  - d
+  - e
+  - f
+  - a
+  - b
+  - c
+top_dict:
+  b:
+    b: b
+  a:
+    a: a
 bad: 5
-c: {a: a, b: b, c: c}
-custom:
-  a: [test1, test2]
-  b: [test1, test2]
-  c: [test1, test2]
-  nested:
-    a: {a: a, b: b, c: c}
-    b: {a: a, b: b, c: c}
-    c: {a: a, b: b, c: c}
-    custom:
-      a: [test1, test2]
-      b: [test1, test2]
-      c: [test1, test2]
-d: {d: d}
-e: {e: e}
+b:
+  a: a
+  b: b
+  c: c
+c:
+  a: a
+  b: b
+  c: c
+d:
+  d: d
+e:
+  e: e
+f:
+  f: f
+a:
+  a: a
+  b: b
+  c: c
 empty:
   a:
-    a: {a: a}
-f: {f: f}
-json: json
+    a:
+      a: a
 json2: json
-top_dict:
-  a: {a: a}
-  b: {b: b}
-top_list: [d, e, f, a, b, c]
-yaml: yaml
 yaml2: yaml
+custom:
+  a:
+    - test1
+    - test2
+  b:
+    - test1
+    - test2
+  c:
+    - test1
+    - test2
+  nested:
+    a:
+      a: a
+      b: b
+      c: c
+    b:
+      a: a
+      b: b
+      c: c
+    c:
+      a: a
+      b: b
+      c: c
+    custom:
+      a:
+        - test1
+        - test2
+      b:
+        - test1
+        - test2
+      c:
+        - test1
+        - test2
diff --git a/tests/data/valid/datazen-out-test/comp3-a.yaml b/tests/data/valid/datazen-out-test/comp3-a.yaml
index a71251b..a1b4937 100644
--- a/tests/data/valid/datazen-out-test/comp3-a.yaml
+++ b/tests/data/valid/datazen-out-test/comp3-a.yaml
@@ -1,35 +1,81 @@
-a: {a: a, b: b, c: c}
-b: {a: a, b: b, c: c}
+---
+json: json
+yaml: yaml
+top_list:
+  - d
+  - e
+  - f
+  - a
+  - b
+  - c
+top_dict:
+  b:
+    b: b
+  a:
+    a: a
 bad: 5
-c: {a: a, b: b, c: c}
-custom:
-  a: [test1, test2]
-  b: [test1, test2]
-  c: [test1, test2]
-  nested:
-    a: {a: a, b: b, c: c}
-    b: {a: a, b: b, c: c}
-    c: {a: a, b: b, c: c}
-    custom:
-      a: [test1, test2]
-      b: [test1, test2]
-      c: [test1, test2]
-d: {d: d}
-e: {e: e}
+b:
+  a: a
+  b: b
+  c: c
+c:
+  a: a
+  b: b
+  c: c
+d:
+  d: d
+e:
+  e: e
+f:
+  f: f
+a:
+  a: a
+  b: b
+  c: c
 empty:
   a:
-    a: {a: a}
-f: {f: f}
-json: json
+    a:
+      a: a
 json2: json
-test:
-  a:
-    b: {c: a}
-top_dict:
-  a: {a: a}
-  b: {b: b}
-top_list: [d, e, f, a, b, c]
-yaml: yaml
 yaml2: yaml
+custom:
+  a:
+    - test1
+    - test2
+  b:
+    - test1
+    - test2
+  c:
+    - test1
+    - test2
+  nested:
+    a:
+      a: a
+      b: b
+      c: c
+    b:
+      a: a
+      b: b
+      c: c
+    c:
+      a: a
+      b: b
+      c: c
+    custom:
+      a:
+        - test1
+        - test2
+      b:
+        - test1
+        - test2
+      c:
+        - test1
+        - test2
 yaml3: yaml
-yaml3_dict: {a: a, b: b}
+yaml3_dict:
+  a: a
+  b: b
+test:
+  a:
+    b:
+      c: a
diff --git a/tests/data/valid/datazen-out-test/comp4.yaml b/tests/data/valid/datazen-out-test/comp4.yaml
index acfce8d..1587247 100644
--- a/tests/data/valid/datazen-out-test/comp4.yaml
+++ b/tests/data/valid/datazen-out-test/comp4.yaml
@@ -1 +1,4 @@
-{a: a, b: b, c: c}
+---
+a: a
+b: b
+c: c
diff --git a/tests/data/valid/datazen-out-test/e.yaml b/tests/data/valid/datazen-out-test/e.yaml
index acfce8d..1587247 100644
--- a/tests/data/valid/datazen-out-test/e.yaml
+++ b/tests/data/valid/datazen-out-test/e.yaml
@@ -1 +1,4 @@
-{a: a, b: b, c: c}
+---
+a: a
+b: b
+c: c
diff --git a/tests/data/valid/datazen-out-test/test.md b/tests/data/valid/datazen-out-test/test.md
index d451b42..8381a16 100644
--- a/tests/data/valid/datazen-out-test/test.md
+++ b/tests/data/valid/datazen-out-test/test.md
@@ -1,7 +1,7 @@
 <!--
     =====================================
     generator=datazen
-    version=3.1.3
+    version=3.1.4
     hash=6d844b64ba9b4d34ea3a70c213cf7ea2
     =====================================
 -->