Skip to content

Commit 03d2843

Browse files
robinstrobinst
committed
Make test case more compact
1 parent 42a025f commit 03d2843

File tree

1 file changed

+100
-207
lines changed

1 file changed

+100
-207
lines changed

‎commonmark/src/test/java/org/commonmark/test/TextContentRendererTest.java‎

Lines changed: 100 additions & 207 deletions
Original file line numberDiff line numberDiff line change
@@ -12,261 +12,144 @@ public class TextContentRendererTest {
1212

1313
@Test
1414
public void textContentText() {
15-
String source;
16-
String rendered;
15+
String s;
16+
17+
s = "foo bar";
18+
assertCompact(s, "foo bar");
19+
assertStripped(s, "foo bar");
1720

18-
source = "foo bar";
19-
rendered = defaultRenderer(source);
20-
assertEquals("foo bar", rendered);
21-
rendered = strippedRenderer(source);
22-
assertEquals("foo bar", rendered);
23-
24-
source = "foo foo\n\nbar\nbar";
25-
rendered = defaultRenderer(source);
26-
assertEquals("foo foo\nbar\nbar", rendered);
27-
rendered = strippedRenderer(source);
28-
assertEquals("foo foo bar bar", rendered);
21+
s = "foo foo\n\nbar\nbar";
22+
assertCompact(s, "foo foo\nbar\nbar");
23+
assertStripped(s, "foo foo bar bar");
2924
}
3025

3126
@Test
3227
public void textContentEmphasis() {
33-
String source;
28+
String s;
3429
String rendered;
3530

36-
source = "***foo***";
37-
rendered = defaultRenderer(source, defaultRenderer());
38-
assertEquals("foo", rendered);
39-
rendered = strippedRenderer(source);
40-
assertEquals("foo", rendered);
41-
42-
source = "foo ***foo*** bar ***bar***";
43-
rendered = defaultRenderer(source);
44-
assertEquals("foo foo bar bar", rendered);
45-
rendered = strippedRenderer(source);
46-
assertEquals("foo foo bar bar", rendered);
47-
48-
source = "foo\n***foo***\nbar\n\n***bar***";
49-
rendered = defaultRenderer(source);
50-
assertEquals("foo\nfoo\nbar\nbar", rendered);
51-
rendered = strippedRenderer(source);
52-
assertEquals("foo foo bar bar", rendered);
53-
}
31+
s = "***foo***";
32+
assertCompact(s, "foo");
33+
assertStripped(s, "foo");
5434

55-
private String defaultRenderer(String source, TextContentRenderer textContentRenderer) {
56-
String rendered;
57-
rendered = textContentRenderer.render(parse(source));
58-
return rendered;
35+
s = "foo ***foo*** bar ***bar***";
36+
assertCompact(s, "foo foo bar bar");
37+
assertStripped(s, "foo foo bar bar");
38+
39+
s = "foo\n***foo***\nbar\n\n***bar***";
40+
assertCompact(s, "foo\nfoo\nbar\nbar");
41+
assertStripped(s, "foo foo bar bar");
5942
}
6043

6144
@Test
6245
public void textContentQuotes() {
63-
String source;
64-
String rendered;
46+
String s;
6547

66-
source = "foo\n>foo\nbar\n\nbar";
67-
rendered = defaultRenderer(source);
68-
assertEquals("foo\n«foo\nbar»\nbar", rendered);
69-
rendered = strippedRenderer(source);
70-
assertEquals("foo «foo bar» bar", rendered);
48+
s = "foo\n>foo\nbar\n\nbar";
49+
assertCompact(s, "foo\n«foo\nbar»\nbar");
50+
assertStripped(s, "foo «foo bar» bar");
7151
}
7252

7353
@Test
7454
public void textContentLinks() {
75-
String source;
76-
String expected;
77-
String rendered;
78-
79-
source = "foo [text](http://link \"title\") bar";
80-
expected = "foo \"text\" (title: http://link) bar";
81-
rendered = defaultRenderer(source);
82-
assertEquals(expected, rendered);
83-
rendered = strippedRenderer(source);
84-
assertEquals(expected, rendered);
85-
86-
source = "foo [text](http://link \"http://link\") bar";
87-
expected = "foo \"text\" (http://link) bar";
88-
rendered = defaultRenderer(source);
89-
assertEquals(expected, rendered);
90-
rendered = strippedRenderer(source);
91-
assertEquals(expected, rendered);
92-
93-
source = "foo [text](http://link) bar";
94-
expected = "foo \"text\" (http://link) bar";
95-
rendered = defaultRenderer(source);
96-
assertEquals(expected, rendered);
97-
rendered = strippedRenderer(source);
98-
assertEquals(expected, rendered);
99-
100-
source = "foo [text]() bar";
101-
expected = "foo \"text\" bar";
102-
rendered = defaultRenderer(source);
103-
assertEquals(expected, rendered);
104-
rendered = strippedRenderer(source);
105-
assertEquals(expected, rendered);
106-
107-
source = "foo http://link bar";
108-
expected = "foo http://link bar";
109-
rendered = defaultRenderer(source);
110-
assertEquals(expected, rendered);
111-
rendered = strippedRenderer(source);
112-
assertEquals(expected, rendered);
55+
assertAll("foo [text](http://link \"title\") bar", "foo \"text\" (title: http://link) bar");
56+
assertAll("foo [text](http://link \"http://link\") bar", "foo \"text\" (http://link) bar");
57+
assertAll("foo [text](http://link) bar", "foo \"text\" (http://link) bar");
58+
assertAll("foo [text]() bar", "foo \"text\" bar");
59+
assertAll("foo http://link bar", "foo http://link bar");
11360
}
11461

11562
@Test
11663
public void textContentImages() {
117-
String source;
118-
String expected;
119-
String rendered;
120-
121-
source = "foo ![text](http://link \"title\") bar";
122-
expected = "foo \"text\" (title: http://link) bar";
123-
rendered = defaultRenderer(source);
124-
assertEquals(expected, rendered);
125-
rendered = strippedRenderer(source);
126-
assertEquals(expected, rendered);
127-
128-
source = "foo ![text](http://link) bar";
129-
expected = "foo \"text\" (http://link) bar";
130-
rendered = defaultRenderer(source);
131-
assertEquals(expected, rendered);
132-
rendered = strippedRenderer(source);
133-
assertEquals(expected, rendered);
134-
135-
source = "foo ![text]() bar";
136-
expected = "foo \"text\" bar";
137-
rendered = defaultRenderer(source);
138-
assertEquals(expected, rendered);
139-
rendered = strippedRenderer(source);
140-
assertEquals(expected, rendered);
64+
assertAll("foo ![text](http://link \"title\") bar", "foo \"text\" (title: http://link) bar");
65+
assertAll("foo ![text](http://link) bar", "foo \"text\" (http://link) bar");
66+
assertAll("foo ![text]() bar", "foo \"text\" bar");
14167
}
14268

14369
@Test
14470
public void textContentLists() {
145-
String source;
146-
String rendered;
71+
String s;
72+
73+
s = "foo\n* foo\n* bar\n\nbar";
74+
assertCompact(s, "foo\n* foo\n* bar\nbar");
75+
assertStripped(s, "foo foo bar bar");
76+
77+
s = "foo\n- foo\n- bar\n\nbar";
78+
assertCompact(s, "foo\n- foo\n- bar\nbar");
79+
assertStripped(s, "foo foo bar bar");
80+
81+
s = "foo\n1. foo\n2. bar\n\nbar";
82+
assertCompact(s, "foo\n1. foo\n2. bar\nbar");
83+
assertStripped(s, "foo 1. foo 2. bar bar");
14784

148-
source = "foo\n* foo\n* bar\n\nbar";
149-
rendered = defaultRenderer(source);
150-
assertEquals("foo\n* foo\n* bar\nbar", rendered);
151-
rendered = strippedRenderer(source);
152-
assertEquals("foo foo bar bar", rendered);
153-
154-
source = "foo\n- foo\n- bar\n\nbar";
155-
rendered = defaultRenderer(source);
156-
assertEquals("foo\n- foo\n- bar\nbar", rendered);
157-
rendered = strippedRenderer(source);
158-
assertEquals("foo foo bar bar", rendered);
159-
160-
source = "foo\n1. foo\n2. bar\n\nbar";
161-
rendered = defaultRenderer(source);
162-
assertEquals("foo\n1. foo\n2. bar\nbar", rendered);
163-
rendered = strippedRenderer(source);
164-
assertEquals("foo 1. foo 2. bar bar", rendered);
165-
166-
source = "foo\n0) foo\n1) bar\n\nbar";
167-
rendered = defaultRenderer(source);
168-
assertEquals("foo\n0) foo\n1) bar\nbar", rendered);
169-
rendered = strippedRenderer(source);
170-
assertEquals("foo 0) foo 1) bar bar", rendered);
171-
172-
source = "bar\n1. foo\n 1. bar\n2. foo";
173-
rendered = defaultRenderer(source);
174-
assertEquals("bar\n1. foo\n 1. bar\n2. foo", rendered);
175-
rendered = strippedRenderer(source);
176-
assertEquals("bar 1. foo 1. bar 2. foo", rendered);
177-
178-
source = "bar\n* foo\n - bar\n* foo";
179-
rendered = defaultRenderer(source);
180-
assertEquals("bar\n* foo\n - bar\n* foo", rendered);
181-
rendered = strippedRenderer(source);
182-
assertEquals("bar foo bar foo", rendered);
183-
184-
source = "bar\n* foo\n 1. bar\n 2. bar\n* foo";
185-
rendered = defaultRenderer(source);
186-
assertEquals("bar\n* foo\n 1. bar\n 2. bar\n* foo", rendered);
187-
rendered = strippedRenderer(source);
188-
assertEquals("bar foo 1. bar 2. bar foo", rendered);
189-
190-
source = "bar\n1. foo\n * bar\n * bar\n2. foo";
191-
rendered = defaultRenderer(source);
192-
assertEquals("bar\n1. foo\n * bar\n * bar\n2. foo", rendered);
193-
rendered = strippedRenderer(source);
194-
assertEquals("bar 1. foo bar bar 2. foo", rendered);
85+
s = "foo\n0) foo\n1) bar\n\nbar";
86+
assertCompact(s, "foo\n0) foo\n1) bar\nbar");
87+
assertStripped(s, "foo 0) foo 1) bar bar");
88+
89+
s = "bar\n1. foo\n 1. bar\n2. foo";
90+
assertCompact(s, "bar\n1. foo\n 1. bar\n2. foo");
91+
assertStripped(s, "bar 1. foo 1. bar 2. foo");
92+
93+
s = "bar\n* foo\n - bar\n* foo";
94+
assertCompact(s, "bar\n* foo\n - bar\n* foo");
95+
assertStripped(s, "bar foo bar foo");
96+
97+
s = "bar\n* foo\n 1. bar\n 2. bar\n* foo";
98+
assertCompact(s, "bar\n* foo\n 1. bar\n 2. bar\n* foo");
99+
assertStripped(s, "bar foo 1. bar 2. bar foo");
100+
101+
s = "bar\n1. foo\n * bar\n * bar\n2. foo";
102+
assertCompact(s, "bar\n1. foo\n * bar\n * bar\n2. foo");
103+
assertStripped(s, "bar 1. foo bar bar 2. foo");
195104
}
196105

197106
@Test
198107
public void textContentCode() {
199-
String source;
200-
String expected;
201-
String rendered;
202-
203-
source = "foo `code` bar";
204-
expected = "foo \"code\" bar";
205-
rendered = defaultRenderer(source);
206-
assertEquals(expected, rendered);
207-
rendered = strippedRenderer(source);
208-
assertEquals(expected, rendered);
108+
assertAll("foo `code` bar", "foo \"code\" bar");
209109
}
210110

211111
@Test
212112
public void textContentCodeBlock() {
213-
String source;
214-
String rendered;
113+
String s;
114+
s = "foo\n```\nfoo\nbar\n```\nbar";
115+
assertCompact(s, "foo\nfoo\nbar\nbar");
116+
assertStripped(s, "foo foo bar bar");
215117

216-
source = "foo\n```\nfoo\nbar\n```\nbar";
217-
rendered = defaultRenderer(source);
218-
assertEquals("foo\nfoo\nbar\nbar", rendered);
219-
rendered = strippedRenderer(source);
220-
assertEquals("foo foo bar bar", rendered);
221-
222-
source = "foo\n\n foo\n bar\nbar";
223-
rendered = defaultRenderer(source);
224-
assertEquals("foo\nfoo\n bar\nbar", rendered);
225-
rendered = strippedRenderer(source);
226-
assertEquals("foo foo bar bar", rendered);
118+
s = "foo\n\n foo\n bar\nbar";
119+
assertCompact(s, "foo\nfoo\n bar\nbar");
120+
assertStripped(s, "foo foo bar bar");
227121
}
228122

229123
@Test
230-
public void textContentBrakes() {
231-
String source;
232-
String rendered;
124+
public void textContentBreaks() {
125+
String s;
126+
127+
s = "foo\nbar";
128+
assertCompact(s, "foo\nbar");
129+
assertStripped(s, "foo bar");
130+
131+
s = "foo \nbar";
132+
assertCompact(s, "foo\nbar");
133+
assertStripped(s, "foo bar");
233134

234-
source = "foo\nbar";
235-
rendered = defaultRenderer(source);
236-
assertEquals("foo\nbar", rendered);
237-
rendered = strippedRenderer(source);
238-
assertEquals("foo bar", rendered);
239-
240-
source = "foo \nbar";
241-
rendered = defaultRenderer(source);
242-
assertEquals("foo\nbar", rendered);
243-
rendered = strippedRenderer(source);
244-
assertEquals("foo bar", rendered);
245-
246-
source = "foo\n___\nbar";
247-
rendered = defaultRenderer(source);
248-
assertEquals("foo\n***\nbar", rendered);
249-
rendered = strippedRenderer(source);
250-
assertEquals("foo bar", rendered);
135+
s = "foo\n___\nbar";
136+
assertCompact(s, "foo\n***\nbar");
137+
assertStripped(s, "foo bar");
251138
}
252139

253140
@Test
254141
public void textContentHtml() {
255-
String rendered;
256-
257142
String html = "<table>\n" +
258143
" <tr>\n" +
259144
" <td>\n" +
260145
" foobar\n" +
261146
" </td>\n" +
262147
" </tr>\n" +
263148
"</table>";
264-
rendered = defaultRenderer(html);
265-
assertEquals(html, rendered);
149+
assertCompact(html, html);
266150

267151
html = "foo <foo>foobar</foo> bar";
268-
rendered = defaultRenderer(html);
269-
assertEquals(html, rendered);
152+
assertCompact(html, html);
270153
}
271154

272155
private TextContentRenderer defaultRenderer() {
@@ -280,12 +163,22 @@ private TextContentRenderer strippedRenderer() {
280163
private Node parse(String source) {
281164
return Parser.builder().build().parse(source);
282165
}
166+
167+
private void assertCompact(String source, String expected) {
168+
var doc = parse(source);
169+
var actualRendering = defaultRenderer().render(doc);
170+
Asserts.assertRendering(source, expected, actualRendering);
171+
}
283172

284-
private String strippedRenderer(String source) {
285-
return strippedRenderer().render(parse(source));
173+
private void assertStripped(String source, String expected) {
174+
var doc = parse(source);
175+
var actualRendering = strippedRenderer().render(doc);
176+
Asserts.assertRendering(source, expected, actualRendering);
286177
}
287178

288-
private String defaultRenderer(String source) {
289-
return defaultRenderer().render(parse(source));
179+
private void assertAll(String source, String expected) {
180+
assertCompact(source, expected);
181+
assertStripped(source, expected);
182+
// TODO
290183
}
291184
}

0 commit comments

Comments
 (0)