Skip to content

Commit 6ceefe7

Browse files
m-dzianishchytsm-dzianishchyts
committed
Simplify with static imports
1 parent c687b2e commit 6ceefe7

File tree

8 files changed

+138
-127
lines changed

8 files changed

+138
-127
lines changed

‎jupyter-jvm-basekernel/src/test/java/org/dflib/jjava/jupyter/kernel/display/RenderRequestTypesResolutionTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.dflib.jjava.jupyter.kernel.display;
22

33
import org.dflib.jjava.jupyter.kernel.display.mime.MIMEType;
4-
import org.junit.jupiter.api.Assertions;
54
import org.junit.jupiter.params.ParameterizedTest;
65
import org.junit.jupiter.params.provider.Arguments;
76
import org.junit.jupiter.params.provider.MethodSource;
87

98
import java.util.List;
109
import java.util.stream.Stream;
1110

11+
import static org.junit.jupiter.api.Assertions.assertEquals;
12+
1213
public class RenderRequestTypesResolutionTest {
1314

1415
@ParameterizedTest
@@ -33,7 +34,7 @@ public void test(String supported, String expected, List<String> requestTypes) {
3334

3435
MIMEType actualMime = renderRequestTypes.resolveSupportedType(supportedMime);
3536

36-
Assertions.assertEquals(expectedMime, actualMime);
37+
assertEquals(expectedMime, actualMime);
3738
}
3839

3940
public static Stream<Arguments> data() {

‎jupyter-jvm-basekernel/src/test/java/org/dflib/jjava/jupyter/kernel/display/RendererTest.java

Lines changed: 80 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.dflib.jjava.jupyter.kernel.display;
22

33
import org.dflib.jjava.jupyter.kernel.display.mime.MIMEType;
4-
import org.junit.jupiter.api.Assertions;
54
import org.junit.jupiter.api.BeforeEach;
65
import org.junit.jupiter.api.Test;
76

@@ -10,6 +9,9 @@
109
import java.util.LinkedHashSet;
1110
import java.util.Set;
1211

12+
import static org.junit.jupiter.api.Assertions.assertEquals;
13+
import static org.junit.jupiter.api.Assertions.assertNull;
14+
1315
class RendererTest {
1416
private Renderer renderer;
1517

@@ -51,227 +53,227 @@ public void setUp() {
5153
void rendersPlainText() {
5254
DisplayData data = this.renderer.render(new A());
5355

54-
Assertions.assertEquals("A", data.getData(MIMEType.TEXT_PLAIN));
56+
assertEquals("A", data.getData(MIMEType.TEXT_PLAIN));
5557
}
5658

5759
@Test
5860
void alwaysRendersPlainText() {
5961
DisplayData data = this.renderer.render(new B());
6062

61-
Assertions.assertEquals("B", data.getData(MIMEType.TEXT_PLAIN));
63+
assertEquals("B", data.getData(MIMEType.TEXT_PLAIN));
6264
}
6365

6466
@Test
6567
void rendersPreferred() {
6668
DisplayData data = this.renderer.render(new B());
6769

68-
Assertions.assertEquals("**B**", data.getData(MIMEType.TEXT_MARKDOWN));
70+
assertEquals("**B**", data.getData(MIMEType.TEXT_MARKDOWN));
6971
}
7072

7173
@Test
7274
void rendersJustPreferred() {
7375
DisplayData data = this.renderer.render(new C());
7476

75-
Assertions.assertEquals(".c{}", data.getData(MIMEType.TEXT_CSS));
76-
Assertions.assertEquals("C", data.getData(MIMEType.TEXT_PLAIN));
77-
Assertions.assertNull(data.getData(MIMEType.TEXT_MARKDOWN));
77+
assertEquals(".c{}", data.getData(MIMEType.TEXT_CSS));
78+
assertEquals("C", data.getData(MIMEType.TEXT_PLAIN));
79+
assertNull(data.getData(MIMEType.TEXT_MARKDOWN));
7880
}
7981

8082
@Test
8183
void rendersExternal() {
8284
DisplayData data = this.renderer.render(new D());
8385

84-
Assertions.assertEquals("<d></d>", data.getData(MIMEType.TEXT_HTML));
85-
Assertions.assertEquals("D", data.getData(MIMEType.TEXT_PLAIN));
86-
Assertions.assertNull(data.getData(MIMEType.TEXT_LATEX));
86+
assertEquals("<d></d>", data.getData(MIMEType.TEXT_HTML));
87+
assertEquals("D", data.getData(MIMEType.TEXT_PLAIN));
88+
assertNull(data.getData(MIMEType.TEXT_LATEX));
8789
}
8890

8991
@Test
9092
void rendersAs() {
9193
DisplayData data = this.renderer.renderAs(new C(), "text/markdown");
9294

93-
Assertions.assertEquals("**C**", data.getData(MIMEType.TEXT_MARKDOWN));
94-
Assertions.assertEquals("C", data.getData(MIMEType.TEXT_PLAIN));
95-
Assertions.assertNull(data.getData(MIMEType.TEXT_CSS));
95+
assertEquals("**C**", data.getData(MIMEType.TEXT_MARKDOWN));
96+
assertEquals("C", data.getData(MIMEType.TEXT_PLAIN));
97+
assertNull(data.getData(MIMEType.TEXT_CSS));
9698
}
9799

98100
@Test
99101
void rendersAsExternal() {
100102
DisplayData data = this.renderer.renderAs(new D(), "text/latex");
101103

102-
Assertions.assertEquals("\\d", data.getData(MIMEType.TEXT_LATEX));
103-
Assertions.assertEquals("D", data.getData(MIMEType.TEXT_PLAIN));
104-
Assertions.assertNull(data.getData(MIMEType.TEXT_HTML));
104+
assertEquals("\\d", data.getData(MIMEType.TEXT_LATEX));
105+
assertEquals("D", data.getData(MIMEType.TEXT_PLAIN));
106+
assertNull(data.getData(MIMEType.TEXT_HTML));
105107
}
106108

107109
@Test
108110
void supportsPreferringAll() {
109111
DisplayData data = this.renderer.render(new E());
110112

111-
Assertions.assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
112-
Assertions.assertEquals(".e{}", data.getData(MIMEType.TEXT_CSS));
113-
Assertions.assertEquals("e();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
114-
Assertions.assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
113+
assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
114+
assertEquals(".e{}", data.getData(MIMEType.TEXT_CSS));
115+
assertEquals("e();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
116+
assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
115117
}
116118

117119
@Test
118120
void supportsPreferringAllExternal() {
119121
DisplayData data = this.renderer.render(new F());
120122

121-
Assertions.assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
122-
Assertions.assertEquals(".f{}", data.getData(MIMEType.TEXT_CSS));
123-
Assertions.assertEquals("f();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
124-
Assertions.assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
123+
assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
124+
assertEquals(".f{}", data.getData(MIMEType.TEXT_CSS));
125+
assertEquals("f();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
126+
assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
125127
}
126128

127129
@Test
128130
void supportsPreferringAllRequestingAll() {
129131
DisplayData data = this.renderer.renderAs(new E(), "*");
130132

131-
Assertions.assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
132-
Assertions.assertEquals(".e{}", data.getData(MIMEType.TEXT_CSS));
133-
Assertions.assertEquals("e();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
134-
Assertions.assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
133+
assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
134+
assertEquals(".e{}", data.getData(MIMEType.TEXT_CSS));
135+
assertEquals("e();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
136+
assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
135137
}
136138

137139
@Test
138140
void supportsPreferringAllRequestingAllExternal() {
139141
DisplayData data = this.renderer.renderAs(new F(), "*");
140142

141-
Assertions.assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
142-
Assertions.assertEquals(".f{}", data.getData(MIMEType.TEXT_CSS));
143-
Assertions.assertEquals("f();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
144-
Assertions.assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
143+
assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
144+
assertEquals(".f{}", data.getData(MIMEType.TEXT_CSS));
145+
assertEquals("f();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
146+
assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
145147
}
146148

147149
@Test
148150
void supportsPreferringAllRequestingSome() {
149151
DisplayData data = this.renderer.renderAs(new E(), "text/html");
150152

151-
Assertions.assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
152-
Assertions.assertNull(data.getData(MIMEType.TEXT_CSS));
153-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
154-
Assertions.assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
153+
assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
154+
assertNull(data.getData(MIMEType.TEXT_CSS));
155+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
156+
assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
155157
}
156158

157159
@Test
158160
void supportsPreferringAllRequestingSomeExternal() {
159161
DisplayData data = this.renderer.renderAs(new F(), "text/html");
160162

161-
Assertions.assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
162-
Assertions.assertNull(data.getData(MIMEType.TEXT_CSS));
163-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
164-
Assertions.assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
163+
assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
164+
assertNull(data.getData(MIMEType.TEXT_CSS));
165+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
166+
assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
165167
}
166168

167169
@Test
168170
void supportsPreferringAllRequestingGroup() {
169171
DisplayData data = this.renderer.renderAs(new E(), "text/*");
170172

171-
Assertions.assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
172-
Assertions.assertEquals(".e{}", data.getData(MIMEType.TEXT_CSS));
173-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
174-
Assertions.assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
173+
assertEquals("<e></e>", data.getData(MIMEType.TEXT_HTML));
174+
assertEquals(".e{}", data.getData(MIMEType.TEXT_CSS));
175+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
176+
assertEquals("E", data.getData(MIMEType.TEXT_PLAIN));
175177
}
176178

177179
@Test
178180
void supportsPreferringAllRequestingGroupExternal() {
179181
DisplayData data = this.renderer.renderAs(new F(), "text/*");
180182

181-
Assertions.assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
182-
Assertions.assertEquals(".f{}", data.getData(MIMEType.TEXT_CSS));
183-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
184-
Assertions.assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
183+
assertEquals("<f></f>", data.getData(MIMEType.TEXT_HTML));
184+
assertEquals(".f{}", data.getData(MIMEType.TEXT_CSS));
185+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
186+
assertEquals("F", data.getData(MIMEType.TEXT_PLAIN));
185187
}
186188

187189
@Test
188190
void supportsPreferringGroup() {
189191
DisplayData data = this.renderer.render(new G());
190192

191-
Assertions.assertEquals("<g></g>", data.getData(MIMEType.TEXT_HTML));
192-
Assertions.assertEquals(".g{}", data.getData(MIMEType.TEXT_CSS));
193-
Assertions.assertEquals("g();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
194-
Assertions.assertEquals("G", data.getData(MIMEType.TEXT_PLAIN));
193+
assertEquals("<g></g>", data.getData(MIMEType.TEXT_HTML));
194+
assertEquals(".g{}", data.getData(MIMEType.TEXT_CSS));
195+
assertEquals("g();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
196+
assertEquals("G", data.getData(MIMEType.TEXT_PLAIN));
195197
}
196198

197199
@Test
198200
void supportsPreferringGroupExternal() {
199201
DisplayData data = this.renderer.render(new H());
200202

201-
Assertions.assertEquals("<h></h>", data.getData(MIMEType.TEXT_HTML));
202-
Assertions.assertEquals(".h{}", data.getData(MIMEType.TEXT_CSS));
203-
Assertions.assertEquals("h();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
204-
Assertions.assertEquals("H", data.getData(MIMEType.TEXT_PLAIN));
203+
assertEquals("<h></h>", data.getData(MIMEType.TEXT_HTML));
204+
assertEquals(".h{}", data.getData(MIMEType.TEXT_CSS));
205+
assertEquals("h();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
206+
assertEquals("H", data.getData(MIMEType.TEXT_PLAIN));
205207
}
206208

207209
@Test
208210
void supportsPreferringGroupRequestingSome() {
209211
DisplayData data = this.renderer.renderAs(new G(), "text/html");
210212

211-
Assertions.assertEquals("<g></g>", data.getData(MIMEType.TEXT_HTML));
212-
Assertions.assertNull(data.getData(MIMEType.TEXT_CSS));
213-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
214-
Assertions.assertEquals("G", data.getData(MIMEType.TEXT_PLAIN));
213+
assertEquals("<g></g>", data.getData(MIMEType.TEXT_HTML));
214+
assertNull(data.getData(MIMEType.TEXT_CSS));
215+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
216+
assertEquals("G", data.getData(MIMEType.TEXT_PLAIN));
215217
}
216218

217219
@Test
218220
void supportsPreferringGroupRequestingSomeExternal() {
219221
DisplayData data = this.renderer.renderAs(new H(), "text/html");
220222

221-
Assertions.assertEquals("<h></h>", data.getData(MIMEType.TEXT_HTML));
222-
Assertions.assertNull(data.getData(MIMEType.TEXT_CSS));
223-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
224-
Assertions.assertEquals("H", data.getData(MIMEType.TEXT_PLAIN));
223+
assertEquals("<h></h>", data.getData(MIMEType.TEXT_HTML));
224+
assertNull(data.getData(MIMEType.TEXT_CSS));
225+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
226+
assertEquals("H", data.getData(MIMEType.TEXT_PLAIN));
225227
}
226228

227229
@Test
228230
void supportsPreferringGroupRequestingGroup() {
229231
DisplayData data = this.renderer.renderAs(new G(), "text/*");
230232

231-
Assertions.assertEquals("<g></g>", data.getData(MIMEType.TEXT_HTML));
232-
Assertions.assertEquals(".g{}", data.getData(MIMEType.TEXT_CSS));
233-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
234-
Assertions.assertEquals("G", data.getData(MIMEType.TEXT_PLAIN));
233+
assertEquals("<g></g>", data.getData(MIMEType.TEXT_HTML));
234+
assertEquals(".g{}", data.getData(MIMEType.TEXT_CSS));
235+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
236+
assertEquals("G", data.getData(MIMEType.TEXT_PLAIN));
235237
}
236238

237239
@Test
238240
void supportsPreferringGroupRequestingGroupExternal() {
239241
DisplayData data = this.renderer.renderAs(new H(), "text/*");
240242

241-
Assertions.assertEquals("<h></h>", data.getData(MIMEType.TEXT_HTML));
242-
Assertions.assertEquals(".h{}", data.getData(MIMEType.TEXT_CSS));
243-
Assertions.assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
244-
Assertions.assertEquals("H", data.getData(MIMEType.TEXT_PLAIN));
243+
assertEquals("<h></h>", data.getData(MIMEType.TEXT_HTML));
244+
assertEquals(".h{}", data.getData(MIMEType.TEXT_CSS));
245+
assertNull(data.getData(MIMEType.APPLICATION_JAVASCRIPT));
246+
assertEquals("H", data.getData(MIMEType.TEXT_PLAIN));
245247
}
246248

247249
@Test
248250
void supportsOverridingTextRepresentation() {
249251
DisplayData data = this.renderer.render(new I());
250252

251-
Assertions.assertEquals("I!", data.getData(MIMEType.TEXT_PLAIN));
253+
assertEquals("I!", data.getData(MIMEType.TEXT_PLAIN));
252254
}
253255

254256
@Test
255257
void supportsOverridingTextRepresentationExternal() {
256258
DisplayData data = this.renderer.render(new J());
257259

258-
Assertions.assertEquals("J!", data.getData(MIMEType.TEXT_PLAIN));
260+
assertEquals("J!", data.getData(MIMEType.TEXT_PLAIN));
259261
}
260262

261263
@Test
262264
void supportsOverridingTextRepresentationWhenNotRequested() {
263265
DisplayData data = this.renderer.renderAs(new I(), "application/javascript");
264266

265-
Assertions.assertEquals("i();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
266-
Assertions.assertEquals("I!", data.getData(MIMEType.TEXT_PLAIN));
267+
assertEquals("i();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
268+
assertEquals("I!", data.getData(MIMEType.TEXT_PLAIN));
267269
}
268270

269271
@Test
270272
void supportsOverridingTextRepresentationWhenNotRequestedExternal() {
271273
DisplayData data = this.renderer.renderAs(new J(), "application/javascript");
272274

273-
Assertions.assertEquals("j();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
274-
Assertions.assertEquals("J!", data.getData(MIMEType.TEXT_PLAIN));
275+
assertEquals("j();", data.getData(MIMEType.APPLICATION_JAVASCRIPT));
276+
assertEquals("J!", data.getData(MIMEType.TEXT_PLAIN));
275277
}
276278

277279
class A {

‎jupyter-jvm-basekernel/src/test/java/org/dflib/jjava/jupyter/kernel/display/mime/MIMETypeTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.dflib.jjava.jupyter.kernel.display.mime;
22

3-
import org.junit.jupiter.api.Assertions;
43
import org.junit.jupiter.params.ParameterizedTest;
54
import org.junit.jupiter.params.provider.CsvSource;
65

6+
import static org.junit.jupiter.api.Assertions.assertEquals;
7+
78
public class MIMETypeTest {
89

910
@ParameterizedTest(name = "{index}: MIMEType.parse({0}) = new MIMEType({1}, {2}, {3}, {4})")
@@ -23,6 +24,6 @@ public void test(String raw, String type, String tree, String subtype, String su
2324
MIMEType expected = new MIMEType(type, tree, subtype, suffix);
2425
MIMEType actual = MIMEType.parse(raw);
2526

26-
Assertions.assertEquals(expected, actual);
27+
assertEquals(expected, actual);
2728
}
2829
}

0 commit comments

Comments
 (0)