Skip to content

Commit 46c3899

Browse files
ppislppisl
committed
Checkstyle
1 parent e5d3c6d commit 46c3899

File tree

3 files changed

+52
-34
lines changed

3 files changed

+52
-34
lines changed

‎graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/ArgsKwArgsTest.java

Lines changed: 50 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,15 @@ def sum(*args):
9090

9191
assertEquals(0, module.invokeMember("sum").asInt());
9292
assertEquals(22, module.invokeMember("sum", 22).asInt());
93-
assertEquals(60, module.invokeMember("sum",10, 20, 30).asInt());
94-
assertEquals(6, module.invokeMember("sum", PositionalArguments.of(1,2,3)).asInt());
93+
assertEquals(60, module.invokeMember("sum", 10, 20, 30).asInt());
94+
assertEquals(6, module.invokeMember("sum", PositionalArguments.of(1, 2, 3)).asInt());
9595

9696
assertEquals(0, module.invokeMember("sum", PositionalArguments.of()).asInt());
9797
assertEquals(0, module.invokeMember("sum", KeywordArguments.from(Map.of())).asInt());
9898

99-
PolyglotException pe = assertThrows(PolyglotException.class, () -> {assertEquals(0, module.invokeMember("sum", KeywordArguments.of("one", 1)).asInt());});
99+
PolyglotException pe = assertThrows(PolyglotException.class, () -> {
100+
assertEquals(0, module.invokeMember("sum", KeywordArguments.of("one", 1)).asInt());
101+
});
100102
assertEquals("TypeError: sum() got an unexpected keyword argument 'one'", pe.getMessage());
101103

102104
}
@@ -116,22 +118,24 @@ def text(a, *args):
116118
);
117119

118120
assertEquals("a=0,", module.invokeMember("text", 0).asString());
119-
assertEquals("a=22,args[0]=33,", module.invokeMember("text", 22,33).asString());
120-
assertEquals("a='hello',args[0]=ahoj,args[1]=cau,", module.invokeMember("text","hello", "ahoj", "cau").asString());
121-
assertEquals("a='6',args[0]=1,args[1]=2,args[2]=3,", module.invokeMember("text", "6", PositionalArguments.of(1,2,3)).asString());
122-
assertEquals("a=1,args[0]=2,args[1]=3,", module.invokeMember("text", PositionalArguments.of(1,2,3)).asString());
121+
assertEquals("a=22,args[0]=33,", module.invokeMember("text", 22, 33).asString());
122+
assertEquals("a='hello',args[0]=ahoj,args[1]=cau,", module.invokeMember("text", "hello", "ahoj", "cau").asString());
123+
assertEquals("a='6',args[0]=1,args[1]=2,args[2]=3,", module.invokeMember("text", "6", PositionalArguments.of(1, 2, 3)).asString());
124+
assertEquals("a=1,args[0]=2,args[1]=3,", module.invokeMember("text", PositionalArguments.of(1, 2, 3)).asString());
123125
assertEquals("a=1,", module.invokeMember("text", PositionalArguments.of(1)).asString());
124126

125127
assertEquals("a=1,", module.invokeMember("text", KeywordArguments.of("a", 1)).asString());
126128

127-
PolyglotException pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text", KeywordArguments.of("a", 1, "b", 2));});
129+
PolyglotException pe = assertThrows(PolyglotException.class, () -> {
130+
module.invokeMember("text", KeywordArguments.of("a", 1, "b", 2));
131+
});
128132
assertEquals("TypeError: text() got an unexpected keyword argument 'b'", pe.getMessage());
129133
}
130134

131135
@Test
132136
public void testPositionalArgs03() {
133137
// @formatter:off
134-
Value module = run( """
138+
Value module = run("""
135139
def text(a,b=44, *args):
136140
result = f'{a=},{b=},'
137141
index = 0
@@ -143,22 +147,22 @@ def text(a,b=44, *args):
143147
);
144148

145149
assertEquals("a=0,b=44,", module.invokeMember("text", 0).asString());
146-
assertEquals("a=22,b=33,", module.invokeMember("text", 22,33).asString());
147-
assertEquals("a='hello',b='ahoj',args[0]=cau,", module.invokeMember("text","hello", "ahoj", "cau").asString());
148-
assertEquals("a='6',b=1,args[0]=2,args[1]=3,", module.invokeMember("text", "6", PositionalArguments.of(1,2,3)).asString());
150+
assertEquals("a=22,b=33,", module.invokeMember("text", 22, 33).asString());
151+
assertEquals("a='hello',b='ahoj',args[0]=cau,", module.invokeMember("text", "hello", "ahoj", "cau").asString());
152+
assertEquals("a='6',b=1,args[0]=2,args[1]=3,", module.invokeMember("text", "6", PositionalArguments.of(1, 2, 3)).asString());
149153
assertEquals("a=1,b=44,", module.invokeMember("text", PositionalArguments.of(1)).asString());
150-
assertEquals("a=1,b=2,", module.invokeMember("text", PositionalArguments.of(1,2)).asString());
151-
assertEquals("a=1,b=2,args[0]=3,", module.invokeMember("text", PositionalArguments.of(1,2,3)).asString());
152-
assertEquals("a='a',b='b',args[0]=1,args[1]=2,args[2]=3,", module.invokeMember("text","a", "b", PositionalArguments.of(1,2,3)).asString());
154+
assertEquals("a=1,b=2,", module.invokeMember("text", PositionalArguments.of(1, 2)).asString());
155+
assertEquals("a=1,b=2,args[0]=3,", module.invokeMember("text", PositionalArguments.of(1, 2, 3)).asString());
156+
assertEquals("a='a',b='b',args[0]=1,args[1]=2,args[2]=3,", module.invokeMember("text", "a", "b", PositionalArguments.of(1, 2, 3)).asString());
153157
}
154158

155159
private static String assertAllKeysInText(String text, Map<String, Object> kwArgs) {
156160
String rest = text;
157161
for (Map.Entry<String, Object> entry : kwArgs.entrySet()) {
158162
String key = entry.getKey();
159163
Object val = entry.getValue();
160-
String keyVal = "[" + key + ":" + val.toString() +"],";
161-
assertTrue("The string \"" + keyVal + "\" was not found in \"" + text + "\"" , text.contains(keyVal));
164+
String keyVal = "[" + key + ":" + val.toString() + "],";
165+
assertTrue("The string \"" + keyVal + "\" was not found in \"" + text + "\"", text.contains(keyVal));
162166
rest = rest.replace(keyVal, "");
163167
}
164168
return rest;
@@ -167,7 +171,7 @@ private static String assertAllKeysInText(String text, Map<String, Object> kwArg
167171
@Test
168172
public void testKwArgs01() {
169173
// @formatter:off
170-
Value module = run( """
174+
Value module = run("""
171175
def text(**kwArgs):
172176
result = ''
173177
for key, value in kwArgs.items():
@@ -189,14 +193,16 @@ def text(**kwArgs):
189193

190194
assertTrue(module.invokeMember("text", PositionalArguments.of()).asString().isEmpty());
191195

192-
PolyglotException pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text", PositionalArguments.of(44)).asString();});
196+
PolyglotException pe = assertThrows(PolyglotException.class, () -> {
197+
module.invokeMember("text", PositionalArguments.of(44)).asString();
198+
});
193199
assertEquals("TypeError: text() takes 0 positional arguments but 1 was given", pe.getMessage());
194200
}
195201

196202
@Test
197203
public void testKwArgs02() {
198204
// @formatter:off
199-
Value module = run( """
205+
Value module = run("""
200206
def text(*,named1, **kwArgs):
201207
result = f'[named1:{str(named1)}],'
202208
for key, value in kwArgs.items():
@@ -213,26 +219,36 @@ def text(*,named1, **kwArgs):
213219
remaining = assertAllKeysInText(module.invokeMember("text", KeywordArguments.from(kwargsMap)).asString(), kwargsMap);
214220
assertTrue(remaining.isEmpty());
215221

216-
PolyglotException pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text").asString();});
222+
PolyglotException pe = assertThrows(PolyglotException.class, () -> {
223+
module.invokeMember("text").asString();
224+
});
217225
assertEquals("TypeError: text() missing 1 required keyword-only argument: 'named1'", pe.getMessage());
218226

219-
pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text", KeywordArguments.from(Map.of())).asString();});
227+
pe = assertThrows(PolyglotException.class, () -> {
228+
module.invokeMember("text", KeywordArguments.from(Map.of())).asString();
229+
});
220230
assertEquals("TypeError: text() missing 1 required keyword-only argument: 'named1'", pe.getMessage());
221231

222-
pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text", KeywordArguments.of("named2", 10)).asString();});
232+
pe = assertThrows(PolyglotException.class, () -> {
233+
module.invokeMember("text", KeywordArguments.of("named2", 10)).asString();
234+
});
223235
assertEquals("TypeError: text() missing 1 required keyword-only argument: 'named1'", pe.getMessage());
224236

225-
pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text", PositionalArguments.of()).asString();});
237+
pe = assertThrows(PolyglotException.class, () -> {
238+
module.invokeMember("text", PositionalArguments.of()).asString();
239+
});
226240
assertEquals("TypeError: text() missing 1 required keyword-only argument: 'named1'", pe.getMessage());
227241

228-
pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text", PositionalArguments.of(10)).asString();});
242+
pe = assertThrows(PolyglotException.class, () -> {
243+
module.invokeMember("text", PositionalArguments.of(10)).asString();
244+
});
229245
assertEquals("TypeError: text() takes 0 positional arguments but 1 was given", pe.getMessage());
230246
}
231247

232248
@Test
233249
public void testKwArgs03() {
234250
// @formatter:off
235-
Value module = run( """
251+
Value module = run("""
236252
def text(*,named1, named2=44, **kwArgs):
237253
result = f'[named1:{str(named1)}],[named2:{str(named2)}],'
238254
for key, value in kwArgs.items():
@@ -243,7 +259,7 @@ def text(*,named1, named2=44, **kwArgs):
243259

244260
Map<String, Object> kwargsMap = Map.of("named1", 1);
245261
String remaining = assertAllKeysInText(module.invokeMember("text", KeywordArguments.from(kwargsMap)).asString(), kwargsMap);
246-
assertEquals("[named2:44],",remaining);
262+
assertEquals("[named2:44],", remaining);
247263

248264
kwargsMap = Map.of("named1", 1, "named2", 2);
249265
remaining = assertAllKeysInText(module.invokeMember("text", KeywordArguments.from(kwargsMap)).asString(), kwargsMap);
@@ -253,7 +269,7 @@ def text(*,named1, named2=44, **kwArgs):
253269
@Test
254270
public void testKwArgs04() {
255271
// @formatter:off
256-
Value module = run( """
272+
Value module = run("""
257273
def text(*,named1, named2=44):
258274
result = f'[named1:{str(named1)}],[named2:{str(named2)}],'
259275
return result
@@ -262,14 +278,16 @@ def text(*,named1, named2=44):
262278

263279
Map<String, Object> kwargsMap = Map.of("named1", 1);
264280
String remaining = module.invokeMember("text", KeywordArguments.from(kwargsMap)).asString();
265-
assertEquals("[named1:1],[named2:44],",remaining);
281+
assertEquals("[named1:1],[named2:44],", remaining);
266282

267283
kwargsMap = Map.of("named1", 1, "named2", 2);
268284
remaining = module.invokeMember("text", KeywordArguments.from(kwargsMap)).asString();
269-
assertEquals("[named1:1],[named2:2],",remaining);
285+
assertEquals("[named1:1],[named2:2],", remaining);
270286

271-
PolyglotException pe = assertThrows(PolyglotException.class, () -> {module.invokeMember("text",
272-
module.invokeMember("text", KeywordArguments.of("named1", 1, "named2", 2, "named3", 3))).asString();});
287+
PolyglotException pe = assertThrows(PolyglotException.class, () -> {
288+
module.invokeMember("text",
289+
module.invokeMember("text", KeywordArguments.of("named1", 1, "named2", 2, "named3", 3))).asString();
290+
});
273291
assertEquals("TypeError: text() got an unexpected keyword argument 'named3'", pe.getMessage());
274292
}
275293
}

‎graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/KeywordArguments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
*
169169
* @see PositionalArguments
170170
*/
171-
public sealed abstract class KeywordArguments permits KeywordArguments.Implementation {
171+
public abstract sealed class KeywordArguments permits KeywordArguments.Implementation {
172172

173173
/**
174174
* Internal implementation of the {@link KeywordArguments} class.

‎graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/PositionalArguments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
*
102102
* @see KeywordArguments
103103
*/
104-
public sealed abstract class PositionalArguments permits PositionalArguments.Implementation {
104+
public abstract sealed class PositionalArguments permits PositionalArguments.Implementation {
105105

106106
static final class Implementation extends PositionalArguments implements ProxyArray, ProxyObject {
107107

0 commit comments

Comments
 (0)