Merge pull request #14724 from obsidiansystems/derivation-options-test-file-names

Organize some test JSON better to prevent confusion

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

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',
     ],
   },
 ]

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)