[GR-29404] [GR-28486] Expand our TCK coverage to iterables/iterators, exceptions, meta objects, date/time/duration

PullRequest: graalpython/1658

Author: timfel

CHANGELOG.md

@@ -7,6 +7,14 @@ language runtime. The main focus is on user-observable behavior of the engine.
 
 * Added subclassing of Java classes in JVM mode
 * Use native posix functions in the GraalPython Launcher
+* Support iterating over Python objects from Java and other languages as well as iterating over foreign objects in Python
+* Support catching foreign exceptions in catch-all except clauses
+
+## Version 21.1.0
+
+* Support catching exceptions from other languages or Java with catch-all except blocks
+* Support iterating over iterables from other languages, as well as allow other languages to iterate over Python iterables and iterators
+* Support isinstance and issubclass with instances and classes of other languages
 
 ## Version 21.0.0
 

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -56,6 +56,7 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import org.graalvm.polyglot.Context;
 import org.hamcrest.CoreMatchers;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -74,6 +75,11 @@ public void setUp() {
         PythonTests.enterContext();
     }
 
+    @After
+    public void tearDown() {
+        PythonTests.closeContext();
+    }
+
     @Test
     public void none() {
         Assert.assertEquals(PosixSupportLibrary.DEFAULT_DIR_FD, call(PNone.NONE));

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/DirFdConversionNodeTests.java

@@ -46,6 +46,7 @@
 
 import org.graalvm.polyglot.Context;
 import org.hamcrest.CoreMatchers;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -75,6 +76,11 @@ public void setUp() {
         PythonTests.enterContext();
     }
 
+    @After
+    public void tearDown() {
+        PythonTests.closeContext();
+    }
+
     @Test
     public void none() {
         expectedException.expect(PException.class);

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/builtins/modules/FileDescriptorConversionNodeTests.java

@@ -49,6 +49,7 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -66,6 +67,11 @@ public void setUp() {
         PythonTests.enterContext();
     }
 
+    @After
+    public void tearDown() {
+        PythonTests.closeContext();
+    }
+
     @Test
     public void positiveInt() {
         Assert.assertEquals(0, castInt(0));

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/nodes/util/CastToJavaUnsignedLongNodeTests.java

@@ -41,13 +41,15 @@
 
 package com.oracle.graal.python.nodes.util;
 
-import com.oracle.graal.python.builtins.objects.ints.PInt;
-import com.oracle.graal.python.test.PythonTests;
+import java.math.BigInteger;
+
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.math.BigInteger;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.test.PythonTests;
 
 public class NarrowBigIntegerNodeTests {
 
@@ -56,6 +58,11 @@ public void setUp() {
         PythonTests.enterContext();
     }
 
+    @After
+    public void tearDown() {
+        PythonTests.closeContext();
+    }
+
     private static NarrowBigIntegerNode narrow = NarrowBigIntegerNodeGen.getUncached();
 
     @Test

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/nodes/util/NarrowBigIntegerNodeTests.java

@@ -98,20 +98,19 @@ public class PythonTests {
         executable = sb.toString();
     }
 
-    public static void enterContext(String... newArgs) {
-        enterContext(Collections.emptyMap(), newArgs);
+    public static Context enterContext(String... newArgs) {
+        return enterContext(Collections.emptyMap(), newArgs);
     }
 
-    public static void enterContext(Map<String, String> options, String[] args) {
+    public static Context enterContext(Map<String, String> options, String[] args) {
         PythonTests.outArray.reset();
         PythonTests.errArray.reset();
         Context prevContext = context;
         context = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).options(options).arguments("python", args).option("python.Executable", executable).build();
         context.initialize("python");
-        if (prevContext != null) {
-            closeContext(prevContext);
-        }
+        assert prevContext == null;
         context.enter();
+        return context;
     }
 
     private static void closeContext(Context ctxt) {
@@ -290,11 +289,15 @@ private static String getFileContent(File file) {
     }
 
     public static RootNode getParseResult(com.oracle.truffle.api.source.Source source, PrintStream out, PrintStream err) {
-        PythonTests.enterContext();
-        PythonContext ctx = PythonLanguage.getContext();
-        ctx.setOut(out);
-        ctx.setErr(err);
-        return (RootNode) ctx.getCore().getParser().parse(ParserMode.File, 0, ctx.getCore(), source, null, null);
+        enterContext();
+        try {
+            PythonContext ctx = PythonLanguage.getContext();
+            ctx.setOut(out);
+            ctx.setErr(err);
+            return (RootNode) ctx.getCore().getParser().parse(ParserMode.File, 0, ctx.getCore(), source, null, null);
+        } finally {
+            closeContext();
+        }
     }
 
     public static RootNode getParseResult(String code) {
@@ -336,6 +339,7 @@ public static Value runScript(String[] args, File path, OutputStream out, Output
             throw new RuntimeException(e);
         } finally {
             flush(out, err);
+            closeContext();
         }
     }
 
@@ -345,6 +349,7 @@ public static Value runScript(Map<String, String> options, String[] args, String
             return context.eval(org.graalvm.polyglot.Source.create("python", source));
         } finally {
             flush(out, err);
+            closeContext();
         }
     }
 
@@ -354,6 +359,7 @@ public static Value runScript(String[] args, String source, OutputStream out, Ou
             return context.eval(org.graalvm.polyglot.Source.create("python", source));
         } finally {
             flush(out, err);
+            closeContext();
         }
     }
 
@@ -363,6 +369,7 @@ public static Value runScript(String[] args, org.graalvm.polyglot.Source source,
             return context.eval(source);
         } finally {
             flush(out, err);
+            closeContext();
         }
     }
 
@@ -377,6 +384,7 @@ public static Value runScript(Map<String, String> options, String[] args, String
         } finally {
             cb.run();
             flush(out, err);
+            closeContext();
         }
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java

@@ -30,6 +30,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
 import org.junit.Test;
 
@@ -369,11 +370,16 @@ public void cellType() {
                         "    return bar\n" +
                         "\n" +
                         "foo(3).__closure__[0]";
-        Value eval = PythonTests.eval(source);
-        assertTrue(eval.getMetaObject().hasMember("__name__"));
-        Value type = eval.getMetaObject().getMember("__name__");
-        assertTrue(type.isString());
-        assertEquals("cell", type.asString());
+        Context context = PythonTests.enterContext();
+        try {
+            Value eval = context.eval("python", source);
+            assertTrue(eval.getMetaObject().hasMember("__name__"));
+            Value type = eval.getMetaObject().getMember("__name__");
+            assertTrue(type.isString());
+            assertEquals("cell", type.asString());
+        } finally {
+            PythonTests.closeContext();
+        }
     }
 
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/BuiltinFunctionTests.java

@@ -25,20 +25,15 @@
  */
 package com.oracle.graal.python.test.builtin;
 
-import java.nio.file.*;
+import static com.oracle.graal.python.test.PythonTests.assertPrintContains;
+import static com.oracle.graal.python.test.PythonTests.assertPrints;
 
-import org.junit.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
-import com.oracle.graal.python.test.PythonTests;
-
-import static com.oracle.graal.python.test.PythonTests.*;
+import org.junit.Test;
 
 public class ImportTests {
-    @Before
-    public void setup() {
-        PythonTests.enterContext();
-    }
-
     @Test
     public void relativeImportTest() {
         Path script = Paths.get("relative_import.py");

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/ImportTests.java

@@ -25,6 +25,7 @@
  */
 package com.oracle.graal.python.test.builtin;
 
+import org.junit.After;
 import org.junit.Before;
 
 import com.oracle.graal.python.test.PythonTests;
@@ -34,4 +35,9 @@ public class IteratorTests {
     public void setup() {
         PythonTests.enterContext();
     }
+
+    @After
+    public void tearDown() {
+        PythonTests.closeContext();
+    }
 }