Adjusted test expectations

Some new rules / nuances for bundles, comments, class guards and blank lines.

Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

tests/format/002_basics.expected.cf

@@ -3,8 +3,10 @@
 body common control
 {
   inputs => { "/var/cfengine/inputs/some_file.cf" };
+
   linux::
     inputs => { "/var/cfengine/inputs/other_file.cf" };
+
   ubuntu::
     inputs => {};
 }

tests/format/005_bundle_comments.expected.cf

@@ -52,3 +52,24 @@ bundle agent g
 {
   # comment
 }
+
+# For the library
+bundle edit_line fixapache
+{
+  # Comment before promise type
+  field_edits:
+    # Comment before promiser
+    "APACHE_MODULES=.*"
+      # Comment can be here
+      # and multiple lines
+      edit_field => quotedvar("$(add_modules)","append");
+
+    # Comment before class guard:
+    linux::
+      "APACHE_MODULES=.*"
+        # Comment can be here
+        # and multiple lines
+        edit_field => quotedvar("$(del_modules)","delete");
+
+        # Trailing comments are fun!
+}

tests/format/005_bundle_comments.input.cf

@@ -50,3 +50,24 @@ bundle agent g
 {
   # comment
 }
+
+# For the library
+bundle edit_line fixapache
+{
+# Comment before promise type
+field_edits:
+# Comment before promiser
+"APACHE_MODULES=.*"
+# Comment can be here
+# and multiple lines
+edit_field => quotedvar("$(add_modules)","append");
+
+# Comment before class guard:
+linux::
+"APACHE_MODULES=.*"
+# Comment can be here
+# and multiple lines
+edit_field => quotedvar("$(del_modules)","delete");
+
+# Trailing comments are fun!
+}

tests/format/011_promises.expected.cf

@@ -67,6 +67,7 @@ body common control
     "services/main.cf",
   };
   version => "CFEngine Promises.cf 3.27.0";
+
   # From 3.7 onwards there is a new package promise implementation using package
   # modules in which you MUST provide package modules used to generate
   # software inventory reports. You can also provide global default package module
@@ -76,50 +77,63 @@ body common control
       $(package_module_knowledge.platform_default),
       @(default:package_module_knowledge.additional_inventory),
     };
+
   # We only define package_inventory on redhat like systems that have a
   # python version that works with the package module.
   (redhat|centos|suse|sles|opensuse|amazon_linux).cfe_python_for_package_modules_supported.!disable_inventory_package_refresh::
     package_inventory => {
       $(package_module_knowledge.platform_default),
       @(default:package_module_knowledge.additional_inventory),
     };
+
   aix.!disable_inventory_package_refresh::
     package_inventory => {
       $(package_module_knowledge.platform_default),
       @(default:package_module_knowledge.additional_inventory),
     };
+
   freebsd.!disable_inventory_package_refresh::
     package_inventory => {
       $(package_module_knowledge.platform_default),
       @(default:package_module_knowledge.additional_inventory),
     };
+
   aix::
     package_module => $(package_module_knowledge.platform_default);
+
   (debian|redhat|suse|sles|opensuse|amazon_linux|freebsd)::
     package_module => $(package_module_knowledge.platform_default);
+
   windows::
     package_inventory => {
       $(package_module_knowledge.platform_default),
       @(default:package_module_knowledge.additional_inventory),
     };
     package_module => $(package_module_knowledge.platform_default);
+
   termux::
     package_module => $(package_module_knowledge.platform_default);
+
   alpinelinux::
     package_module => $(package_module_knowledge.platform_default);
+
   any::
     ignore_missing_bundles => "$(def.control_common_ignore_missing_bundles)";
     ignore_missing_inputs => "$(def.control_common_ignore_missing_inputs)";
     # The number of minutes after which last-seen entries are purged from cf_lastseen.lmdb
     lastseenexpireafter => "$(def.control_common_lastseenexpireafter)";
+
   control_common_tls_min_version_defined::
     tls_min_version => "$(default:def.control_common_tls_min_version)";
+
   # See also: allowtlsversion in body server control
   control_common_tls_ciphers_defined::
     tls_ciphers => "$(default:def.control_common_tls_ciphers)";
+
   # See also: allowciphers in body server control
   control_common_system_log_level_defined::
     system_log_level => "$(default:def.control_common_system_log_level)";
+
   control_common_protocol_version_defined::
     protocol_version => "$(default:def.control_common_protocol_version)";
 }