Merge pull request faif#319 from gyermolenko/test_order_randomization

Test order randomization

Author: faif

tests/behavioral/test_command.py

@@ -1,58 +1,29 @@
-import unittest
-from unittest.mock import patch
-
-from patterns.behavioral.observer import Subject, Data, DecimalViewer, HexViewer
-
-
-class TestSubject(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.s = Subject()
-        cls.dec_obs = DecimalViewer()
-        cls.hex_obs = HexViewer()
-
-    def test_a_observer_list_shall_be_empty_initially(cls):
-        cls.assertEqual(len(cls.s._observers), 0)
-
-    def test_b_observers_shall_be_attachable(cls):
-        cls.s.attach(cls.dec_obs)
-        cls.assertEqual(isinstance(cls.s._observers[0], DecimalViewer), True)
-        cls.assertEqual(len(cls.s._observers), 1)
-        cls.s.attach(cls.hex_obs)
-        cls.assertEqual(isinstance(cls.s._observers[1], HexViewer), True)
-        cls.assertEqual(len(cls.s._observers), 2)
-
-    def test_c_observers_shall_be_detachable(cls):
-        cls.s.detach(cls.dec_obs)
-        # hex viewer shall be remaining if dec viewer is detached first
-        cls.assertEqual(isinstance(cls.s._observers[0], HexViewer), True)
-        cls.assertEqual(len(cls.s._observers), 1)
-        cls.s.detach(cls.hex_obs)
-        cls.assertEqual(len(cls.s._observers), 0)
-
-
-class TestData(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.dec_obs = DecimalViewer()
-        cls.hex_obs = HexViewer()
-        cls.sub = Data('Data')
-        # inherited behavior already tested with TestSubject
-        cls.sub.attach(cls.dec_obs)
-        cls.sub.attach(cls.hex_obs)
-
-    def test_data_change_shall_notify_all_observers_once(cls):
-        with patch.object(cls.dec_obs, 'update') as mock_dec_obs_update, patch.object(
-            cls.hex_obs, 'update'
-        ) as mock_hex_obs_update:
-            cls.sub.data = 10
-            cls.assertEqual(mock_dec_obs_update.call_count, 1)
-            cls.assertEqual(mock_hex_obs_update.call_count, 1)
-
-    def test_data_value_shall_be_changeable(cls):
-        cls.sub.data = 20
-        cls.assertEqual(cls.sub._data, 20)
-
-    def test_data_name_shall_be_changeable(cls):
-        cls.sub.name = 'New Data Name'
-        cls.assertEqual(cls.sub.name, 'New Data Name')
+from unittest.mock import patch, Mock
+
+import pytest
+
+from patterns.behavioral.observer import Data, DecimalViewer, HexViewer
+
+
+@pytest.fixture
+def observable():
+    return Data('some data')
+
+def test_attach_detach(observable):
+    decimal_viewer = DecimalViewer()
+    assert len(observable._observers) == 0
+
+    observable.attach(decimal_viewer)
+    assert decimal_viewer in observable._observers
+
+    observable.detach(decimal_viewer)
+    assert decimal_viewer not in observable._observers
+
+def test_one_data_change_notifies_each_observer_once(observable):
+    observable.attach(DecimalViewer())
+    observable.attach(HexViewer())
+
+    with patch('patterns.behavioral.observer.DecimalViewer.update', new_callable=Mock()) as mocked_update:
+        assert mocked_update.call_count == 0
+        observable.data = 10
+        assert mocked_update.call_count == 1

tests/behavioral/test_observer.py

@@ -1,54 +1,24 @@
-import unittest
+import pytest
+
 from patterns.behavioral.state import Radio
 
 
-class RadioTest(unittest.TestCase):
-    """
-    Attention: Test case results depend on test case execution. The test cases
-    in this integration test class should be executed in an explicit order:
-    http://stackoverflow.com/questions/5387299/python-unittest-testcase-execution-order
-    """
-
-    @classmethod
-    def setUpClass(self):
-        self.radio = Radio()
-
-    def test_initial_state(self):
-        state = self.radio.state.name
-        expected_state_name = 'AM'
-        self.assertEqual(state, expected_state_name)
-
-    def test_initial_am_station(self):
-        station = self.radio.state.stations[self.radio.state.pos]
-        expected_station = '1250'
-        self.assertEqual(station, expected_station)
-
-    def test_2nd_am_station_after_scan(self):
-        self.radio.scan()
-        station = self.radio.state.stations[self.radio.state.pos]
-        expected_station = '1380'
-        self.assertEqual(station, expected_station)
-
-    def test_3rd_am_station_after_scan(self):
-        self.radio.scan()
-        station = self.radio.state.stations[self.radio.state.pos]
-        expected_station = '1510'
-        self.assertEqual(station, expected_station)
-
-    def test_am_station_overflow_after_scan(self):
-        self.radio.scan()
-        station = self.radio.state.stations[self.radio.state.pos]
-        expected_station = '1250'
-        self.assertEqual(station, expected_station)
-
-    def test_shall_toggle_from_am_to_fm(self):
-        self.radio.toggle_amfm()
-        state = self.radio.state.name
-        expected_state_name = 'FM'
-        self.assertEqual(state, expected_state_name)
-
-    def test_shall_toggle_from_fm_to_am(self):
-        self.radio.toggle_amfm()
-        state = self.radio.state.name
-        expected_state_name = 'AM'
-        self.assertEqual(state, expected_state_name)
+@pytest.fixture
+def radio():
+    return Radio()
+
+def test_initial_state(radio):
+    assert radio.state.name == 'AM'
+
+def test_initial_am_station(radio):
+    initial_pos = radio.state.pos
+    assert radio.state.stations[initial_pos] == '1250'
+
+def test_toggle_amfm(radio):
+    assert radio.state.name == 'AM'
+
+    radio.toggle_amfm()
+    assert radio.state.name == 'FM'
+
+    radio.toggle_amfm()
+    assert radio.state.name == 'AM'

tests/behavioral/test_state.py

@@ -11,8 +11,7 @@ commands =
     flake8 patterns/
     ; `randomly-seed` option from `pytest-randomly` helps with deterministic outputs for examples like `other/blackboard.py`
     pytest --randomly-seed=1234 --doctest-modules patterns/
-    ; `-p no:randomly` turns off `randomly` plugin for unit tests
-    pytest -s -vv --cov={envsitepackagesdir}/patterns --log-level=INFO -p no:randomly tests/
+    pytest -s -vv --cov={envsitepackagesdir}/patterns --log-level=INFO tests/
 
 
 [testenv:cov-report]