Doctest for observer

Author: gyermolenko

patterns/behavioral/observer.py

@@ -64,52 +64,44 @@ def update(self, subject):
 
 # Example usage...
 def main():
-    data1 = Data('Data 1')
-    data2 = Data('Data 2')
-    view1 = DecimalViewer()
-    view2 = HexViewer()
-    data1.attach(view1)
-    data1.attach(view2)
-    data2.attach(view2)
-    data2.attach(view1)
-
-    print(u"Setting Data 1 = 10")
-    data1.data = 10
-    print(u"Setting Data 2 = 15")
-    data2.data = 15
-    print(u"Setting Data 1 = 3")
-    data1.data = 3
-    print(u"Setting Data 2 = 5")
-    data2.data = 5
-    print(u"Detach HexViewer from data1 and data2.")
-    data1.detach(view2)
-    data2.detach(view2)
-    print(u"Setting Data 1 = 10")
-    data1.data = 10
-    print(u"Setting Data 2 = 15")
-    data2.data = 15
-
-
-if __name__ == '__main__':
-    main()
-
-
-OUTPUT = """
-Setting Data 1 = 10
-DecimalViewer: Subject Data 1 has data 10
-HexViewer: Subject Data 1 has data 0xa
-Setting Data 2 = 15
-HexViewer: Subject Data 2 has data 0xf
-DecimalViewer: Subject Data 2 has data 15
-Setting Data 1 = 3
-DecimalViewer: Subject Data 1 has data 3
-HexViewer: Subject Data 1 has data 0x3
-Setting Data 2 = 5
-HexViewer: Subject Data 2 has data 0x5
-DecimalViewer: Subject Data 2 has data 5
-Detach HexViewer from data1 and data2.
-Setting Data 1 = 10
-DecimalViewer: Subject Data 1 has data 10
-Setting Data 2 = 15
-DecimalViewer: Subject Data 2 has data 15
-"""
+    """
+    >>> data1 = Data('Data 1')
+    >>> data2 = Data('Data 2')
+    >>> view1 = DecimalViewer()
+    >>> view2 = HexViewer()
+    >>> data1.attach(view1)
+    >>> data1.attach(view2)
+    >>> data2.attach(view2)
+    >>> data2.attach(view1)
+
+    >>> data1.data = 10
+    DecimalViewer: Subject Data 1 has data 10
+    HexViewer: Subject Data 1 has data 0xa
+
+    >>> data2.data = 15
+    HexViewer: Subject Data 2 has data 0xf
+    DecimalViewer: Subject Data 2 has data 15
+
+    >>> data1.data = 3
+    DecimalViewer: Subject Data 1 has data 3
+    HexViewer: Subject Data 1 has data 0x3
+
+    >>> data2.data = 5
+    HexViewer: Subject Data 2 has data 0x5
+    DecimalViewer: Subject Data 2 has data 5
+
+    # Detach HexViewer from data1 and data2
+    >>> data1.detach(view2)
+    >>> data2.detach(view2)
+
+    >>> data1.data = 10
+    DecimalViewer: Subject Data 1 has data 10
+
+    >>> data2.data = 15
+    DecimalViewer: Subject Data 2 has data 15
+    """
+
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()

tests/test_outputs.py

@@ -8,8 +8,6 @@
 
 import pytest
 
-from patterns.behavioral.observer import main as observer_main
-from patterns.behavioral.observer import OUTPUT as observer_output
 from patterns.behavioral.publish_subscribe import main as publish_subscribe_main
 from patterns.behavioral.publish_subscribe import OUTPUT as publish_subscribe_output
 from patterns.behavioral.specification import main as specification_main
@@ -21,7 +19,6 @@
 @pytest.mark.skipif(sys.version_info < (3,4),
                     reason="requires python3.4 or higher")
 @pytest.mark.parametrize("main,output", [
-    (observer_main, observer_output),
     (publish_subscribe_main, publish_subscribe_output),
     (specification_main, specification_output),
     (state_main, state_output),