Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 21f0e1e0d -> a241cf226
fix failing tests Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a241cf22 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a241cf22 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a241cf22 Branch: refs/heads/GROOVY_2_6_X Commit: a241cf226fb8450bc9237e3f685d2b9af878d2ef Parents: 21f0e1e Author: paulk <[email protected]> Authored: Mon Mar 26 14:52:08 2018 +1000 Committer: paulk <[email protected]> Committed: Mon Mar 26 14:52:08 2018 +1000 ---------------------------------------------------------------------- .../java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 5 +++++ src/test/groovy/bugs/Groovy4386_Bug.groovy | 4 ++-- .../org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/a241cf22/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java index d9a2b59..b16717d 100644 --- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java @@ -17606,4 +17606,9 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport { ? EMPTY_GROOVYDOC : new groovy.lang.groovydoc.Groovydoc(groovydocAnnotation.value(), holder); } + + @Deprecated + public static <T> T asType(CharSequence self, Class<T> c) { + return StringGroovyMethods.asType(self, c); + } } http://git-wip-us.apache.org/repos/asf/groovy/blob/a241cf22/src/test/groovy/bugs/Groovy4386_Bug.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/bugs/Groovy4386_Bug.groovy b/src/test/groovy/bugs/Groovy4386_Bug.groovy index 0324f8a..8154a06 100644 --- a/src/test/groovy/bugs/Groovy4386_Bug.groovy +++ b/src/test/groovy/bugs/Groovy4386_Bug.groovy @@ -18,8 +18,8 @@ */ package groovy.bugs -import org.codehaus.groovy.runtime.DefaultGroovyMethods import org.codehaus.groovy.control.CompilerConfiguration +import org.codehaus.groovy.runtime.ResourceGroovyMethods /** * Test for GROOVY-4386: Using static imports to a script on the classpath. @@ -39,7 +39,7 @@ class Groovy4386_Bug extends GroovyTestCase { File dir = new File(tmpDir, 'foo') dir.mkdir() File file = new File(dir, "Constants.groovy") - DefaultGroovyMethods.setText(file, scriptSource); + ResourceGroovyMethods.setText(file, scriptSource); } @Override protected void tearDown() { http://git-wip-us.apache.org/repos/asf/groovy/blob/a241cf22/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java b/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java index a68c965..20ce806 100644 --- a/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java +++ b/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java @@ -42,7 +42,7 @@ public class NewStaticMetaMethodTest extends TestCase { } public void testInvokeDefaultGroovyMethod() throws Exception { - Method method = DefaultGroovyMethods.class.getMethod("plus", new Class[]{String.class, Object.class}); + Method method = StringGroovyMethods.class.getMethod("plus", new Class[]{String.class, Object.class}); assertTrue("Should have found a method", method != null); NewInstanceMetaMethod metaMethod = createNewMetaMethod(method);
