Remove useless event factory

Change-Id: I8442a26ebfcfe3c17c378b283ffbbc0810b7a067

watcher/tests/applier/test_applier_manager.py

@@ -16,8 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+from mock import patch
+from threading import Thread
+
 from watcher.applier.manager import ApplierManager
-from watcher.common.messaging.events.event import Event
+from watcher.common.messaging.messaging_core import MessagingCore
 from watcher.tests import base
 
 
@@ -26,6 +30,10 @@ class TestApplierManager(base.TestCase):
         super(TestApplierManager, self).setUp()
         self.applier = ApplierManager()
 
-    def test_evt(self):
-        e = Event()
-        self.applier.event_receive(e)
+    @patch.object(MessagingCore, "connect")
+    @patch.object(Thread, "join")
+    def test_connect(self, m_messaging, m_thread):
+        self.applier.connect()
+        self.applier.join()
+        self.assertEqual(m_messaging.call_count, 2)
+        self.assertEqual(m_thread.call_count, 1)

watcher/tests/common/messaging/event/test_event_dispatcher.py

@@ -32,7 +32,7 @@ class TestEventDispatcher(base.TestCase):
 
     def fake_event(self, event_type):
         event = Event()
-        event.set_type(event_type)
+        event.type = event_type
         return event
 
     def test_add_listener(self):

watcher/tests/decision_engine/audit/test_event_consumer_factory.py

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2015 b<>com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from watcher.decision_engine.event.consumer_factory import EventConsumerFactory
-from watcher.decision_engine.messaging.events import Events
-from watcher.tests import base
-
-
-class TestEventConsumerFactory(base.TestCase):
-
-    event_consumer_factory = EventConsumerFactory()
-
-    def test_factory_with_unknown_type(self):
-        self.assertRaises(AssertionError,
-                          self.event_consumer_factory.factory,
-                          Events.ALL)

watcher/tests/decision_engine/test_manager.py

@@ -1,43 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2015 b<>com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import mock
-
-from watcher.common import utils
-
-from watcher.decision_engine.event.consumer_factory import EventConsumerFactory
-
-from watcher.common.messaging.events.event import Event
-from watcher.decision_engine.manager import DecisionEngineManager
-
-from watcher.decision_engine.messaging.events import Events
-from watcher.tests import base
-
-
-class TestDecisionEngineManager(base.TestCase):
-    def setUp(self):
-        super(TestDecisionEngineManager, self).setUp()
-        self.manager = DecisionEngineManager()
-
-    def test_event_receive(self):
-        # todo(jed) remove useless
-        with mock.patch.object(EventConsumerFactory, 'factory') as mock_call:
-            data = {"key1": "value"}
-            request_id = utils.generate_uuid()
-            event_type = Events.TRIGGER_AUDIT
-            event = Event(event_type, data, request_id)
-            self.manager.event_receive(event)
-            mock_call.assert_called_once_with(event_type)