Fossil SCM

Verify revert output in revert tests.

joel 2014-02-23 04:56 trunk
Commit 3949c9a33e219cad057ff649898c141eb6b52b90
Parent e66a12ec4bfa24b…
1 file changed +35 -17
~ test/revert.test
M test/revert.test
+35 -17
--- test/revert.test
+++ test/revert.test
@@ -2,30 +2,25 @@
22
 # Tests for 'fossil revert'
33
 #
44
 #
55
66
 # Test 'fossil revert' against expected results from 'fossil changes' and
7
-# 'fossil addremove --test', as well as by verifying the existence of files
7
+# 'fossil addremove -n', as well as by verifying the existence of files
88
 # on the file system. 'fossil undo' is called after each test
99
 #
10
-proc revert-test {testid args} {
10
+proc revert-test {testid revertArgs expectedRevertOutput args} {
1111
 global RESULT
1212
 set passed 1
1313
14
- if {[llength $args] % 2} {
15
- set revertArgs [lindex $args 0]
16
- set args [lrange $args 1 end]
17
- } else {
18
- set revertArgs {}
19
- }
2014
 set args [dict merge {
2115
 -changes {} -addremove {} -exists {} -notexists {}
2216
 } $args]
2317
24
- fossil revert {*}$revertArgs
18
+ set result [fossil revert {*}$revertArgs]
19
+ test_status_list revert-$testid $result $expectedRevertOutput
2520
26
- set statusListTests [list -changes changes -addremove {addremove --test}]
21
+ set statusListTests [list -changes changes -addremove {addremove -n}]
2722
 foreach {key fossilArgs} $statusListTests {
2823
 set expected [dict get $args $key]
2924
 set result [fossil {*}$fossilArgs]
3025
 test_status_list revert-$testid$key $result $expected
3126
 }
@@ -68,53 +63,76 @@
6863
 file rename -force f3 f3n
6964
 fossil mv f3 f3n
7065
7166
 # Test 'fossil revert' with no arguments
7267
 #
73
-revert-test 1 -addremove {
68
+revert-test 1-1 {} {
69
+ UNMANAGE: f0
70
+ REVERTED: f1
71
+ REVERTED: f2
72
+ REVERTED: f3
73
+ DELETE: f3n
74
+} -addremove {
7475
 ADDED f0
7576
 } -exists {f0 f1 f2 f3} -notexists f3n
7677
7778
 # Test with a single filename argument
7879
 #
79
-revert-test 2 f0 -changes {
80
+revert-test 1-2 f0 {
81
+ UNMANAGE: f0
82
+} -changes {
8083
 DELETED f1
8184
 EDITED f2
8285
 RENAMED f3n
8386
 } -addremove {
8487
 ADDED f0
8588
 } -exists {f0 f2 f3n} -notexists f3
8689
87
-revert-test 3 f1 -changes {
90
+revert-test 1-3 f1 {
91
+ REVERTED: f1
92
+} -changes {
8893
 ADDED f0
8994
 EDITED f2
9095
 RENAMED f3n
9196
 } -exists {f0 f1 f2 f3n} -notexists f3
9297
93
-revert-test 4 f2 -changes {
98
+revert-test 1-4 f2 {
99
+ REVERTED: f2
100
+} -changes {
94101
 ADDED f0
95102
 DELETED f1
96103
 RENAMED f3n
97104
 } -exists {f0 f2 f3n} -notexists {f1 f3}
98105
99106
 # Both files involved in a rename are reverted regardless of which filename
100107
 # is used as an argument to 'fossil revert'
101108
 #
102
-revert-test 5 f3 -changes {
109
+revert-test 1-5 f3 {
110
+ REVERTED: f3
111
+ DELETE: f3n
112
+} -changes {
103113
 ADDED f0
104114
 DELETED f1
105115
 EDITED f2
106116
 } -exists {f0 f2 f3} -notexists {f1 f3n}
107117
108
-revert-test 6 f3n -changes {
118
+revert-test 1-6 f3n {
119
+ REVERTED: f3
120
+ DELETE: f3n
121
+} -changes {
109122
 ADDED f0
110123
 DELETED f1
111124
 EDITED f2
112125
 } -exists {f0 f2 f3} -notexists {f1 f3n}
113126
114127
 # Test with multiple filename arguments
115128
 #
116
-revert-test 7 {f0 f2 f3n} -changes {
129
+revert-test 1-7 {f0 f2 f3n} {
130
+ UNMANAGE: f0
131
+ REVERTED: f2
132
+ REVERTED: f3
133
+ DELETE: f3n
134
+} -changes {
117135
 DELETED f1
118136
 } -addremove {
119137
 ADDED f0
120138
 } -exists {f0 f2 f3} -notexists {f1 f3n}
121139
--- test/revert.test
+++ test/revert.test
@@ -2,30 +2,25 @@
2 # Tests for 'fossil revert'
3 #
4 #
5
6 # Test 'fossil revert' against expected results from 'fossil changes' and
7 # 'fossil addremove --test', as well as by verifying the existence of files
8 # on the file system. 'fossil undo' is called after each test
9 #
10 proc revert-test {testid args} {
11 global RESULT
12 set passed 1
13
14 if {[llength $args] % 2} {
15 set revertArgs [lindex $args 0]
16 set args [lrange $args 1 end]
17 } else {
18 set revertArgs {}
19 }
20 set args [dict merge {
21 -changes {} -addremove {} -exists {} -notexists {}
22 } $args]
23
24 fossil revert {*}$revertArgs
 
25
26 set statusListTests [list -changes changes -addremove {addremove --test}]
27 foreach {key fossilArgs} $statusListTests {
28 set expected [dict get $args $key]
29 set result [fossil {*}$fossilArgs]
30 test_status_list revert-$testid$key $result $expected
31 }
@@ -68,53 +63,76 @@
68 file rename -force f3 f3n
69 fossil mv f3 f3n
70
71 # Test 'fossil revert' with no arguments
72 #
73 revert-test 1 -addremove {
 
 
 
 
 
 
74 ADDED f0
75 } -exists {f0 f1 f2 f3} -notexists f3n
76
77 # Test with a single filename argument
78 #
79 revert-test 2 f0 -changes {
 
 
80 DELETED f1
81 EDITED f2
82 RENAMED f3n
83 } -addremove {
84 ADDED f0
85 } -exists {f0 f2 f3n} -notexists f3
86
87 revert-test 3 f1 -changes {
 
 
88 ADDED f0
89 EDITED f2
90 RENAMED f3n
91 } -exists {f0 f1 f2 f3n} -notexists f3
92
93 revert-test 4 f2 -changes {
 
 
94 ADDED f0
95 DELETED f1
96 RENAMED f3n
97 } -exists {f0 f2 f3n} -notexists {f1 f3}
98
99 # Both files involved in a rename are reverted regardless of which filename
100 # is used as an argument to 'fossil revert'
101 #
102 revert-test 5 f3 -changes {
 
 
 
103 ADDED f0
104 DELETED f1
105 EDITED f2
106 } -exists {f0 f2 f3} -notexists {f1 f3n}
107
108 revert-test 6 f3n -changes {
 
 
 
109 ADDED f0
110 DELETED f1
111 EDITED f2
112 } -exists {f0 f2 f3} -notexists {f1 f3n}
113
114 # Test with multiple filename arguments
115 #
116 revert-test 7 {f0 f2 f3n} -changes {
 
 
 
 
 
117 DELETED f1
118 } -addremove {
119 ADDED f0
120 } -exists {f0 f2 f3} -notexists {f1 f3n}
121
--- test/revert.test
+++ test/revert.test
@@ -2,30 +2,25 @@
2 # Tests for 'fossil revert'
3 #
4 #
5
6 # Test 'fossil revert' against expected results from 'fossil changes' and
7 # 'fossil addremove -n', as well as by verifying the existence of files
8 # on the file system. 'fossil undo' is called after each test
9 #
10 proc revert-test {testid revertArgs expectedRevertOutput args} {
11 global RESULT
12 set passed 1
13
 
 
 
 
 
 
14 set args [dict merge {
15 -changes {} -addremove {} -exists {} -notexists {}
16 } $args]
17
18 set result [fossil revert {*}$revertArgs]
19 test_status_list revert-$testid $result $expectedRevertOutput
20
21 set statusListTests [list -changes changes -addremove {addremove -n}]
22 foreach {key fossilArgs} $statusListTests {
23 set expected [dict get $args $key]
24 set result [fossil {*}$fossilArgs]
25 test_status_list revert-$testid$key $result $expected
26 }
@@ -68,53 +63,76 @@
63 file rename -force f3 f3n
64 fossil mv f3 f3n
65
66 # Test 'fossil revert' with no arguments
67 #
68 revert-test 1-1 {} {
69 UNMANAGE: f0
70 REVERTED: f1
71 REVERTED: f2
72 REVERTED: f3
73 DELETE: f3n
74 } -addremove {
75 ADDED f0
76 } -exists {f0 f1 f2 f3} -notexists f3n
77
78 # Test with a single filename argument
79 #
80 revert-test 1-2 f0 {
81 UNMANAGE: f0
82 } -changes {
83 DELETED f1
84 EDITED f2
85 RENAMED f3n
86 } -addremove {
87 ADDED f0
88 } -exists {f0 f2 f3n} -notexists f3
89
90 revert-test 1-3 f1 {
91 REVERTED: f1
92 } -changes {
93 ADDED f0
94 EDITED f2
95 RENAMED f3n
96 } -exists {f0 f1 f2 f3n} -notexists f3
97
98 revert-test 1-4 f2 {
99 REVERTED: f2
100 } -changes {
101 ADDED f0
102 DELETED f1
103 RENAMED f3n
104 } -exists {f0 f2 f3n} -notexists {f1 f3}
105
106 # Both files involved in a rename are reverted regardless of which filename
107 # is used as an argument to 'fossil revert'
108 #
109 revert-test 1-5 f3 {
110 REVERTED: f3
111 DELETE: f3n
112 } -changes {
113 ADDED f0
114 DELETED f1
115 EDITED f2
116 } -exists {f0 f2 f3} -notexists {f1 f3n}
117
118 revert-test 1-6 f3n {
119 REVERTED: f3
120 DELETE: f3n
121 } -changes {
122 ADDED f0
123 DELETED f1
124 EDITED f2
125 } -exists {f0 f2 f3} -notexists {f1 f3n}
126
127 # Test with multiple filename arguments
128 #
129 revert-test 1-7 {f0 f2 f3n} {
130 UNMANAGE: f0
131 REVERTED: f2
132 REVERTED: f3
133 DELETE: f3n
134 } -changes {
135 DELETED f1
136 } -addremove {
137 ADDED f0
138 } -exists {f0 f2 f3} -notexists {f1 f3n}
139

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button