Update chapter 11 per revisions

Author: alandmoore

Chapter11/ABQ_Data_Entry/abq_data_entry/models.py

@@ -88,7 +88,7 @@ def get_all_records(self):
 
     with open(self.file, 'r', encoding='utf-8') as fh:
       # Casting to list is necessary for unit tests to work
-      csvreader = csv.DictReader(list(fh.readlines()))
+      csvreader = csv.DictReader(fh)
       missing_fields = set(self.fields.keys()) - set(csvreader.fieldnames)
       if len(missing_fields) > 0:
         fields_string = ', '.join(missing_fields)

Chapter11/ABQ_Data_Entry/abq_data_entry/test/test_application.py

@@ -32,9 +32,15 @@ class TestApplication(TestCase):
   def setUp(self):
     # can be parenthesized in python 3.10+
     with \
-      patch('abq_data_entry.application.m.CSVModel') as csvmodel,\
-      patch('abq_data_entry.application.m.SettingsModel') as settingsmodel,\
-      patch('abq_data_entry.application.Application._show_login') as show_login,\
+      patch(
+        'abq_data_entry.application.m.CSVModel'
+      ) as csvmodel,\
+      patch(
+        'abq_data_entry.application.m.SettingsModel'
+      ) as settingsmodel,\
+      patch(
+       'abq_data_entry.application.Application._show_login'
+      ) as show_login,\
       patch('abq_data_entry.application.v.DataRecordForm'),\
       patch('abq_data_entry.application.v.RecordList'),\
       patch('abq_data_entry.application.ttk.Notebook'),\
@@ -52,7 +58,6 @@ def tearDown(self):
 
   def test_show_recordlist(self):
     self.app._show_recordlist()
-    self.app.update()
     self.app.notebook.select.assert_called_with(self.app.recordlist)
 
   def test_populate_recordlist(self):

Chapter11/ABQ_Data_Entry/abq_data_entry/test/test_widgets.py

@@ -28,15 +28,13 @@ def type_in_widget(self, widget, string):
     widget.focus_force()
     for char in string:
       char = self.keysyms.get(char, char)
-      self.root.update()
-      widget.event_generate('<KeyPress-{}>'.format(char))
-      self.root.update()
+      widget.event_generate(f'<KeyPress-{char}>')
+      self.root.update_idletasks()
 
   def click_on_widget(self, widget, x, y, button=1):
     widget.focus_force()
-    self.root.update()
-    widget.event_generate("<ButtonPress-{}>".format(button), x=x, y=y)
-    self.root.update()
+    widget.event_generate(f'<ButtonPress-{button}>', x=x, y=y)
+    self.root.update_idletasks()
 
   @staticmethod
   def find_element(widget, element):
@@ -47,7 +45,7 @@ def find_element(widget, element):
     for x in x_coords:
       for y in y_coords:
         if widget.identify(x, y) == element:
-          return (x, y)
+          return (x + 1, y + 1)
     raise Exception(f'{element} was not found in widget')
 
 
@@ -166,11 +164,10 @@ def click_arrow(self, arrow, times=1):
     for _ in range(times):
       self.click_on_widget(self.vsb, x=x, y=y)
 
-  def test__key_validate(self):
+  def test_key_validate(self):
     ###################
     # Unit-test Style #
     ###################
-
     # test valid input
     for x in range(10):
       x = str(x)
@@ -179,19 +176,19 @@ def test__key_validate(self):
       self.assertTrue(p_valid)
       self.assertTrue(n_valid)
 
-    # test letters
+  def test_key_validate_letters(self):
     valid = self.key_validate('a')
     self.assertFalse(valid)
 
-    # test non-increment number
+  def test_key_validate_increment(self):
     valid = self.key_validate('1', '0.')
     self.assertFalse(valid)
 
-    # test too high number
+  def test_key_validate_high(self):
     valid = self.key_validate('0', '10')
     self.assertFalse(valid)
 
-  def test__key_validate_integration(self):
+  def test_key_validate_integration(self):
     ##########################
     # Integration test style #
     ##########################
@@ -208,7 +205,7 @@ def test__key_validate_integration(self):
     self.type_in_widget(self.vsb, '200')
     self.assertEqual(self.vsb.get(), '2')
 
-  def test__focusout_validate(self):
+  def test_focusout_validate(self):
 
     # test valid
     for x in range(10):
@@ -233,6 +230,7 @@ def test__focusout_validate(self):
 
   def test_arrows(self):
     self.value.set(0)
+    self.vsb.update()
     self.click_arrow('up', times=1)
     self.assertEqual(self.vsb.get(), '1')
 

Chapter11/unittest_demo/mycalc.py

@@ -2,26 +2,26 @@
 
 class MyCalc:
 
-    def __init__(self, a, b):
-        self.a = a
-        self.b = b
+  def __init__(self, a, b):
+    self.a = a
+    self.b = b
 
-    def add(self):
-        return self.a + self.b
+  def add(self):
+    return self.a + self.b
 
-    def mod_divide(self):
-        if self.b == 0:
-            raise ValueError("Cannot divide by zero")
-        return (int(self.a / self.b), self.a % self.b)
+  def mod_divide(self):
+    if self.b == 0:
+      raise ValueError("Cannot divide by zero")
+    return (int(self.a / self.b), self.a % self.b)
 
-    def mod_divide2(self):
-        if type(self.a) is not int or type(self.b) is not int:
-            raise ValueError("Method only valid for ints")
-        if self.b == 0:
-            raise ValueError("Cannot divide by zero")
-        return (self.a // self.b, self.a % self.b)
+  def mod_divide2(self):
+    if type(self.a) is not int or type(self.b) is not int:
+      raise ValueError("Method only valid for ints")
+    if self.b == 0:
+      raise ValueError("Cannot divide by zero")
+    return (self.a // self.b, self.a % self.b)
 
-    def rand_between(self):
-        return (
-            (random.random() * abs(self.a - self.b)) +
-            min(self.a, self.b))
+  def rand_between(self):
+    return (
+      (random.random() * abs(self.a - self.b)) +
+      min(self.a, self.b))

Chapter11/unittest_demo/test_mycalc_badly.py

@@ -1,11 +1,11 @@
-from mycalc import MyCalc
+import mycalc
 import unittest
 
 
 class TestMyCalc(unittest.TestCase):
 
   def test_add(self):
-    mc = MyCalc(1, 10)
+    mc = mycalc.MyCalc(1, 10)
     assert mc.add() == 11
 
     # much better error output