project-wide configuration (#41)

Author: AsaiYusuke

README.md

@@ -320,7 +320,9 @@ If both are specified, the values in the test scenario file are adopted.
 - [Customize configurations](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/customize.configurations.test.json)
 - [Skip test (ignore)](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/skip.test.json)
 - [Complex evaluation](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/evaluation.test.json)
-- [Project for tests](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/project/project.test.json)
+- [Project-wide test set](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/project/project.test.json)
+- [Project-wide configuration](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/fail/200/project/error.out_of_segment.test.json)
+  - [Override from project-wide configuration](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/project/merge_config.test.json)
 - [Grouping](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/group.test.json)
 - [Definitions](https://github.com/AsaiYusuke/6502_test_executor/blob/master/example/test/ok/definitions.test.json)
 

example/test/fail/200/error.out_of_segment.test.json

@@ -8,9 +8,9 @@
     "testCases": {
         "out of segment test": {
             "$comment": [
-                "The `write_out_of_segment` proc executes sta in the undefined memory at address `$7fff`.",
-                "Since `ACCESS_TO_OUT_OF_SEGMENT` is activated,",
-                "attempting to write to such undefined memory terminates test with an error."
+                "The `write_out_of_segment` proc executes sta on undefined memory at address `$7fff`.",
+                "Since `ACCESS_TO_OUT_OF_SEGMENT` is active,",
+                "writing to such undefined memory terminates test with an error."
             ],
             "setup": {},
             "expected": {}

example/test/fail/200/error.readonly.test.json

@@ -9,8 +9,8 @@
         "write readonly memory test": {
             "$comment": [
                 "The `write_rodata` proc executes `sta` in readonly memory at address with `vector_dic` label.",
-                "Since `WRITE_TO_READONLY_MEMORY` is activated,",
-                "attempting to write to such readonly memory terminates test with an error."
+                "Since `WRITE_TO_READONLY_MEMORY` is active,",
+                "writing to such readonly memory terminates test with an error."
             ],
             "setup": {},
             "expected": {}

example/test/fail/200/error.unauthorized_memory_access.test.json

@@ -9,7 +9,7 @@
         "Unauthorized access test": {
             "$comment": [
                 "The `unauthorized_access` proc executes two `lda`.",
-                "Since `ACCESS_TO_UNAUTHORIZED_MEMORY` is activated",
+                "Since `ACCESS_TO_UNAUTHORIZED_MEMORY` is active",
                 "and the addresses in `ZEROPAGE` segment indicated in `authorizedList` are authorized for data access,",
                 "1st `lda` succeeds as it accesses an authorized address,",
                 "but 2nd `lda` terminates test with an error."

example/test/fail/200/error.uninitialized_memory_read.test.json

@@ -11,7 +11,7 @@
                 "The `uninitialized_read` proc executes two `lda`.",
                 "1st `lda` is from initialized `pos` address.",
                 "2nd `lda` is from uninitialized `pos+1` address.",
-                "Since `READ_FROM_UNINITIALIZED_MEMORY` is activated,",
+                "Since `READ_FROM_UNINITIALIZED_MEMORY` is active,",
                 "2nd `lda` terminates test with an error."
             ],
             "setup": {

example/test/fail/200/project/error.out_of_segment.test.json

@@ -0,0 +1,31 @@
+{
+    "$schema": "../../../../../schema/project.schema.json",
+    "config": {
+        "testMemoryAccess": {
+            "feature": [
+                "ACCESS_TO_OUT_OF_SEGMENT"
+            ]
+        }
+    },
+    "tests": [
+        {
+            "target": {
+                "start": {
+                    "label": "write_out_of_segment"
+                }
+            },
+            "testCases": {
+                "out of segment test": {
+                    "$comment": [
+                        "Same as example/test/fail/200/error.out_of_segment.test.json.",
+                        "The `write_out_of_segment` proc executes sta in the undefined memory at address `$7fff`.",
+                        "Since `ACCESS_TO_OUT_OF_SEGMENT` is active,",
+                        "writing to such undefined memory terminates test with an error."
+                    ],
+                    "setup": {},
+                    "expected": {}
+                }
+            }
+        }
+    ]
+}

example/test/ok/project/merge_config.test.json

@@ -0,0 +1,37 @@
+{
+    "$schema": "../../../../schema/project.schema.json",
+    "config": {
+        "maxCycleCount": 1,
+        "testMemoryAccess": {
+            "feature": [
+                "ACCESS_TO_OUT_OF_SEGMENT"
+            ]
+        }
+    },
+    "tests": [
+        {
+            "config": {
+                "maxCycleCount": 10000,
+                "testMemoryAccess": {
+                    "feature": []
+                }
+            },
+            "target": {
+                "start": {
+                    "label": "write_out_of_segment"
+                }
+            },
+            "testCases": {
+                "success out of segment test": {
+                    "$comment": [
+                        "The `write_out_of_segment` proc executes sta on undefined memory at address $7fff.",
+                        "Since `ACCESS_TO_OUT_OF_SEGMENT` is inactive (overrided),",
+                        "writing to such undefined memory results in a successful completion without any errors."
+                    ],
+                    "setup": {},
+                    "expected": {}
+                }
+            }
+        }
+    ]
+}

include/test/test.hpp

@@ -17,6 +17,7 @@ class test
 {
 private:
     args_parser *args;
+    json config;
     debug_info *debug;
     emulation_devices *device;
     vector<json> test_scenarios;

schema/project.schema.json

@@ -33,7 +33,14 @@
                         {
                             "$ref": "testcase.schema.json"
                         }
-                    ]
+                    ],
+                    "properties": {
+                        "config": {
+                            "properties": {
+                                "debugFile": false
+                            }
+                        }
+                    }
                 },
                 "else": {
                     "properties": {
@@ -44,6 +51,9 @@
                     }
                 }
             }
+        },
+        "config": {
+            "$ref": "testcase.schema.json#/definitions/config"
         }
     }
 }