Better patch tests. They now all read from casefiles

Author: cscorley

tests/test_apply.py

@@ -26,8 +26,7 @@ def test_diff_default(self):
         with open('tests/casefiles/diff-default.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in wtp.parse_patch(diff_text)]
-        diff = diff[0]
+        diff = next(wtp.parse_patch(diff_text))
 
         new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEqual(new_text, self.tzu)
@@ -36,8 +35,7 @@ def test_diff_context(self):
         with open('tests/casefiles/diff-context.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in wtp.parse_patch(diff_text)]
-        diff = diff[0]
+        diff = next(wtp.parse_patch(diff_text))
 
         new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEqual(new_text, self.tzu)
@@ -46,8 +44,7 @@ def test_diff_unified(self):
         with open('tests/casefiles/diff-unified.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in wtp.parse_patch(diff_text)]
-        diff = diff[0]
+        diff = next(wtp.parse_patch(diff_text))
 
         new_text = wtp.apply.apply_diff(diff, self.lao)
 
@@ -57,8 +54,7 @@ def test_diff_unified_patchutil(self):
         with open('tests/casefiles/diff-unified.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in wtp.parse_patch(diff_text)]
-        diff = diff[0]
+        diff = next(wtp.parse_patch(diff_text))
 
         new_text = wtp.apply.apply_diff(diff, self.lao, use_patch=True)
         self.assertEqual(new_text, (self.tzu, None))
@@ -69,8 +65,7 @@ def test_diff_rcs(self):
         with open('tests/casefiles/diff-rcs.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in wtp.parse_patch(diff_text)]
-        diff = diff[0]
+        diff = next(wtp.parse_patch(diff_text))
 
         new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEqual(new_text, self.tzu)
@@ -80,8 +75,7 @@ def test_diff_ed(self):
         with open('tests/casefiles/diff-ed.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in wtp.parse_patch(diff_text)]
-        diff = diff[0]
+        diff = next(wtp.parse_patch(diff_text))
 
         new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEqual(self.tzu,new_text)