Fixed tests for conectivity validator and executor: KasperskyLab#174

Author: DavidIkov

knp/tests/framework/connectivity_validator_test.cpp

@@ -20,7 +20,7 @@
  */
 
 #include <knp/framework/network.h>
-#include <knp/framework/network_validation/runner.h>
+#include <knp/framework/network_validation/executor.h>
 #include <knp/framework/network_validation/validators/connectivity.h>
 #include <knp/framework/population/neuron_parameters_generators.h>
 
@@ -38,14 +38,18 @@ TEST(ConnectivityValidator, ErrorCodes)
     network.add_projection(
         knp::core::Projection<knp::synapse_traits::DeltaSynapse>(knp::core::UID(false), knp::core::UID(false)));
 
-    knp::framework::network_validation::Runner runner;
-    runner.add_validator("Connectivity validator", knp::framework::network_validation::Connectivity());
+    knp::framework::network_validation::Executor executor;
+    executor.add_validator(knp::framework::network_validation::Connectivity());
 
-    auto reports = runner.run_validators(network);
+    auto reports = executor.run_validators(network);
     ASSERT_EQ(reports.size(), 1);
     ASSERT_EQ(reports[0].report_.size(), 2);
-    ASSERT_EQ(reports[0].report_[0].severity_, knp::framework::network_validation::error);
-    ASSERT_EQ(reports[0].report_[0].code_, knp::framework::network_validation::Connectivity::projection_not_connected);
-    ASSERT_EQ(reports[0].report_[1].severity_, knp::framework::network_validation::error);
-    ASSERT_EQ(reports[0].report_[1].code_, knp::framework::network_validation::Connectivity::population_not_connected);
+    ASSERT_EQ(reports[0].report_[0].severity_, knp::framework::network_validation::IssueSeverity::error);
+    ASSERT_EQ(
+        reports[0].report_[0].code_.value(),
+        knp::framework::network_validation::Connectivity::projection_not_connected);
+    ASSERT_EQ(reports[0].report_[1].severity_, knp::framework::network_validation::IssueSeverity::error);
+    ASSERT_EQ(
+        reports[0].report_[1].code_.value(),
+        knp::framework::network_validation::Connectivity::population_not_connected);
 }

…sts/framework/validators_runner_test.cpp …s/framework/validators_executor_test.cppknp/tests/framework/validators_runner_test.cpp renamed to knp/tests/framework/validators_executor_test.cpp knp/tests/framework/validators_runner_test.cpp renamed to knp/tests/framework/validators_executor_test.cpp

@@ -1,6 +1,6 @@
 /**
- * @file validators_runner_test.cpp
- * @brief Validators runner test.
+ * @file validators_executor_test.cpp
+ * @brief Validators executor test.
  * @kaspersky_support David P.
  * @date 10.04.2026
  * @license Apache 2.0
@@ -20,54 +20,68 @@
  */
 
 #include <knp/framework/network.h>
-#include <knp/framework/network_validation/runner.h>
+#include <knp/framework/network_validation/executor.h>
 #include <knp/framework/population/neuron_parameters_generators.h>
 
 #include <tests_common.h>
 
+namespace
+{
+class TestErrorCategory : public std::error_category
+{
+    [[nodiscard]] const char* name() const noexcept override { return "TestValidatorError"; }
+    [[nodiscard]] std::string message(int error) const override { return "Error"; }
+};
+
+
+const std::error_category& error_category() noexcept
+{
+    static TestErrorCategory instance;
+    return instance;
+}
+}  // namespace
+
 
-TEST(ValidatorsRunner, RunValidators)
+TEST(ValidatorsExecutor, RunValidators)
 {
     knp::framework::Network network;
     network.add_projection(
         knp::core::Projection<knp::synapse_traits::DeltaSynapse>(knp::core::UID(false), knp::core::UID(false)));
     network.add_population(knp::core::Population<knp::neuron_traits::BLIFATNeuron>(
         knp::framework::population::neurons_generators::make_default<knp::neuron_traits::BLIFATNeuron>(), 0));
 
-    knp::framework::network_validation::Runner runner;
-    runner.add_validator(
+    knp::framework::network_validation::Executor executor;
+    executor.add_validator(
         "test0",
-        [](const knp::framework::Network&) -> std::vector<knp::framework::network_validation::Report> {
-            return {{knp::framework::network_validation::info, "message0", 0}};
+        [](const knp::framework::Network&) -> knp::framework::network_validation::Report {
+            return {{knp::framework::network_validation::IssueSeverity::info, "message0", {0, error_category()}}};
         });
-    runner.add_validator(
+    executor.add_validator(
         "test1",
-        [](const knp::framework::Network::AllProjectionVariants&)
-            -> std::vector<knp::framework::network_validation::Report> {
-            return {{knp::framework::network_validation::warning, "message1", 1}};
+        [](const knp::framework::Network::AllProjectionVariants&) -> knp::framework::network_validation::Report {
+            return {{knp::framework::network_validation::IssueSeverity::warning, "message1", {1, error_category()}}};
         });
-    runner.add_validator(
+    executor.add_validator(
         "test2",
-        [](const knp::framework::Network::AllPopulationVariants&)
-            -> std::vector<knp::framework::network_validation::Report> {
-            return {{knp::framework::network_validation::error, "message2", 2}};
+        [](const knp::framework::Network::AllPopulationVariants&) -> knp::framework::network_validation::Report {
+            return {{knp::framework::network_validation::IssueSeverity::error, "message2", {2, error_category()}}};
         });
 
-    auto reports = runner.run_validators(network);
+    auto reports = executor.run_validators(network);
     ASSERT_EQ(reports.size(), 3);
     ASSERT_EQ(reports[0].validator_name_, "test2");
     ASSERT_EQ(reports[0].report_.size(), 1);
-    ASSERT_EQ(reports[0].report_[0].severity_, knp::framework::network_validation::error);
+    ASSERT_EQ(reports[0].report_[0].severity_, knp::framework::network_validation::IssueSeverity::error);
     ASSERT_EQ(reports[0].report_[0].message_, "message2");
-    ASSERT_EQ(reports[0].report_[0].code_, 2);
+    ASSERT_EQ(reports[0].report_[0].code_.value(), 2);
     ASSERT_EQ(reports[1].validator_name_, "test1");
     ASSERT_EQ(reports[1].report_.size(), 1);
-    ASSERT_EQ(reports[1].report_[0].severity_, knp::framework::network_validation::warning);
+    ASSERT_EQ(reports[1].report_[0].severity_, knp::framework::network_validation::IssueSeverity::warning);
     ASSERT_EQ(reports[1].report_[0].message_, "message1");
-    ASSERT_EQ(reports[1].report_[0].code_, 1);
+    ASSERT_EQ(reports[1].report_[0].code_.value(), 1);
     ASSERT_EQ(reports[2].validator_name_, "test0");
     ASSERT_EQ(reports[2].report_.size(), 1);
-    ASSERT_EQ(reports[2].report_[0].severity_, knp::framework::network_validation::info);
+    ASSERT_EQ(reports[2].report_[0].severity_, knp::framework::network_validation::IssueSeverity::info);
     ASSERT_EQ(reports[2].report_[0].message_, "message0");
-    ASSERT_EQ(reports[2].report_[0].code_, 0);
+    ASSERT_EQ(reports[2].report_[0].code_.value(), 0);
 }