Skip to content

Commit ab3da37

Browse files
adam-singeradam-singer
committed
refactor unit tests structure
1 parent f61fe32 commit ab3da37

File tree

3 files changed

+189
-165
lines changed

3 files changed

+189
-165
lines changed

‎test/src/diff3_set_test.dart‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
library diff3_set_test;
2+
3+
import "package:unittest/unittest.dart";
4+
5+
import "package:diff/diff.dart";
6+
7+
void defineTests() {
8+
group('diff3Set', () {
9+
test('sort file1offset not equal', () {
10+
List<diff3Set> hunks = new List<diff3Set>();
11+
diff3Set s1 = new diff3Set();
12+
s1..side = Side.Conflict
13+
..file1length = 1
14+
..file1offset = 1
15+
..file2length = 1
16+
..file2offset = 1;
17+
18+
diff3Set s2 = new diff3Set();
19+
s2..side = Side.Left
20+
..file1length = 2
21+
..file1offset = 2
22+
..file2length = 2
23+
..file2offset = 2;
24+
25+
hunks.add(s2);
26+
hunks.add(s1);
27+
28+
hunks.sort();
29+
30+
expect(hunks[0], equals(s1));
31+
expect(hunks[1], equals(s2));
32+
33+
});
34+
35+
test('sort file1offset equal, s2 greater then s1', () {
36+
List<diff3Set> hunks = new List<diff3Set>();
37+
diff3Set s1 = new diff3Set();
38+
s1..side = Side.Conflict
39+
..file1length = 1
40+
..file1offset = 1
41+
..file2length = 1
42+
..file2offset = 1;
43+
44+
diff3Set s2 = new diff3Set();
45+
s2..side = Side.Left
46+
..file1length = 2
47+
..file1offset = 1
48+
..file2length = 2
49+
..file2offset = 2;
50+
51+
hunks.add(s2);
52+
hunks.add(s1);
53+
54+
hunks.sort();
55+
56+
expect(hunks[0], equals(s1));
57+
expect(hunks[1], equals(s2));
58+
});
59+
60+
test('sort file1offset equal, s1 greater then s2', () {
61+
List<diff3Set> hunks = new List<diff3Set>();
62+
diff3Set s1 = new diff3Set();
63+
s1..side = Side.Left
64+
..file1length = 1
65+
..file1offset = 1
66+
..file2length = 1
67+
..file2offset = 1;
68+
69+
diff3Set s2 = new diff3Set();
70+
s2..side = Side.Conflict
71+
..file1length = 2
72+
..file1offset = 1
73+
..file2length = 2
74+
..file2offset = 2;
75+
76+
hunks.add(s2);
77+
hunks.add(s1);
78+
79+
hunks.sort();
80+
81+
expect(hunks[0], equals(s2));
82+
expect(hunks[1], equals(s1));
83+
});
84+
85+
test('sort file1offset equal, s1 equal s2', () {
86+
List<diff3Set> hunks = new List<diff3Set>();
87+
diff3Set s1 = new diff3Set();
88+
s1..side = Side.Left
89+
..file1length = 1
90+
..file1offset = 1
91+
..file2length = 1
92+
..file2offset = 1;
93+
94+
diff3Set s2 = new diff3Set();
95+
s2..side = Side.Left
96+
..file1length = 2
97+
..file1offset = 1
98+
..file2length = 2
99+
..file2offset = 2;
100+
101+
hunks.add(s2);
102+
hunks.add(s1);
103+
104+
hunks.sort();
105+
106+
expect(hunks[0], equals(s2));
107+
expect(hunks[1], equals(s1));
108+
});
109+
110+
test('sort file1offset equal, sort multiple by Side', () {
111+
List<diff3Set> hunks = new List<diff3Set>();
112+
diff3Set s1 = new diff3Set();
113+
s1..side = Side.Conflict
114+
..file1length = 1
115+
..file1offset = 1
116+
..file2length = 1
117+
..file2offset = 1;
118+
119+
diff3Set s2 = new diff3Set();
120+
s2..side = Side.Old
121+
..file1length = 2
122+
..file1offset = 1
123+
..file2length = 2
124+
..file2offset = 2;
125+
126+
diff3Set s3 = new diff3Set();
127+
s3..side = Side.Right
128+
..file1length = 2
129+
..file1offset = 1
130+
..file2length = 2
131+
..file2offset = 2;
132+
133+
134+
hunks.add(s2);
135+
hunks.add(s3);
136+
hunks.add(s1);
137+
138+
hunks.sort();
139+
140+
expect(hunks[0], equals(s1));
141+
expect(hunks[1], equals(s2));
142+
expect(hunks[2], equals(s3));
143+
});
144+
});
145+
}
146+
147+
void main() {
148+
defineTests();
149+
}

‎test/src/side_enum_test.dart‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
library side_enum_test;
2+
3+
import "package:unittest/unittest.dart";
4+
5+
import "package:diff/diff.dart";
6+
7+
void defineTests() {
8+
group('Side', () {
9+
test('enum compare', () {
10+
Side conflict = Side.Conflict;
11+
Side left = Side.Left;
12+
int i = conflict.compareTo(left);
13+
expect(i, equals(-1));
14+
15+
conflict = Side.Conflict;
16+
left = Side.Left;
17+
i = left.compareTo(conflict);
18+
expect(i, equals(1));
19+
20+
conflict = Side.Conflict;
21+
Side conflict2 = Side.Conflict;
22+
i = conflict.compareTo(conflict2);
23+
expect(i, equals(0));
24+
});
25+
26+
test('enum equal', () {
27+
Side conflict = Side.Conflict;
28+
expect(conflict, equals(Side.Conflict));
29+
});
30+
});
31+
}
32+
33+
void main() {
34+
defineTests();
35+
}

‎test/test_runner.dart‎

Lines changed: 5 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,9 @@
11
library test_runner;
22

3-
import "package:unittest/unittest.dart";
4-
5-
import "package:diff/diff.dart";
6-
7-
tests() {
8-
test('Side enum compare', () {
9-
Side conflict = Side.Conflict;
10-
Side left = Side.Left;
11-
int i = conflict.compareTo(left);
12-
expect(i, equals(-1));
13-
14-
conflict = Side.Conflict;
15-
left = Side.Left;
16-
i = left.compareTo(conflict);
17-
expect(i, equals(1));
18-
19-
conflict = Side.Conflict;
20-
Side conflict2 = Side.Conflict;
21-
i = conflict.compareTo(conflict2);
22-
expect(i, equals(0));
23-
});
24-
25-
test('Side enum equal', () {
26-
Side conflict = Side.Conflict;
27-
expect(conflict, equals(Side.Conflict));
28-
});
29-
30-
test('diff3Set sort file1offset not equal', () {
31-
List<diff3Set> hunks = new List<diff3Set>();
32-
diff3Set s1 = new diff3Set();
33-
s1..side = Side.Conflict
34-
..file1length = 1
35-
..file1offset = 1
36-
..file2length = 1
37-
..file2offset = 1;
38-
39-
diff3Set s2 = new diff3Set();
40-
s2..side = Side.Left
41-
..file1length = 2
42-
..file1offset = 2
43-
..file2length = 2
44-
..file2offset = 2;
45-
46-
hunks.add(s2);
47-
hunks.add(s1);
48-
49-
hunks.sort();
50-
51-
expect(hunks[0], equals(s1));
52-
expect(hunks[1], equals(s2));
53-
54-
});
55-
56-
test('diff3Set sort file1offset equal, s2 greater then s1', () {
57-
List<diff3Set> hunks = new List<diff3Set>();
58-
diff3Set s1 = new diff3Set();
59-
s1..side = Side.Conflict
60-
..file1length = 1
61-
..file1offset = 1
62-
..file2length = 1
63-
..file2offset = 1;
64-
65-
diff3Set s2 = new diff3Set();
66-
s2..side = Side.Left
67-
..file1length = 2
68-
..file1offset = 1
69-
..file2length = 2
70-
..file2offset = 2;
71-
72-
hunks.add(s2);
73-
hunks.add(s1);
74-
75-
hunks.sort();
76-
77-
expect(hunks[0], equals(s1));
78-
expect(hunks[1], equals(s2));
79-
});
80-
81-
test('diff3Set sort file1offset equal, s1 greater then s2', () {
82-
List<diff3Set> hunks = new List<diff3Set>();
83-
diff3Set s1 = new diff3Set();
84-
s1..side = Side.Left
85-
..file1length = 1
86-
..file1offset = 1
87-
..file2length = 1
88-
..file2offset = 1;
89-
90-
diff3Set s2 = new diff3Set();
91-
s2..side = Side.Conflict
92-
..file1length = 2
93-
..file1offset = 1
94-
..file2length = 2
95-
..file2offset = 2;
96-
97-
hunks.add(s2);
98-
hunks.add(s1);
99-
100-
hunks.sort();
101-
102-
expect(hunks[0], equals(s2));
103-
expect(hunks[1], equals(s1));
104-
});
105-
106-
test('diff3Set sort file1offset equal, s1 equal s2', () {
107-
List<diff3Set> hunks = new List<diff3Set>();
108-
diff3Set s1 = new diff3Set();
109-
s1..side = Side.Left
110-
..file1length = 1
111-
..file1offset = 1
112-
..file2length = 1
113-
..file2offset = 1;
114-
115-
diff3Set s2 = new diff3Set();
116-
s2..side = Side.Left
117-
..file1length = 2
118-
..file1offset = 1
119-
..file2length = 2
120-
..file2offset = 2;
121-
122-
hunks.add(s2);
123-
hunks.add(s1);
124-
125-
hunks.sort();
126-
127-
expect(hunks[0], equals(s2));
128-
expect(hunks[1], equals(s1));
129-
});
130-
131-
test('diff3Set sort file1offset equal, sort multiple by Side', () {
132-
List<diff3Set> hunks = new List<diff3Set>();
133-
diff3Set s1 = new diff3Set();
134-
s1..side = Side.Conflict
135-
..file1length = 1
136-
..file1offset = 1
137-
..file2length = 1
138-
..file2offset = 1;
139-
140-
diff3Set s2 = new diff3Set();
141-
s2..side = Side.Old
142-
..file1length = 2
143-
..file1offset = 1
144-
..file2length = 2
145-
..file2offset = 2;
146-
147-
diff3Set s3 = new diff3Set();
148-
s3..side = Side.Right
149-
..file1length = 2
150-
..file1offset = 1
151-
..file2length = 2
152-
..file2offset = 2;
153-
154-
155-
hunks.add(s2);
156-
hunks.add(s3);
157-
hunks.add(s1);
158-
159-
hunks.sort();
160-
161-
expect(hunks[0], equals(s1));
162-
expect(hunks[1], equals(s2));
163-
expect(hunks[2], equals(s3));
164-
});
165-
}
3+
import "src/side_enum_test.dart" as side_enum_test;
4+
import "src/diff3_set_test.dart" as diff3_set_test;
1665

1676
void main() {
168-
tests();
169-
}
7+
side_enum_test.main();
8+
diff3_set_test.main();
9+
}

0 commit comments

Comments
 (0)