From 843629f7bfec3b626bcf6c961319978e2644dc22 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 5 Dec 2025 18:57:05 -0500
Subject: [PATCH] Organize some test JSON better to prevent confusion

It was not clear which of thes were JSON for derivation vs JSON for
derivation options.
---
 .../protocols/json/derivation/options.md      | 12 +++++-----
 src/json-schema-checks/meson.build            | 12 +++++-----
 .../ca/{ => derivation-options}/all_set.json  |  0
 .../structuredAttrs_all_set.json              |  0
 .../ia/{ => derivation-options}/all_set.json  |  0
 .../ia/{ => derivation-options}/defaults.json |  0
 .../structuredAttrs_all_set.json              |  0
 .../structuredAttrs_defaults.json             |  0
 .../derivation-advanced-attrs.cc              | 24 +++++++++----------
 9 files changed, 23 insertions(+), 25 deletions(-)
 rename src/libstore-tests/data/derivation/ca/{ => derivation-options}/all_set.json (100%)
 rename src/libstore-tests/data/derivation/ca/{ => derivation-options}/structuredAttrs_all_set.json (100%)
 rename src/libstore-tests/data/derivation/ia/{ => derivation-options}/all_set.json (100%)
 rename src/libstore-tests/data/derivation/ia/{ => derivation-options}/defaults.json (100%)
 rename src/libstore-tests/data/derivation/ia/{ => derivation-options}/structuredAttrs_all_set.json (100%)
 rename src/libstore-tests/data/derivation/ia/{ => derivation-options}/structuredAttrs_defaults.json (100%)

diff --git a/doc/manual/source/protocols/json/derivation/options.md b/doc/manual/source/protocols/json/derivation/options.md
index 98d166fe9..c40ffe0f3 100644
--- a/doc/manual/source/protocols/json/derivation/options.md
+++ b/doc/manual/source/protocols/json/derivation/options.md
@@ -7,25 +7,25 @@
 #### Default options
 
 ```json
-{{#include ../schema/derivation-options-v1/ia/defaults.json}}
+{{#include ../schema/derivation-options-v1/ia/derivation-options/defaults.json}}
 ```
 
 #### All options set
 
 ```json
-{{#include ../schema/derivation-options-v1/ia/all_set.json}}
+{{#include ../schema/derivation-options-v1/ia/derivation-options/all_set.json}}
 ```
 
 #### Default options (structured attributes)
 
 ```json
-{{#include ../schema/derivation-options-v1/ia/structuredAttrs_defaults.json}}
+{{#include ../schema/derivation-options-v1/ia/derivation-options/structuredAttrs_defaults.json}}
 ```
 
 #### All options set (structured attributes)
 
 ```json
-{{#include ../schema/derivation-options-v1/ia/structuredAttrs_all_set.json}}
+{{#include ../schema/derivation-options-v1/ia/derivation-options/structuredAttrs_all_set.json}}
 ```
 
 ### Content-addressed derivations
@@ -33,13 +33,13 @@
 #### All options set
 
 ```json
-{{#include ../schema/derivation-options-v1/ca/all_set.json}}
+{{#include ../schema/derivation-options-v1/ca/derivation-options/all_set.json}}
 ```
 
 #### All options set (structured attributes)
 
 ```json
-{{#include ../schema/derivation-options-v1/ca/structuredAttrs_all_set.json}}
+{{#include ../schema/derivation-options-v1/ca/derivation-options/structuredAttrs_all_set.json}}
 ```
 
 <!-- need to convert YAML to JSON first
diff --git a/src/json-schema-checks/meson.build b/src/json-schema-checks/meson.build
index 42c9132bd..1a30ec424 100644
--- a/src/json-schema-checks/meson.build
+++ b/src/json-schema-checks/meson.build
@@ -73,12 +73,12 @@ schemas = [
     'stem' : 'derivation-options',
     'schema' : schema_dir / 'derivation-options-v1.yaml',
     'files' : [
-      'ia' / 'defaults.json',
-      'ia' / 'all_set.json',
-      'ia' / 'structuredAttrs_defaults.json',
-      'ia' / 'structuredAttrs_all_set.json',
-      'ca' / 'all_set.json',
-      'ca' / 'structuredAttrs_all_set.json',
+      'ia' / 'derivation-options' / 'defaults.json',
+      'ia' / 'derivation-options' / 'all_set.json',
+      'ia' / 'derivation-options' / 'structuredAttrs_defaults.json',
+      'ia' / 'derivation-options' / 'structuredAttrs_all_set.json',
+      'ca' / 'derivation-options' / 'all_set.json',
+      'ca' / 'derivation-options' / 'structuredAttrs_all_set.json',
     ],
   },
 ]
diff --git a/src/libstore-tests/data/derivation/ca/all_set.json b/src/libstore-tests/data/derivation/ca/derivation-options/all_set.json
similarity index 100%
rename from src/libstore-tests/data/derivation/ca/all_set.json
rename to src/libstore-tests/data/derivation/ca/derivation-options/all_set.json
diff --git a/src/libstore-tests/data/derivation/ca/structuredAttrs_all_set.json b/src/libstore-tests/data/derivation/ca/derivation-options/structuredAttrs_all_set.json
similarity index 100%
rename from src/libstore-tests/data/derivation/ca/structuredAttrs_all_set.json
rename to src/libstore-tests/data/derivation/ca/derivation-options/structuredAttrs_all_set.json
diff --git a/src/libstore-tests/data/derivation/ia/all_set.json b/src/libstore-tests/data/derivation/ia/derivation-options/all_set.json
similarity index 100%
rename from src/libstore-tests/data/derivation/ia/all_set.json
rename to src/libstore-tests/data/derivation/ia/derivation-options/all_set.json
diff --git a/src/libstore-tests/data/derivation/ia/defaults.json b/src/libstore-tests/data/derivation/ia/derivation-options/defaults.json
similarity index 100%
rename from src/libstore-tests/data/derivation/ia/defaults.json
rename to src/libstore-tests/data/derivation/ia/derivation-options/defaults.json
diff --git a/src/libstore-tests/data/derivation/ia/structuredAttrs_all_set.json b/src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_all_set.json
similarity index 100%
rename from src/libstore-tests/data/derivation/ia/structuredAttrs_all_set.json
rename to src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_all_set.json
diff --git a/src/libstore-tests/data/derivation/ia/structuredAttrs_defaults.json b/src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_defaults.json
similarity index 100%
rename from src/libstore-tests/data/derivation/ia/structuredAttrs_defaults.json
rename to src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_defaults.json
diff --git a/src/libstore-tests/derivation-advanced-attrs.cc b/src/libstore-tests/derivation-advanced-attrs.cc
index 764f16014..296ffed61 100644
--- a/src/libstore-tests/derivation-advanced-attrs.cc
+++ b/src/libstore-tests/derivation-advanced-attrs.cc
@@ -16,9 +16,7 @@ namespace nix {
 
 using namespace nlohmann;
 
-class DerivationAdvancedAttrsTest : public JsonCharacterizationTest<Derivation>,
-                                    public JsonCharacterizationTest<DerivationOptions<SingleDerivedPath>>,
-                                    public LibStoreTest
+class DerivationAdvancedAttrsTest : public JsonCharacterizationTest<Derivation>, public LibStoreTest
 {
 protected:
     std::filesystem::path unitTestData = getUnitTestData() / "derivation" / "ia";
@@ -496,16 +494,16 @@ TEST_F(CaDerivationAdvancedAttrsTest, advancedAttributes_structuredAttrs)
         {"rainbow", "uid-range", "ca-derivations"});
 };
 
-#define TEST_JSON_OPTIONS(FIXUTURE, VAR, VAR2)                                               \
-    TEST_F(FIXUTURE, DerivationOptions_##VAR##_from_json)                                    \
-    {                                                                                        \
-        this->JsonCharacterizationTest<DerivationOptions<SingleDerivedPath>>::readJsonTest(  \
-            #VAR, advancedAttributes_##VAR2);                                                \
-    }                                                                                        \
-    TEST_F(FIXUTURE, DerivationOptions_##VAR##_to_json)                                      \
-    {                                                                                        \
-        this->JsonCharacterizationTest<DerivationOptions<SingleDerivedPath>>::writeJsonTest( \
-            #VAR, advancedAttributes_##VAR2);                                                \
+#define TEST_JSON_OPTIONS(FIXUTURE, VAR, VAR2)                             \
+    TEST_F(FIXUTURE, DerivationOptions_##VAR##_from_json)                  \
+    {                                                                      \
+        nix::readJsonTest<DerivationOptions<SingleDerivedPath>>(           \
+            *this, "derivation-options/" #VAR, advancedAttributes_##VAR2); \
+    }                                                                      \
+    TEST_F(FIXUTURE, DerivationOptions_##VAR##_to_json)                    \
+    {                                                                      \
+        nix::readJsonTest<DerivationOptions<SingleDerivedPath>>(           \
+            *this, "derivation-options/" #VAR, advancedAttributes_##VAR2); \
     }
 
 TEST_JSON_OPTIONS(DerivationAdvancedAttrsTest, defaults, defaults)