update condition_manager interface

LiptonB · Jul 9, 2017 · 09d37f9 · 09d37f9
1 parent 8f65125
commit 09d37f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/core/grabber/include/manipulator/condition_manager.hpp b/src/core/grabber/include/manipulator/condition_manager.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "manipulator/manipulator_factory.hpp"
+#include "manipulator/details/conditions/base.hpp"
 
 namespace krbn {
 namespace manipulator {
@@ -11,8 +11,8 @@ class condition_manager final {
   condition_manager(void) {
   }
 
-  void push_back_condition(const nlohmann::json& json) {
-    conditions_.push_back(manipulator_factory::make_condition(json));
+  void push_back_condition(const std::shared_ptr<krbn::manipulator::details::conditions::base>& condition) {
+    conditions_.push_back(condition);
   }
 
   bool is_fulfilled(const krbn::manipulator_environment& manipulator_environment) const {

diff --git a/tests/src/manipulator_conditions/test.cpp b/tests/src/manipulator_conditions/test.cpp
@@ -2,6 +2,7 @@
 #include "../../vendor/catch/catch.hpp"
 
 #include "manipulator/condition_manager.hpp"
+#include "manipulator/manipulator_factory.hpp"
 #include "thread_utility.hpp"
 #include <boost/optional/optional_io.hpp>
 
@@ -47,7 +48,7 @@ class actual_examples_helper final {
     std::ifstream input(std::string("json/") + file_name);
     auto json = nlohmann::json::parse(input);
     for (const auto& j : json) {
-      condition_manager_.push_back_condition(j);
+      condition_manager_.push_back_condition(krbn::manipulator::manipulator_factory::make_condition(j));
     }
   }