Skip to content

Commit ba1a9f2

Browse files
authored
Use AssertJ in TransposeTest (exercism#2001)
* Use AssertJ in TransposeTest * Remove unused import * Fix checkstyle violation
1 parent 8f85fa7 commit ba1a9f2

File tree

1 file changed

+143
-153
lines changed

1 file changed

+143
-153
lines changed
Lines changed: 143 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import static org.assertj.core.api.Assertions.assertThat;
2+
13
import org.junit.Ignore;
24
import org.junit.Test;
35
import org.junit.Before;
46

5-
import static org.junit.Assert.assertEquals;
6-
77
public class TransposeTest {
88
private Transpose transpose;
99

@@ -14,206 +14,196 @@ public void setup() {
1414

1515
@Test
1616
public void emptyString() {
17-
String input = "";
18-
19-
String expected = "";
20-
21-
assertEquals(expected, transpose.transpose(input));
17+
assertThat(transpose.transpose("")).isEqualTo("");
2218
}
2319

2420
@Ignore("Remove to run test")
2521
@Test
2622
public void twoCharactersInARow() {
27-
String input = "A1";
28-
29-
String expected = "A" +
30-
"\n1";
31-
32-
assertEquals(expected, transpose.transpose(input));
23+
assertThat(transpose.transpose("A1"))
24+
.isEqualTo(
25+
"A" +
26+
"\n1");
3327
}
3428

3529
@Ignore("Remove to run test")
3630
@Test
3731
public void twoCharactersInAColumn() {
38-
String input = "A\n" +
39-
"1";
40-
41-
String expected = "A1";
42-
43-
assertEquals(expected, transpose.transpose(input));
32+
assertThat(
33+
transpose.transpose(
34+
"A\n" +
35+
"1"))
36+
.isEqualTo("A1");
4437
}
4538

4639
@Ignore("Remove to run test")
4740
@Test
4841
public void simple() {
49-
String input = "ABC\n" +
50-
"123";
51-
52-
String expected = "A1\n" +
53-
"B2\n" +
54-
"C3";
55-
56-
assertEquals(expected, transpose.transpose(input));
42+
assertThat(
43+
transpose.transpose(
44+
"ABC\n" +
45+
"123"))
46+
.isEqualTo(
47+
"A1\n" +
48+
"B2\n" +
49+
"C3");
5750
}
5851

5952
@Ignore("Remove to run test")
6053
@Test
6154
public void singleLine() {
62-
String input = "Single line.";
63-
64-
String expected = "S\n" +
65-
"i\n" +
66-
"n\n" +
67-
"g\n" +
68-
"l\n" +
69-
"e\n" +
70-
" \n" +
71-
"l\n" +
72-
"i\n" +
73-
"n\n" +
74-
"e\n" +
75-
".";
76-
77-
assertEquals(expected, transpose.transpose(input));
55+
assertThat(transpose.transpose("Single line."))
56+
.isEqualTo(
57+
"S\n" +
58+
"i\n" +
59+
"n\n" +
60+
"g\n" +
61+
"l\n" +
62+
"e\n" +
63+
" \n" +
64+
"l\n" +
65+
"i\n" +
66+
"n\n" +
67+
"e\n" +
68+
".");
7869
}
7970

8071
@Ignore("Remove to run test")
8172
@Test
8273
public void firstLineLongerThanSecondLine() {
83-
String input = "The fourth line.\n" +
84-
"The fifth line.";
85-
86-
String expected = "TT\n" +
87-
"hh\n" +
88-
"ee\n" +
89-
" \n" +
90-
"ff\n" +
91-
"oi\n" +
92-
"uf\n" +
93-
"rt\n" +
94-
"th\n" +
95-
"h \n" +
96-
" l\n" +
97-
"li\n" +
98-
"in\n" +
99-
"ne\n" +
100-
"e.\n" +
101-
".";
102-
103-
assertEquals(expected, transpose.transpose(input));
74+
assertThat(
75+
transpose.transpose(
76+
"The fourth line.\n" +
77+
"The fifth line."))
78+
.isEqualTo(
79+
"TT\n" +
80+
"hh\n" +
81+
"ee\n" +
82+
" \n" +
83+
"ff\n" +
84+
"oi\n" +
85+
"uf\n" +
86+
"rt\n" +
87+
"th\n" +
88+
"h \n" +
89+
" l\n" +
90+
"li\n" +
91+
"in\n" +
92+
"ne\n" +
93+
"e.\n" +
94+
".");
10495
}
10596

10697
@Ignore("Remove to run test")
10798
@Test
10899
public void secondLineLongerThanFirstLine() {
109-
String input = "The first line.\n" +
110-
"The second line.";
111-
112-
String expected = "TT\n" +
113-
"hh\n" +
114-
"ee\n" +
115-
" \n" +
116-
"fs\n" +
117-
"ie\n" +
118-
"rc\n" +
119-
"so\n" +
120-
"tn\n" +
121-
" d\n" +
122-
"l \n" +
123-
"il\n" +
124-
"ni\n" +
125-
"en\n" +
126-
".e\n" +
127-
" .";
128-
129-
assertEquals(expected, transpose.transpose(input));
100+
assertThat(
101+
transpose.transpose(
102+
"The first line.\n" +
103+
"The second line."))
104+
.isEqualTo(
105+
"TT\n" +
106+
"hh\n" +
107+
"ee\n" +
108+
" \n" +
109+
"fs\n" +
110+
"ie\n" +
111+
"rc\n" +
112+
"so\n" +
113+
"tn\n" +
114+
" d\n" +
115+
"l \n" +
116+
"il\n" +
117+
"ni\n" +
118+
"en\n" +
119+
".e\n" +
120+
" .");
130121
}
131122

132123
@Ignore("Remove to run test")
133124
@Test
134125
public void mixedLineLength() {
135-
String input = "The longest line.\n" +
136-
"A long line.\n" +
137-
"A longer line.\n" +
138-
"A line.";
139-
140-
String expected = "TAAA\n" +
141-
"h \n" +
142-
"elll\n" +
143-
" ooi\n" +
144-
"lnnn\n" +
145-
"ogge\n" +
146-
"n e.\n" +
147-
"glr\n" +
148-
"ei \n" +
149-
"snl\n" +
150-
"tei\n" +
151-
" .n\n" +
152-
"l e\n" +
153-
"i .\n" +
154-
"n\n" +
155-
"e\n" +
156-
".";
157-
158-
assertEquals(expected, transpose.transpose(input));
126+
assertThat(
127+
transpose.transpose(
128+
"The longest line.\n" +
129+
"A long line.\n" +
130+
"A longer line.\n" +
131+
"A line."))
132+
.isEqualTo(
133+
"TAAA\n" +
134+
"h \n" +
135+
"elll\n" +
136+
" ooi\n" +
137+
"lnnn\n" +
138+
"ogge\n" +
139+
"n e.\n" +
140+
"glr\n" +
141+
"ei \n" +
142+
"snl\n" +
143+
"tei\n" +
144+
" .n\n" +
145+
"l e\n" +
146+
"i .\n" +
147+
"n\n" +
148+
"e\n" +
149+
".");
159150
}
160151

161152
@Ignore("Remove to run test")
162153
@Test
163154
public void square() {
164-
String input = "HEART\n" +
165-
"EMBER\n" +
166-
"ABUSE\n" +
167-
"RESIN\n" +
168-
"TREND";
169-
170-
String expected = "HEART\n" +
171-
"EMBER\n" +
172-
"ABUSE\n" +
173-
"RESIN\n" +
174-
"TREND";
175-
176-
assertEquals(expected, transpose.transpose(input));
155+
assertThat(
156+
transpose.transpose(
157+
"HEART\n" +
158+
"EMBER\n" +
159+
"ABUSE\n" +
160+
"RESIN\n" +
161+
"TREND"))
162+
.isEqualTo(
163+
"HEART\n" +
164+
"EMBER\n" +
165+
"ABUSE\n" +
166+
"RESIN\n" +
167+
"TREND");
177168
}
178169

179170
@Ignore("Remove to run test")
180171
@Test
181172
public void rectangle() {
182-
String input = "FRACTURE\n" +
183-
"OUTLINED\n" +
184-
"BLOOMING\n" +
185-
"SEPTETTE";
186-
187-
String expected = "FOBS\n" +
188-
"RULE\n" +
189-
"ATOP\n" +
190-
"CLOT\n" +
191-
"TIME\n" +
192-
"UNIT\n" +
193-
"RENT\n" +
194-
"EDGE";
195-
196-
assertEquals(expected, transpose.transpose(input));
173+
assertThat(
174+
transpose.transpose(
175+
"FRACTURE\n" +
176+
"OUTLINED\n" +
177+
"BLOOMING\n" +
178+
"SEPTETTE"))
179+
.isEqualTo(
180+
"FOBS\n" +
181+
"RULE\n" +
182+
"ATOP\n" +
183+
"CLOT\n" +
184+
"TIME\n" +
185+
"UNIT\n" +
186+
"RENT\n" +
187+
"EDGE");
197188
}
198189

199190
@Ignore("Remove to run test")
200191
@Test
201192
public void triangle() {
202-
String input = "T\n" +
203-
"EE\n" +
204-
"AAA\n" +
205-
"SSSS\n" +
206-
"EEEEE\n" +
207-
"RRRRRR";
208-
209-
String expected = "TEASER\n" +
210-
" EASER\n" +
211-
" ASER\n" +
212-
" SER\n" +
213-
" ER\n" +
214-
" R";
215-
216-
assertEquals(expected, transpose.transpose(input));
193+
assertThat(
194+
transpose.transpose(
195+
"T\n" +
196+
"EE\n" +
197+
"AAA\n" +
198+
"SSSS\n" +
199+
"EEEEE\n" +
200+
"RRRRRR"))
201+
.isEqualTo(
202+
"TEASER\n" +
203+
" EASER\n" +
204+
" ASER\n" +
205+
" SER\n" +
206+
" ER\n" +
207+
" R");
217208
}
218-
219209
}

0 commit comments

Comments
 (0)