things are simpler when you're not being stupid

opal/tests/test_search_extract.py

@@ -187,7 +187,7 @@ def test_strips_pid(self, csv):
         self.assertEqual(set(headers), set(expected_headers))
 
         expected_order = {}
-        for expected_header in headers:
+        for expected_header in expected_headers:
             idx = headers.index(expected_header)
             expected_order[expected_header] = idx
 
@@ -207,49 +207,49 @@ def test_strips_pid(self, csv):
 
         # make sure all rows tally up correctly
         self.assertEqual(
-            expected_row[expected_order["episode_id"]], 1
+            row[expected_order["episode_id"]], 1
         )
 
         self.assertEqual(
-            expected_row[expected_order["created"]], None
+            row[expected_order["created"]], None
         )
 
         self.assertEqual(
-            expected_row[expected_order["updated"]], None
+            row[expected_order["updated"]], None
         )
 
         self.assertEqual(
-            expected_row[expected_order["created_by_id"]], None
+            row[expected_order["created_by_id"]], None
         )
 
         self.assertEqual(
-            expected_row[expected_order["updated_by_id"]], None
+            row[expected_order["updated_by_id"]], None
         )
 
         self.assertEqual(
-            expected_row[expected_order["hospital_number"]], b'12345678',
+            row[expected_order["hospital_number"]], b'12345678',
         )
 
         self.assertEqual(
-            expected_row[expected_order["nhs_number"]], None
+            row[expected_order["nhs_number"]], None
         )
 
         self.assertEqual(
-            expected_row[expected_order["date_of_birth"]],
+            row[expected_order["date_of_birth"]],
             datetime.date(1976, 1, 1),
         )
 
         self.assertEqual(
-            expected_row[expected_order["death_indicator"]], False
+            row[expected_order["death_indicator"]], False
         )
 
         self.assertEqual(
-            expected_row[expected_order["sex"]],
+            row[expected_order["sex"]],
             b'\xc5\xa0\xc4\x90\xc4\x86\xc5\xbd\xc4\x87\xc5\xbe\xc5\xa1\xc4\x91',
         )
 
         self.assertEqual(
-            expected_row[expected_order["birth_place"]],
+            row[expected_order["birth_place"]],
             b'',
         )