Feature project tests (#9)

AsaiYusuke · web-flow · commit c551ca41c0e2 · 2022-12-24T10:23:31.000+09:00
Add project for tests management
diff --git a/README.md b/README.md
@@ -282,6 +282,7 @@ 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)
 - [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)
 
diff --git a/example/test/ok/project/project.test.json b/example/test/ok/project/project.test.json
@@ -0,0 +1,42 @@
+{
+    "$schema": "../../../../schema/project.schema.json",
+    "tests": [
+        {
+            "target": {
+                "start": {
+                    "label": "check_collision"
+                }
+            },
+            "cases": {
+                "test 1-1": {
+                    "setup": {},
+                    "expected": {}
+                },
+                "test 1-2": {
+                    "setup": {},
+                    "expected": {}
+                }
+            }
+        },
+        {
+            "target": {
+                "start": {
+                    "label": "check_collision"
+                }
+            },
+            "cases": {
+                "test 2-1": {
+                    "setup": {},
+                    "expected": {}
+                },
+                "test 2-2": {
+                    "setup": {},
+                    "expected": {}
+                }
+            }
+        },
+        {
+            "file": "sub_testcase.test.json"
+        }
+    ]
+}
diff --git a/example/test/ok/project/sub_testcase.test.json b/example/test/ok/project/sub_testcase.test.json
@@ -0,0 +1,14 @@
+{
+    "$schema": "../../../../schema/testcase.schema.json",
+    "target": {
+        "start": {
+            "label": "check_collision"
+        }
+    },
+    "cases": {
+        "sub test 1": {
+            "setup": {},
+            "expected": {}
+        }
+    }
+}
diff --git a/include/emulation/debug_info.h b/include/emulation/debug_info.h
@@ -46,7 +46,7 @@ class debug_info
 public:
     debug_info(args_parser *args, json config);
     string get_path();
-    void activate_line_coverage(uint16_t address);
+    void add_line_coverage(uint16_t address);
     string get_source_line(uint16_t address);
     bool has_address(string label);
     string get_label(uint16_t address);
diff --git a/include/emulation/debug_source_line.h b/include/emulation/debug_source_line.h
@@ -10,13 +10,13 @@ class debug_source_line
     int file_id;
     int segment_id;
     int line_number;
-    bool cover;
+    int cover;
 
 public:
     debug_source_line(int _file_id, int _segment_id, int _line_number);
     int get_file_id();
     int get_segment_id();
     int get_line_number();
-    bool is_cover();
-    void set_cover();
+    int get_cover();
+    void add_cover();
 };
diff --git a/include/emulation/emulation_devices.h b/include/emulation/emulation_devices.h
@@ -18,10 +18,9 @@ class emulation_devices
     cpu_device *cpu;
     memory_device *memory;
     vector<runtime_error_result> errors;
-    debug_info *debug;
 
 public:
-    emulation_devices(args_parser *args, json config);
+    emulation_devices(args_parser *args, json config, debug_info *debug);
     void clear(condition_register_pc *pc, vector<uint8_t> stack);
     cpu_device *get_cpu();
     memory_device *get_memory();
@@ -33,6 +32,5 @@ class emulation_devices
     void add_error_result(runtime_error_type type, string message);
     vector<runtime_error_result> get_filtered_errors(vector<runtime_error_type> types);
 
-    void save_coverage();
     void print();
 };
diff --git a/include/test/test.h b/include/test/test.h
@@ -14,11 +14,13 @@ class test
 {
 private:
     args_parser *args;
+    debug_info *debug;
     emulation_devices *device;
-    json test_scinario;
+    vector<json> test_scinarios;
 
-    void traverse(test_total_result &total_result, json testcase, string path);
-    test_result do_test(string id, json testcase);
+    json read_json(string path);
+    void traverse(test_total_result &total_result, json test_target, json test_template, json testcase, string path);
+    test_result do_test(string id, json test_target, json test_template, json testcase);
     void print_call_stack();
 
 public:
diff --git a/include/test/test_total_result.h b/include/test/test_total_result.h
@@ -15,8 +15,9 @@ class test_total_result
     map<test_result_type, int> test_result_map;
 
 public:
-    test_total_result(emulation_devices *_device, args_parser *_args, int _total);
+    test_total_result(emulation_devices *_device, args_parser *_args);
     void add_and_print_result(test_result result);
     bool is_success();
+    void set_total(int total);
     void print_summary();
 };
diff --git a/include/util/test_detect.h b/include/util/test_detect.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "nlohmann/json.hpp"
+
+using namespace std;
+
+using json = nlohmann::json;
+
+class test_detect
+{
+private:
+    static bool key_type_check(string key, json::value_t type, json value);
+
+public:
+    static bool is_project(json value);
+    static bool is_file_reference(json value);
+};
diff --git a/schema/project.schema.json b/schema/project.schema.json
@@ -0,0 +1,50 @@
+{
+    "$schema": "http://json-schema.org/schema",
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {
+        "$schema": {
+            "type": "string"
+        },
+        "tests": {
+            "type": "array",
+            "minItems": 1,
+            "items": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                    "target": true,
+                    "cases": true,
+                    "definitions": true,
+                    "config": true,
+                    "file": {
+                        "type": "string"
+                    }
+                },
+                "if": {
+                    "properties": {
+                        "file": {
+                            "type": "null"
+                        }
+                    }
+                },
+                "then": {
+                    "allOf": [
+                        {
+                            "$ref": "testcase.schema.json"
+                        }
+                    ]
+                },
+                "else": {
+                    "properties": {
+                        "target": false,
+                        "cases": false,
+                        "definitions": false,
+                        "config": false
+                    }
+                }
+                
+            }
+        }
+    }
+}
diff --git a/src/emulation/cpu_filter/coverage_filter.cpp b/src/emulation/cpu_filter/coverage_filter.cpp
@@ -11,7 +11,7 @@ void coverage_filter::clear()
 
 bool coverage_filter::pre()
 {
-    debug->activate_line_coverage(cpu->get_register16(register_type::PC));
+    debug->add_line_coverage(cpu->get_register16(register_type::PC));
     return true;
 }
 
diff --git a/src/emulation/debug_info.cpp b/src/emulation/debug_info.cpp
@@ -187,11 +187,11 @@ void debug_info::make_address_source_map()
     }
 }
 
-void debug_info::activate_line_coverage(uint16_t address)
+void debug_info::add_line_coverage(uint16_t address)
 {
     if (address_source_map.count(address) == 0)
         return;
-    address_source_map[address]->set_cover();
+    address_source_map[address]->add_cover();
 }
 
 string debug_info::get_source_line(uint16_t address)
@@ -305,7 +305,7 @@ void debug_info::save_coverage()
                 file << "DA:"
                      << debug_line.second->get_line_number()
                      << ","
-                     << (debug_line.second->is_cover() ? 1 : 0)
+                     << (debug_line.second->get_cover())
                      << endl;
         }
     }
diff --git a/src/emulation/debug_source_line.cpp b/src/emulation/debug_source_line.cpp
@@ -23,12 +23,12 @@ int debug_source_line::get_line_number()
     return line_number;
 }
 
-bool debug_source_line::is_cover()
+int debug_source_line::get_cover()
 {
     return cover;
 }
 
-void debug_source_line::set_cover()
+void debug_source_line::add_cover()
 {
-    cover = true;
+    cover++;
 }
diff --git a/src/emulation/emulation_devices.cpp b/src/emulation/emulation_devices.cpp
@@ -2,9 +2,8 @@
 
 #include "emulation/emulation_devices.h"
 
-emulation_devices::emulation_devices(args_parser *args, json config)
+emulation_devices::emulation_devices(args_parser *args, json config, debug_info *debug)
 {
-    debug = new debug_info(args, config);
     memory = new memory_device(this, args, config, debug);
     cpu = new cpu_device(this, args, config, debug);
 }
@@ -31,11 +30,6 @@ uint16_t emulation_devices::get_address(string label)
     return memory->get_address(label);
 }
 
-void emulation_devices::save_coverage()
-{
-    debug->save_coverage();
-}
-
 void emulation_devices::print()
 {
     cpu->print();
diff --git a/src/test/test.cpp b/src/test/test.cpp
diff --git a/src/test/test_total_result.cpp b/src/test/test_total_result.cpp
diff --git a/src/util/test_detect.cpp b/src/util/test_detect.cpp
