Fix unittests that rely on PException.toString/getMessage

Author: fangerer

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

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.modules;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Rule;
+import org.junit.rules.ExpectedException;
+
+import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.graal.python.test.PythonTests;
+
+public class ConversionNodeTests {
+    @Rule public ExpectedException expectedException = ExpectedException.none();
+
+    static class PExceptionMessageMatcher extends
+                    TypeSafeMatcher<PException> {
+
+        private final Matcher<String> matcher;
+
+        public PExceptionMessageMatcher(Matcher<String> matcher) {
+            this.matcher = matcher;
+        }
+
+        public void describeTo(Description description) {
+            description.appendText("exception with message ");
+            description.appendDescriptionOf(matcher);
+        }
+
+        @Override
+        protected boolean matchesSafely(PException item) {
+            return matcher.matches(PythonTests.getExceptionMessage(item));
+        }
+
+        @Override
+        protected void describeMismatchSafely(PException item, Description description) {
+            description.appendText("message ");
+            matcher.describeMismatch(PythonTests.getExceptionMessage(item), description);
+        }
+
+        @Factory
+        public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) {
+            return new org.junit.internal.matchers.ThrowableMessageMatcher<T>(matcher);
+        }
+    }
+
+    protected void expectPythonMessage(String expectedMessage) {
+        expectedException.expect(PException.class);
+        expectedException.expect(new PExceptionMessageMatcher(CoreMatchers.containsString(expectedMessage)));
+    }
+}

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

@@ -50,26 +50,22 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.DirFdConversionNode;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.runtime.ExecutionContext;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
-public class DirFdConversionNodeTests {
-    @Rule public ExpectedException expectedException = ExpectedException.none();
+public class DirFdConversionNodeTests extends ConversionNodeTests {
 
     @Before
     public void setUp() {
@@ -105,15 +101,13 @@ public void longFitsInt() {
 
     @Test
     public void longTooBig() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: fd is greater than maximum");
+        expectPythonMessage("OverflowError: fd is greater than maximum");
         call(1L << 40);
     }
 
     @Test
     public void longTooSmall() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: fd is less than minimum");
+        expectPythonMessage("OverflowError: fd is less than minimum");
         call(-1L << 40);
     }
 
@@ -124,15 +118,13 @@ public void pintFitsInt() {
 
     @Test
     public void pintTooBig() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: fd is greater than maximum");
+        expectPythonMessage("OverflowError: fd is greater than maximum");
         call(factory().createInt(BigInteger.ONE.shiftLeft(100)));
     }
 
     @Test
     public void pintTooSmall() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: fd is less than minimum");
+        expectPythonMessage("OverflowError: fd is less than minimum");
         call(factory().createInt(BigInteger.ONE.shiftLeft(100).negate()));
     }
 
@@ -143,15 +135,13 @@ public void indexFitsInt() {
 
     @Test
     public void indexTooBig() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: fd is greater than maximum");
+        expectPythonMessage("OverflowError: fd is greater than maximum");
         call(evalValue("class C:\n  def __index__(self):\n    return 1 << 40\nC()"));
     }
 
     @Test
     public void indexTooSmall() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: fd is less than minimum");
+        expectPythonMessage("OverflowError: fd is less than minimum");
         call(evalValue("class C:\n  def __index__(self):\n    return -1 << 100\nC()"));
     }
 
@@ -162,8 +152,7 @@ public void indexInIntSubclass() {
 
     @Test
     public void unsupportedType1() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("TypeError: argument should be integer or None, not float");
+        expectPythonMessage("TypeError: argument should be integer or None, not float");
         call(3.14);
     }
 

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

@@ -50,26 +50,22 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.FileDescriptorConversionNode;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.runtime.ExecutionContext;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
-public class FileDescriptorConversionNodeTests {
-    @Rule public ExpectedException expectedException = ExpectedException.none();
+public class FileDescriptorConversionNodeTests extends ConversionNodeTests {
 
     @Before
     public void setUp() {
@@ -83,16 +79,14 @@ public void tearDown() {
 
     @Test
     public void none() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("TypeError: argument must be an int, or have a fileno() method.");
+        expectPythonMessage("TypeError: argument must be an int, or have a fileno() method.");
         call(PNone.NONE);
         Assert.assertEquals(AT_FDCWD.value, call(PNone.NO_VALUE));
     }
 
     @Test
     public void noValue() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("TypeError: argument must be an int, or have a fileno() method.");
+        expectPythonMessage("TypeError: argument must be an int, or have a fileno() method.");
         call(PNone.NO_VALUE);
     }
 
@@ -114,15 +108,13 @@ public void longFitsInt() {
 
     @Test
     public void longTooBig() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: Python int too large to convert to int");
+        expectPythonMessage("OverflowError: Python int too large to convert to int");
         call(1L << 40);
     }
 
     @Test
     public void longTooSmall() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: Python int too large to convert to int");
+        expectPythonMessage("OverflowError: Python int too large to convert to int");
         call(-1L << 40);
     }
 
@@ -133,22 +125,19 @@ public void pintFitsInt() {
 
     @Test
     public void pintTooBig() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: Python int too large to convert to int");
+        expectPythonMessage("OverflowError: Python int too large to convert to int");
         call(factory().createInt(BigInteger.ONE.shiftLeft(100)));
     }
 
     @Test
     public void pintTooSmall() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: Python int too large to convert to int");
+        expectPythonMessage("OverflowError: Python int too large to convert to int");
         call(factory().createInt(BigInteger.ONE.shiftLeft(100).negate()));
     }
 
     @Test
     public void indexNotUsed() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("TypeError: argument must be an int, or have a fileno() method.");
+        expectPythonMessage("TypeError: argument must be an int, or have a fileno() method.");
         call(evalValue("class C:\n  def __index__(self):\n    return 42\nC()"));
     }
 
@@ -159,22 +148,19 @@ public void filenoOk() {
 
     @Test
     public void filenoWrongType() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("TypeError: fileno() returned a non-integer");
+        expectPythonMessage("TypeError: fileno() returned a non-integer");
         call(evalValue("class C:\n  def fileno(self):\n    return 3.14\nC()"));
     }
 
     @Test
     public void filenoTooBig() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("OverflowError: Python int too large to convert to int");
+        expectPythonMessage("OverflowError: Python int too large to convert to int");
         call(evalValue("class C:\n  def fileno(self):\n    return 1 << 40\nC()"));
     }
 
     @Test
     public void unsupportedType1() {
-        expectedException.expect(PException.class);
-        expectedException.expectMessage("TypeError: argument must be an int, or have a fileno() method.");
+        expectPythonMessage("TypeError: argument must be an int, or have a fileno() method.");
         call(3.14);
     }