akester/storehouse

Fork Project

d05bcbeae6ac83bc3fe67167e8f9d67531e42131

Authored By: Andrew Kester Date: July 7, 2017 3:07 pm

Add tests for multiple diff group conditions

src/StorehouseBundle/DataFixtures/VCS/Diffs/Git/MultipleGroups.diff
0
+diff --git a/.gitmodules b/.gitmodules
1
+index cc9be85..532841f 100644
2
+--- a/.gitmodules
3
++++ b/.gitmodules
4
+@@ -1,3 +1,3 @@
5
+ [submodule "storehouse"]
6
+ 	path = storehouse
7
+-	url = /Users/andrew/Desktop/storehouse/
8
++	url = akester@sthse.co:/code/storehouse.git
9
+diff --git a/Makefile b/Makefile
10
+index ffb4d3e..dc20bcb 100644
11
+--- a/Makefile
12
++++ b/Makefile
13
+@@ -4,10 +4,6 @@ SUBLEVEL = 0
14
+ EXTRAVERSION = -rc4
15
+ NAME = Hurr durr I'ma sheep
16
+
17
+-# Test Content
18
+-# Test Content
19
+-
20
+-
21
+ # *DOCUMENTATION*
22
+ # To see a list of typical targets execute "make help"
23
+ # More info can be located in ./README
24
+@@ -4,10 +4,6 @@ SUBLEVEL = 0
25
+ EXTRAVERSION = -rc4
26
+ NAME = Hurr durr I'ma sheep
27
+
28
+-# Test Content
29
+-# Test Content
30
+-
31
+-
32
+ # *DOCUMENTATION*
33
+ # To see a list of typical targets execute "make help"
34
+ # More info can be located in ./README
35
+diff --git a/README b/README
36
+index a782551..3b04992 100644
37
+--- a/README
38
++++ b/README
39
+@@ -2,5 +2,6 @@ This folder contains test data for our test project repositories.  These files
40
+ should be committed over several commits and will enable us to create a uniform
41
+ platform that we can use for our VCS testing.
42
+
43
++
44
+ The files can be committed in any order, since each VCS version uses a differnt
45
+ notation for commits.
46
+diff --git a/storehouse b/storehouse
47
+deleted file mode 160000
48
+index b68fe99..0000000
49
+--- a/storehouse
50
++++ /dev/null
51
+@@ -1 +0,0 @@
52
+-Subproject commit b68fe99de18c4ba9cdc5d8449ef6f1c69b981859
53 1
\ No newline at end of file
src/StorehouseBundle/DataFixtures/VCS/Diffs/HG/MultipleGroups.diff
0
+diff -r 9ba1df9cc282 -r 069af58fb6cc Makefile
1
+--- a/Makefile	Wed Apr 19 14:00:06 2017 -0500
2
++++ b/Makefile	Mon Nov 07 21:19:49 2016 -0600
3
+@@ -4,10 +4,6 @@ SUBLEVEL = 0
4
+ EXTRAVERSION = -rc4
5
+ NAME = Hurr durr I'ma sheep
6
+
7
+-# Extra Content
8
+-# Extra Content
9
+-# Extra Content
10
+-
11
+ # *DOCUMENTATION*
12
+ # To see a list of typical targets execute "make help"
13
+ # More info can be located in ./README
14
+diff -r 9ba1df9cc282 -r 069af58fb6cc README
15
+--- a/README	Wed Apr 19 14:00:06 2017 -0500
16
++++ b/README	Mon Nov 07 21:19:49 2016 -0600
17
+@@ -3,6 +3,4 @@ should be committed over several commits
18
+ platform that we can use for our VCS testing.
19
+
20
+ The files can be committed in any order, since each VCS version uses a differnt
21
+-notation for commits.
22
+-
23
+-Extra Content
24
++notation for commits.
25
+\ No newline at end of file
26
+@@ -3,6 +3,4 @@ should be committed over several commits
27
+ platform that we can use for our VCS testing.
28
+
29
+ The files can be committed in any order, since each VCS version uses a differnt
30
+-notation for commits.
31
+-
32
+-Extra Content
33
++notation for commits.
34
+\ No newline at end of file
35 1
\ No newline at end of file
src/StorehouseBundle/DataFixtures/VCS/Diffs/SVN/MultipleGroups.diff
0
+Index: Makefile
1
+===================================================================
2
+diff --git a/Makefile b/Makefile
3
+--- a/Makefile	(revision 12)
4
++++ b/Makefile	(revision 10)
5
+@@ -4,12 +4,6 @@
6
+ EXTRAVERSION = -rc4
7
+ NAME = Hurr durr I'ma sheep
8
+
9
+-# Extra Content
10
+-# Extra Content
11
+-# Extra Content
12
+-# Extra Content
13
+-# Extra Content
14
+-
15
+ # *DOCUMENTATION*
16
+ # To see a list of typical targets execute "make help"
17
+ # More info can be located in ./README
18
+Index: README
19
+===================================================================
20
+diff --git a/README b/README
21
+--- a/README	(revision 12)
22
++++ b/README	(revision 10)
23
+@@ -2,7 +2,9 @@
24
+ should be committed over several commits and will enable us to create a uniform
25
+ platform that we can use for our VCS testing.
26
+
27
++
28
+ The files can be committed in any order, since each VCS version uses a differnt
29
+ notation for commits.
30
+
31
+-Test Content
32
++
33
++Extra Data
34
+@@ -2,7 +2,9 @@
35
+ should be committed over several commits and will enable us to create a uniform
36
+ platform that we can use for our VCS testing.
37
+
38
++
39
+ The files can be committed in any order, since each VCS version uses a differnt
40
+ notation for commits.
41
+
42
+-Test Content
43
++
44
++Extra Data
45 1
\ No newline at end of file
src/StorehouseBundle/Tests/Utils/VCS/Commands/Helpers/ExtractDiffTest.php
54 54
             'Multiple Files' => array(
55 55
                 'Git/MultipleFiles.diff',
56 56
                 4
57
+            ),
58
+            'Multiple Groups' => array(
59
+                'Git/MultipleGroups.diff',
60
+                4
61 57
             )
62 58
         );
63 59
     }
98 102
             'Deleted File' => array(
99 103
                 'HG/DeletedFile.diff',
100 104
                 1
101
+            ),
102
+            'Multiple Groups' => array(
103
+                'HG/MultipleGroups.diff',
104
+                2
105 105
             )
106 106
         );
107 107
     }
152 160
                 array(),
153 161
                 2
154 162
             ),
163
-            'Long' => array(
155
+            'Multiple Groups' => array(
156
+                'SVN/MultipleGroups.diff',
157
+                array(),
158
+                2
159
+            ),
160
+            'Long Diff' => array(
161 164
                 'SVN/Long.diff',
162 165
                 array(),
163 166
                 4
164 167