tests: conf: test a few more edge cases

- split merge.conf into two files, one being standard JSON,
  to ensure we can parse this
- ensure that key-value pairs are correctly overriden when
  merging without the override. prefix
- remove context.modules, which is no longer needed there
- fix a typo with a stray ; character

tests/wp/conf/wireplumber.conf

@@ -1,6 +1,3 @@
-context.modules = [
-  { name = libpipewire-module-protocol-native }
-]
 
 wireplumber.section.array.boolean = [ true, false ]
 
@@ -36,6 +33,7 @@ wireplumber.section-merged.array.string = [ "first" ]
 wireplumber.section-merged.object = {
   key.boolean = false
   key.int = 6
+  key.string = "not-merged"
 }
 
 wireplumber.section-merged.array.array = [ [true] ]
@@ -50,7 +48,7 @@ wireplumber.section-nested-merged = {
 }
 
 wireplumber.section-override = {
-  "key1" = true;
+  "key1" = true
 }
 
 wireplumber.section-nested-override = {

tests/wp/conf/wireplumber.conf.d/merge.conf

@@ -25,13 +25,3 @@ wireplumber.section-nested-merged = {
   }
   nested-array = [3, 4]
 }
-
-override.wireplumber.section-override = {
-  "key2" = 5;
-}
-
-wireplumber.section-nested-override = {
-  override.nested-object = {
-    key2 = 3
-  }
-}

tests/wp/conf/wireplumber.conf.d/merge2.conf

@@ -0,0 +1,10 @@
+{
+  "override.wireplumber.section-override": {
+    "key2": 5
+  },
+  "wireplumber.section-nested-override": {
+    "override.nested-object": {
+      "key2": 3
+    }
+  }
+}