Parcourir la source

Address SonarLint findings in EventManager class

Patrick-Christopher Mattulat il y a 1 an
Parent
commit
0081ba1eda
2 fichiers modifiés avec 11 ajouts et 10 suppressions
  1. 2 2
      include/ls-std/event/EventManager.hpp
  2. 9 8
      test/cases/event/EventManagerTest.cpp

+ 2 - 2
include/ls-std/event/EventManager.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-27
- * Changed:         2023-02-22
+ * Changed:         2023-05-16
  *
  * */
 
@@ -41,7 +41,7 @@ namespace ls::std::event
 
     private:
 
-      ::std::map<ls::std::core::type::event_id, ::std::shared_ptr<ls::std::event::EventHandler>> eventHandlers{};
+      ::std::map<ls::std::core::type::event_id, ::std::shared_ptr<ls::std::event::EventHandler>, ::std::less<>> eventHandlers{};
 
       [[nodiscard]] bool _hasEventHandler(const ls::std::core::type::event_id &_id);
       [[nodiscard]] bool _removeEventHandler(const ::std::shared_ptr<ls::std::event::EventHandler> &_eventHandler);

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

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-27
- * Changed:         2023-03-25
+ * Changed:         2023-05-16
  *
  * */
 
@@ -208,7 +208,7 @@ namespace
   TEST_F(EventManagerTest, removeEventHandler)
   {
     EventManager eventManager{};
-    shared_ptr<EventHandler> eventHandler = make_shared<EventHandler>("TMP_ID");
+    auto eventHandler = make_shared<EventHandler>("TMP_ID");
     eventManager.addEventHandler(eventHandler);
 
     ASSERT_TRUE(eventManager.removeEventHandler(eventHandler));
@@ -239,25 +239,26 @@ namespace
 
   TEST_F(EventManagerTest, production_example)
   {
-    string news, expectedNews{};
+    string news{};
+    string expectedNews{};
     event_id seriousNewsEventId = SeriousNewsEvent{""}.getId();
     event_id gossipNewsEventId = GossipNewsEvent{""}.getId();
 
     // create event handler
 
-    shared_ptr<EventHandler> seriousNewsEventHandler = make_shared<EventHandler>(seriousNewsEventId); // event id
-    shared_ptr<EventHandler> gossipNewsEventHandler = make_shared<EventHandler>(gossipNewsEventId);   // event id
+    auto seriousNewsEventHandler = make_shared<EventHandler>(seriousNewsEventId); // event id
+    auto gossipNewsEventHandler = make_shared<EventHandler>(gossipNewsEventId);   // event id
 
     // create and fill event manager with handler
 
-    shared_ptr<EventManager> eventManager = make_shared<EventManager>();
+    auto eventManager = make_shared<EventManager>();
     eventManager->addEventHandler(seriousNewsEventHandler);
     eventManager->addEventHandler(gossipNewsEventHandler);
 
     // create news agency (listener)
 
-    shared_ptr<DailyNewsAgency> dailyNews = make_shared<DailyNewsAgency>();
-    shared_ptr<GossipNewsAgency> gossipNews = make_shared<GossipNewsAgency>();
+    auto dailyNews = make_shared<DailyNewsAgency>();
+    auto gossipNews = make_shared<GossipNewsAgency>();
 
     // fire SeriousNewsEvent event with no effect