Browse Source

Remove unnecessary methods from listener classes

Patrick-Christopher Mattulat 3 years ago
parent
commit
c707e7a388

+ 1 - 9
test/cases/event/EventManagerTest.cpp

@@ -42,7 +42,7 @@ namespace {
     std::shared_ptr<ls_std::EventHandler> seriousNewsEventHandler = std::make_shared<ls_std::EventHandler>(seriousNewsEventId);   // event id
     std::shared_ptr<ls_std::EventHandler> gossipNewsEventHandler = std::make_shared<ls_std::EventHandler>(gossipNewsEventId);     // event id
 
-    // create and fill event manger with handler
+    // create and fill event manager with handler
 
     std::shared_ptr<ls_std::EventManager> eventManager = std::make_shared<ls_std::EventManager>();
     eventManager->addEventHandler(seriousNewsEventHandler);
@@ -53,14 +53,6 @@ namespace {
     std::shared_ptr<ls_std_test::DailyNewsAgency> dailyNews = std::make_shared<ls_std_test::DailyNewsAgency>();
     std::shared_ptr<ls_std_test::GossipNewsAgency> gossipNews = std::make_shared<ls_std_test::GossipNewsAgency>();
 
-    // add handler of those events, every news agency should know
-    // this is how agencies know about events
-
-    dailyNews->addEventHandler(seriousNewsEventHandler);
-
-    gossipNews->addEventHandler(seriousNewsEventHandler);
-    gossipNews->addEventHandler(gossipNewsEventHandler);
-
     // fire SeriousNewsEvent event with no effect
 
     eventManager->fire(ls_std_test::SeriousNewsEvent(news)); // event call

+ 6 - 14
test/classes/event/DailyNewsAgency.cpp

@@ -12,16 +12,6 @@
 ls_std_test::DailyNewsAgency::DailyNewsAgency() : ls_std_test::NewsAgency("DailyNewsAgency")
 {}
 
-void ls_std_test::DailyNewsAgency::clear()
-{
-  this->news.clear();
-}
-
-std::string ls_std_test::DailyNewsAgency::getNews()
-{
-  return this->news;
-}
-
 void ls_std_test::DailyNewsAgency::listen(const ls_std::Class &_info)
 {
   ls_std::Event event = dynamic_cast<const ls_std::Event&>(_info);
@@ -31,10 +21,12 @@ void ls_std_test::DailyNewsAgency::listen(const ls_std::Class &_info)
   }
 }
 
-void ls_std_test::DailyNewsAgency::addEventHandler(const std::shared_ptr<ls_std::EventHandler> &_eventHandler)
+void ls_std_test::DailyNewsAgency::clear()
 {
-  // TODO: check event handler existence
+  this->news.clear();
+}
 
-  std::pair<ls_std::event_id, std::shared_ptr<ls_std::EventHandler>> entry = std::make_pair(_eventHandler->getId(), _eventHandler);
-  this->eventHandlers.insert(entry);
+std::string ls_std_test::DailyNewsAgency::getNews()
+{
+  return this->news;
 }

+ 2 - 4
test/classes/event/DailyNewsAgency.hpp

@@ -25,17 +25,15 @@ namespace ls_std_test {
 
       // implementation
 
-      void clear();
-      std::string getNews();
       void listen(const ls_std::Class& _info) override;
 
       // additional functionality
 
-      void addEventHandler(const std::shared_ptr<ls_std::EventHandler>& _eventHandler);
+      void clear();
+      std::string getNews();
 
     private:
 
-      std::map<ls_std::event_id, std::shared_ptr<ls_std::EventHandler>> eventHandlers {};
       std::string news {};
   };
 }

+ 6 - 14
test/classes/event/GossipNewsAgency.cpp

@@ -12,16 +12,6 @@
 ls_std_test::GossipNewsAgency::GossipNewsAgency() : ls_std_test::NewsAgency("GossipNewsAgency")
 {}
 
-void ls_std_test::GossipNewsAgency::clear()
-{
-  this->news.clear();
-}
-
-std::string ls_std_test::GossipNewsAgency::getNews()
-{
-  return this->news;
-}
-
 void ls_std_test::GossipNewsAgency::listen(const ls_std::Class &_info)
 {
   ls_std::Event event = dynamic_cast<const ls_std::Event&>(_info);
@@ -35,10 +25,12 @@ void ls_std_test::GossipNewsAgency::listen(const ls_std::Class &_info)
   }
 }
 
-void ls_std_test::GossipNewsAgency::addEventHandler(const std::shared_ptr<ls_std::EventHandler> &_eventHandler)
+void ls_std_test::GossipNewsAgency::clear()
 {
-  // TODO: check event handler existence
+  this->news.clear();
+}
 
-  std::pair<ls_std::event_id, std::shared_ptr<ls_std::EventHandler>> entry = std::make_pair(_eventHandler->getId(), _eventHandler);
-  this->eventHandlers.insert(entry);
+std::string ls_std_test::GossipNewsAgency::getNews()
+{
+  return this->news;
 }

+ 2 - 4
test/classes/event/GossipNewsAgency.hpp

@@ -25,17 +25,15 @@ namespace ls_std_test {
 
       // implementation
 
-      void clear();
-      std::string getNews();
       void listen(const ls_std::Class& _info) override;
 
       // additional functionality
 
-      void addEventHandler(const std::shared_ptr<ls_std::EventHandler>& _eventHandler);
+      void clear();
+      std::string getNews();
 
     private:
 
-      std::map<ls_std::event_id, std::shared_ptr<ls_std::EventHandler>> eventHandlers {};
       std::string news {};
   };
 }