Skip to content

Commit 4d04d7f

Browse files
committed
Split all test cases into separate casefiles.
1 parent 4e577b2 commit 4d04d7f

File tree

8 files changed

+48
-35
lines changed

8 files changed

+48
-35
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ each diff in the patch:
9191
(4, None, 'The Named is the mother of all things.'),
9292
(None, 2, 'The named is the mother of all things.'),
9393
(None, 3, ''),
94-
(5, 4, 'Therefore let there always be non-being,'),
94+
(5, 4, 'Therefore let there always be non-being,'),
9595
(6, 5, ' so we may see their subtlety,'),
9696
(7, 6, 'And let there always be being,'),
9797
(9, 8, 'The two are the same,'),
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*** /tmp/o 2012-12-22 06:43:35.000000000 -0600
2+
--- /tmp/n 2012-12-23 20:40:50.000000000 -0600
3+
***************

tests/casefiles/cvs-header.diff

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Index: org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java
2+
===================================================================
3+
RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java,v
4+
retrieving revision 1.6.4.1
5+
retrieving revision 1.8
6+
diff -u -r1.6.4.1 -r1.8
7+
--- org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java 23 Jul 2001 17:51:45 -0000 1.6.4.1
8+
+++ org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java 17 May 2002 20:27:56 -0000 1.8
9+
@@ -1 +1 @@
10+

tests/casefiles/git-header.diff

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
diff --git a/bugtrace/patch.py b/bugtrace/patch.py
2+
index 8910dfd..456e34f 100644
3+
--- a/bugtrace/patch.py
4+
+++ b/bugtrace/patch.py
5+
@@ -8,20 +8,30 @@
6+

tests/casefiles/svn-header.diff

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Index: bugtrace/trunk/src/bugtrace/csc.py
2+
===================================================================
3+
--- bugtrace/trunk/src/bugtrace/csc.py (revision 12783)
4+
+++ bugtrace/trunk/src/bugtrace/csc.py (revision 12784)
5+
@@ -1,3 +1,6 @@
6+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--- /tmp/some file 2012-12-22 06:43:35.000000000 -0600
2+
+++ /tmp/n 2012-12-23 20:40:50.000000000 -0600
3+
@@ -1,3 +1,9 @@
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--- /tmp/o 2012-12-22 06:43:35.000000000 -0600
2+
+++ /tmp/n 2012-12-23 20:40:50.000000000 -0600
3+
@@ -1,3 +1,9 @@

tests/test_patch.py

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -589,13 +589,9 @@ def test_git_oneline_rm(self):
589589
self.assertEqual(results, expected)
590590

591591
def test_git_header(self):
592-
text = """
593-
diff --git a/bugtrace/patch.py b/bugtrace/patch.py
594-
index 8910dfd..456e34f 100644
595-
--- a/bugtrace/patch.py
596-
+++ b/bugtrace/patch.py
597-
@@ -8,20 +8,30 @@
598-
"""
592+
with open('tests/casefiles/git-header.diff') as f:
593+
text = f.read()
594+
599595
expected = wtp.patch.header(
600596
index_path = None,
601597
old_path = 'bugtrace/patch.py',
@@ -610,13 +606,9 @@ def test_git_header(self):
610606
self.assertEqual(results_main, expected)
611607

612608
def test_svn_header(self):
613-
text = """
614-
Index: bugtrace/trunk/src/bugtrace/csc.py
615-
===================================================================
616-
--- bugtrace/trunk/src/bugtrace/csc.py (revision 12783)
617-
+++ bugtrace/trunk/src/bugtrace/csc.py (revision 12784)
618-
@@ -1,3 +1,6 @@
619-
"""
609+
with open('tests/casefiles/svn-header.diff') as f:
610+
text = f.read()
611+
620612
expected = wtp.patch.header(
621613
index_path = 'bugtrace/trunk/src/bugtrace/csc.py',
622614
old_path = 'bugtrace/trunk/src/bugtrace/csc.py',
@@ -630,16 +622,9 @@ def test_svn_header(self):
630622
self.assertEqual(results_main, expected)
631623

632624
def test_cvs_header(self):
633-
text = """Index: org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java
634-
===================================================================
635-
RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java,v
636-
retrieving revision 1.6.4.1
637-
retrieving revision 1.8
638-
diff -u -r1.6.4.1 -r1.8
639-
--- org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java 23 Jul 2001 17:51:45 -0000 1.6.4.1
640-
+++ org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java 17 May 2002 20:27:56 -0000 1.8
641-
@@ -1 +1 @@
642-
"""
625+
with open('tests/casefiles/cvs-header.diff') as f:
626+
text = f.read()
627+
643628
expected = wtp.patch.header(
644629
index_path = 'org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java',
645630
old_path = 'org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/SafeChunkyInputStream.java',
@@ -653,9 +638,8 @@ def test_cvs_header(self):
653638
self.assertEqual(results_main, expected)
654639

655640
def test_unified_header(self):
656-
text = """--- /tmp/o 2012-12-22 06:43:35.000000000 -0600
657-
+++ /tmp/n 2012-12-23 20:40:50.000000000 -0600
658-
@@ -1,3 +1,9 @@"""
641+
with open('tests/casefiles/unified-header.diff') as f:
642+
text = f.read()
659643

660644
expected = wtp.patch.header(
661645
index_path = None,
@@ -671,9 +655,8 @@ def test_unified_header(self):
671655
self.assertEqual(results_main, expected)
672656

673657
def test_unified_header_notab(self):
674-
text = """--- /tmp/some file 2012-12-22 06:43:35.000000000 -0600
675-
+++ /tmp/n 2012-12-23 20:40:50.000000000 -0600
676-
@@ -1,3 +1,9 @@"""
658+
with open('tests/casefiles/unified-header-notab.diff') as f:
659+
text = f.read()
677660

678661
expected = wtp.patch.header(
679662
index_path = None,
@@ -807,7 +790,6 @@ def test_diff_default_blah(self):
807790
with open('tests/casefiles/diff-default-blah.diff') as f:
808791
text = f.read()
809792

810-
811793
expected = [
812794
wtp.patch.diffobj(
813795
header=None,
@@ -836,9 +818,9 @@ def test_diff_default_blah(self):
836818

837819

838820
def test_context_header(self):
839-
text = """*** /tmp/o 2012-12-22 06:43:35.000000000 -0600
840-
--- /tmp/n 2012-12-23 20:40:50.000000000 -0600
841-
***************"""
821+
with open('tests/casefiles/context-header.diff') as f:
822+
text = f.read()
823+
842824

843825
expected = wtp.patch.header(
844826
index_path = None,

0 commit comments

Comments
 (0)