Skip to content

Commit 648d2ee

Browse files
committed
Update interop tests to not convert set to array directly
1 parent b7226e4 commit 648d2ee

File tree

1 file changed

+12
-11
lines changed
  • graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop

1 file changed

+12
-11
lines changed

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,6 @@
5252
import java.util.Arrays;
5353
import java.util.List;
5454

55-
import com.oracle.graal.python.runtime.interop.InteropArray;
56-
import com.oracle.graal.python.test.PythonTests;
57-
import com.oracle.truffle.api.interop.ArityException;
58-
import com.oracle.truffle.api.interop.InteropLibrary;
59-
import com.oracle.truffle.api.interop.TruffleObject;
60-
import com.oracle.truffle.api.interop.UnknownIdentifierException;
61-
import com.oracle.truffle.api.library.ExportLibrary;
62-
import com.oracle.truffle.api.library.ExportMessage;
63-
6455
import org.graalvm.polyglot.Context;
6556
import org.graalvm.polyglot.Context.Builder;
6657
import org.graalvm.polyglot.Engine;
@@ -76,6 +67,15 @@
7667
import org.junit.runners.Parameterized.Parameter;
7768
import org.junit.runners.Parameterized.Parameters;
7869

70+
import com.oracle.graal.python.runtime.interop.InteropArray;
71+
import com.oracle.graal.python.test.PythonTests;
72+
import com.oracle.truffle.api.interop.ArityException;
73+
import com.oracle.truffle.api.interop.InteropLibrary;
74+
import com.oracle.truffle.api.interop.TruffleObject;
75+
import com.oracle.truffle.api.interop.UnknownIdentifierException;
76+
import com.oracle.truffle.api.library.ExportLibrary;
77+
import com.oracle.truffle.api.library.ExportMessage;
78+
7979
@RunWith(Enclosed.class)
8080
public class JavaInteropTest {
8181
public static class GeneralInterop extends PythonTests {
@@ -301,13 +301,14 @@ public void accessSuitePy() throws IOException {
301301
"suite.py").build();
302302
Value suite = context.eval(suitePy);
303303

304+
Value listConverter = context.eval("python", "list");
304305
Value libraries = suite.getMember("libraries");
305306
assertNotNull("libraries found", libraries);
306-
final List<Object> suiteKeys = Arrays.asList(suite.invokeMember("keys").as(Object[].class));
307+
final List<Object> suiteKeys = Arrays.asList(listConverter.execute(suite.invokeMember("keys")).as(Object[].class));
307308
assertTrue("Libraries found among keys: " + suiteKeys, suiteKeys.contains("libraries"));
308309

309310
Value dacapo = null;
310-
for (Object k : libraries.invokeMember("keys").as(List.class)) {
311+
for (Object k : listConverter.execute(libraries.invokeMember("keys")).as(List.class)) {
311312
System.err.println("k " + k);
312313
if ("DACAPO".equals(k)) {
313314
dacapo = libraries.getMember((String) k);

0 commit comments

Comments
 (0)