Browse Source

fix test neurotransmitter

nico 8 years ago
parent
commit
d5676c3d07

+ 1 - 0
kalliope/core/__init__.py

@@ -8,3 +8,4 @@ from kalliope.core.NeuronLauncher import NeuronLauncher
 from kalliope.core.SynapseLauncher import SynapseLauncher
 from kalliope.core.LIFOBuffer import LIFOBuffer
 from kalliope.core.NeuronParameterLoader import NeuronParameterLoader
+from kalliope.core.NeuronModule import NeuronModule

+ 19 - 24
kalliope/neurons/neurotransmitter/tests/test_neurotransmitter.py

@@ -2,7 +2,7 @@ import unittest
 
 from mock import mock
 
-from kalliope.core.NeuronModule import NeuronModule, MissingParameterException, InvalidParameterException
+from kalliope.core.NeuronModule import MissingParameterException, InvalidParameterException
 from kalliope.neurons.neurotransmitter import Neurotransmitter
 
 
@@ -31,23 +31,23 @@ class TestNeurotransmitter(unittest.TestCase):
         """
         Testing the Parameters checking
         """
-        def run_test_InvalidParameterException(parameters_to_test):
+        def run_test_invalid_parameter_exception(parameters_to_test):
             with self.assertRaises(InvalidParameterException):
                 Neurotransmitter(**parameters_to_test)
 
-        def run_test_MissingParameterException(parameters_to_test):
+        def run_test_missing_parameter_exception(parameters_to_test):
             with self.assertRaises(MissingParameterException):
                 Neurotransmitter(**parameters_to_test)
 
         # empty
         parameters = dict()
-        run_test_MissingParameterException(parameters)
+        run_test_missing_parameter_exception(parameters)
 
         # missing direct_link and from_answer_link
         parameters = {
             "default": self.default
         }
-        run_test_MissingParameterException(parameters)
+        run_test_missing_parameter_exception(parameters)
 
         # missing direct_link and from_answer_link
         parameters = {
@@ -55,14 +55,14 @@ class TestNeurotransmitter(unittest.TestCase):
             "from_answer_link": self.from_answer_link,
             "direct_link": self.direct_link
         }
-        run_test_InvalidParameterException(parameters)
+        run_test_invalid_parameter_exception(parameters)
 
         # missing default
         parameters = {
             "from_answer_link": self.from_answer_link,
             "direct_link": self.direct_link
         }
-        run_test_InvalidParameterException(parameters)
+        run_test_invalid_parameter_exception(parameters)
 
         # Missing answer in from_answer_link
         self.from_answer_link = [
@@ -75,7 +75,7 @@ class TestNeurotransmitter(unittest.TestCase):
             "default": self.default,
             "from_answer_link": self.from_answer_link
         }
-        run_test_MissingParameterException(parameters)
+        run_test_missing_parameter_exception(parameters)
 
         # Missing synapse in from_answer_link
         self.from_answer_link = [
@@ -88,7 +88,7 @@ class TestNeurotransmitter(unittest.TestCase):
             "default": self.default,
             "from_answer_link": self.from_answer_link
         }
-        run_test_MissingParameterException(parameters)
+        run_test_missing_parameter_exception(parameters)
 
     def testCallback(self):
         """
@@ -98,8 +98,8 @@ class TestNeurotransmitter(unittest.TestCase):
             "default": self.default,
             "from_answer_link": self.from_answer_link
         }
-        with mock.patch.object(NeuronModule, 'get_audio_from_stt', create=True) as mock_get_audio_from_stt:
-            with mock.patch.object(NeuronModule, 'run_synapse_by_name', create=True) as mock_run_synapse_by_name:
+        with mock.patch("kalliope.core.NeuronModule.get_audio_from_stt") as mock_get_audio_from_stt:
+            with mock.patch("kalliope.core.NeuronModule.run_synapse_by_name") as mock_run_synapse_by_name:
                 # testing running the default when no order matching
                 nt = Neurotransmitter(**parameters)
                 mock_get_audio_from_stt.assert_called_once()
@@ -118,36 +118,31 @@ class TestNeurotransmitter(unittest.TestCase):
                 mock_run_synapse_by_name.reset_mock()
 
                 # Testing calling the right synapse
-                audio_text="answer one"
+                audio_text = "answer one"
                 nt.callback(audio=audio_text)
-                mock_run_synapse_by_name.assert_called_once_with(order=audio_text,
-                                                                 synapse_name="synapse2",
-                                                                 order_template="answer one")
+                mock_run_synapse_by_name.assert_called_once_with(synapse_name="synapse2",
+                                                                 user_order=audio_text,
+                                                                 synapse_order="answer one")
 
     def testInit(self):
         """
         Testing the init method of the neurontransmitter.
         """
 
-        with mock.patch.object(NeuronModule, 'run_synapse_by_name', create=True) as mock_run_synapse_by_name:
+        with mock.patch("kalliope.core.NeuronModule.run_synapse_by_name") as mock_run_synapse_by_name:
             # Test direct link
             parameters = {
                 "default": self.default,
                 "direct_link": self.direct_link
             }
-            nt = Neurotransmitter(**parameters)
+            Neurotransmitter(**parameters)
             mock_run_synapse_by_name.assert_called_once_with(self.direct_link)
 
-        with mock.patch.object(NeuronModule, 'get_audio_from_stt', create=True) as mock_get_audio_from_stt:
+        with mock.patch("kalliope.core.NeuronModule.get_audio_from_stt") as mock_get_audio_from_stt:
             # Test get_audio_from_stt
             parameters = {
                 "default": self.default,
                 "from_answer_link": self.from_answer_link,
             }
-            nt = Neurotransmitter(**parameters)
+            Neurotransmitter(**parameters)
             mock_get_audio_from_stt.assert_called_once()
-
-
-
-
-