You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2019/11/01 01:17:58 UTC
[groovy] branch GROOVY-8457 created (now 6317b6d)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-8457
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at 6317b6d GROOVY-8457: use ClassHelper.make(Class) for resolved exception type
This branch includes the following new commits:
new 6317b6d GROOVY-8457: use ClassHelper.make(Class) for resolved exception type
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: GROOVY-8457: use ClassHelper.make(Class) for
resolved exception type
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-8457
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6317b6d2d8ad88387636ad4c78c10b529da96212
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Oct 31 20:17:18 2019 -0500
GROOVY-8457: use ClassHelper.make(Class) for resolved exception type
---
.../NotYetImplementedASTTransformation.java | 3 +-
.../NotYetImplementedTransformTest.groovy | 43 ++++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java
index 2b8cba3..7c6250c 100644
--- a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java
+++ b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/transform/NotYetImplementedASTTransformation.java
@@ -33,6 +33,7 @@ import org.codehaus.groovy.transform.AbstractASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
import java.util.Arrays;
+import junit.framework.AssertionFailedError;
import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
import static org.codehaus.groovy.ast.tools.GeneralUtils.block;
@@ -52,7 +53,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.tryCatchS;
public class NotYetImplementedASTTransformation extends AbstractASTTransformation {
private static final ClassNode CATCH_TYPE = ClassHelper.make(Throwable.class);
- private static final ClassNode THROW_TYPE = ClassHelper.make("junit.framework.AssertionFailedError"); // TODO: java.lang.AssertionError
+ private static final ClassNode THROW_TYPE = ClassHelper.make(AssertionFailedError.class); // TODO: java.lang.AssertionError
public void visit(ASTNode[] nodes, SourceUnit source) {
if (!(nodes.length == 2 && nodes[0] instanceof AnnotationNode && nodes[1] instanceof MethodNode)) {
diff --git a/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy b/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy
index 99314d9..f6eef26 100644
--- a/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy
+++ b/subprojects/groovy-test/src/test/groovy/org/apache/groovy/test/transform/NotYetImplementedTransformTest.groovy
@@ -117,6 +117,27 @@ final class NotYetImplementedTransformTest {
assert output.wasSuccessful() : '@Test method marked with @NotYetImplemented must NOT throw an AssertionFailedError'
}
+ @Test // GROOVY-8457
+ void testNotYetImplementedJUnit4Failure_atCompileStatic() {
+ def output = shell.evaluate('''
+ import groovy.transform.CompileStatic
+ import groovy.test.NotYetImplemented
+ import org.junit.Test
+ import org.junit.runner.JUnitCore
+
+ @CompileStatic
+ class MyTests {
+ @NotYetImplemented @Test void testThatFails() {
+ assert false
+ }
+ }
+
+ new JUnitCore().run(MyTests)
+ ''')
+
+ assert output.wasSuccessful() : '@Test method marked with @CompileStatic and @NotYetImplemented must NOT throw an AssertionFailedError'
+ }
+
@Test
void testNotYetImplementedJUnit4Success() {
def output = shell.evaluate('''
@@ -137,4 +158,26 @@ final class NotYetImplementedTransformTest {
assert output.failureCount == 1 : '@Test method marked with @NotYetImplemented must throw an AssertionFailedError'
assert output.failures.first().exception instanceof AssertionFailedError : '@Test method marked with @NotYetImplemented must throw an AssertionFailedError'
}
+
+ @Test // GROOVY-8457
+ void testNotYetImplementedJUnit4Success_atCompileStatic() {
+ def output = shell.evaluate('''
+ import groovy.transform.CompileStatic
+ import groovy.test.NotYetImplemented
+ import org.junit.Test
+ import org.junit.runner.JUnitCore
+
+ @CompileStatic
+ class MyTests {
+ @NotYetImplemented @Test void testThatFails() {
+ assert true
+ }
+ }
+
+ new JUnitCore().run(MyTests)
+ ''')
+
+ assert output.failureCount == 1 : '@Test method marked with @CompileStatic and @NotYetImplemented must throw an AssertionFailedError'
+ assert output.failures.first().exception instanceof AssertionFailedError : '@Test method marked with @CompileStatic and @NotYetImplemented must throw an AssertionFailedError'
+ }
}