junit jupiter

Author: eric-milles

src/test/groovy/bugs/ByteIndexBug.groovy

@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test
 
 final class ByteIndexBug {
 
-    // TODO: this tests a string with 128 nulls - is that what is intended?
+    // TODO: This tests a string with 128 nulls - is that what is intended?
     @Test
     void testBug() {
-        def sb = new StringBuffer("\"\"\"\n")
-        for (j in 0..127){ // 126 is okay.
-            sb.append('$').append("{x}")
+        def sb = new StringBuilder('"""\n')
+        for (j in 0..127) { // 126 is okay
+            sb.append('${x}')
         }
-        sb.append("\n\"\"\"\n")
-        def b = new Binding(x:null)
-        new GroovyShell(b).evaluate(sb.toString(),"foo")
+        sb.append('\n"""\n')
+        def b = new Binding(x: null)
+        new GroovyShell(b).evaluate(sb.toString(), 'foo')
     }
 }

src/test/groovy/bugs/ClosureVariableBug.groovy

@@ -53,30 +53,27 @@ final class ClosureVariableBug {
     }
 
     protected Integer callClosure(collection) {
-        Integer x
-        /** @todo
         Integer x = 0
-        */
         collection.each { x = it }
         return x
     }
 
     @Test
     void testLocalVariableWithPrimitiveType() {
-        assertScript """
+        assertScript '''
             int x
             1.times { x=2 }
             assert x==2
-        """
-        assertScript """
+        '''
+        assertScript '''
             long x
             1.times { x=2 }
             assert x==2
-        """
-        assertScript """
+        '''
+        assertScript '''
             double x
             1.times { x=2 }
             assert x==2
-        """
+        '''
     }
 }

…/groovy/bugs/Groovy3156And2621Bug.groovy src/test/groovy/bugs/Groovy2621.groovysrc/test/groovy/bugs/Groovy3156And2621Bug.groovy renamed to src/test/groovy/bugs/Groovy2621.groovy src/test/groovy/bugs/Groovy3156And2621Bug.groovy renamed to src/test/groovy/bugs/Groovy2621.groovy

@@ -20,20 +20,30 @@ package bugs
 
 import org.junit.jupiter.api.Test
 
+final class Groovy2621 {
 
-class Groovy3156And2621Bug {
     @Test
-    void testMethodNameResolutionInANestedClosure() {
-        assert m() == 'method'
-        assert c1() == 'method'
+    void testSimilarNamesForMethodAndLocalWithLocalAsMethodArgument() {
+        def convention = 'value'
+        1.times {
+            this.convention(convention)
+        }
     }
 
+    void convention(String arg) {
+    }
+
+    //--------------------------------------------------------------------------
+
+    // GROOVY-3156
     @Test
-    void testSimilarNamesForMethodAndLocalWithLocalAsMethodArgument() {
-        failingExecute()
+    void testMethodNameResolutionInNestedClosure() {
+        assert m() == 'method'
+        assert c1() == 'method'
     }
 
     def m = { return 'method' }
+
     def c1 = {
         def m = { return 'c1' }
         def c2 = {
@@ -43,18 +53,9 @@ class Groovy3156And2621Bug {
             *  It should resolve to outermost class' m().
             */
             assert m() == 'c1'
+            
             return this.m()
         }
         return c2()
     }
-
-    void convention(String arg) {
-    }
-
-    void failingExecute() {
-        def convention= 'value'
-        1.times {
-            this.convention(convention)
-        }
-    }
 }

src/test/groovy/bugs/Groovy308_Bug.groovy src/test/groovy/bugs/Groovy308.groovysrc/test/groovy/bugs/Groovy308_Bug.groovy renamed to src/test/groovy/bugs/Groovy308.groovy

@@ -20,25 +20,22 @@ package bugs
 
 import org.junit.jupiter.api.Test
 
-/**
- */
-class Groovy308_Bug {
+final class Groovy308 {
 
     @Test
     void testBug() {
         def out = new StringWriter()
-        out << "hello " << "world!"
+        out << 'hello ' << 'world!'
 
         def value = out.toString()
-        assert value == "hello world!"
+        assert value == 'hello world!'
 
         out = new ByteArrayOutputStream()
-        out << "hello " << "world!"
+        out << 'hello ' << 'world!'
 
         value = new String(out.toByteArray())
-        assert value == "hello world!"
+        assert value == 'hello world!'
 
-        System.out << "hello" << " world!"
+        System.out << 'hello' << ' world!'
     }
 }
-

src/test/groovy/bugs/Groovy3135Bug.groovy src/test/groovy/bugs/Groovy3135.groovysrc/test/groovy/bugs/Groovy3135Bug.groovy renamed to src/test/groovy/bugs/Groovy3135.groovy

@@ -20,59 +20,58 @@ package bugs
 
 import org.junit.jupiter.api.Test
 
+final class Groovy3135 {
 
-class Groovy3135Bug {
-    static Byte b = Byte.parseByte("1")
-    static Short s = Short.parseShort("2")
-    static Integer i = Integer.parseInt("3")
-    static Long l = Long.parseLong("4")
-    static Float f = Float.parseFloat("5")
-    static Double d = Double.parseDouble("6")
-    static BigInteger bi = new BigInteger("7")
-    static BigDecimal bd = new BigDecimal("8")
+    private static Byte b = Byte.parseByte('1')
+    private static Short s = Short.parseShort('2')
+    private static Integer i = Integer.parseInt('3')
+    private static Long l = Long.parseLong('4')
+    private static Float f = Float.parseFloat('5')
+    private static Double d = Double.parseDouble('6')
+    private static BigInteger bi = new BigInteger('7')
+    private static BigDecimal bd = new BigDecimal('8')
 
-    def values
+    private Object values
 
     @Test
     void testConversionForPrimitiveTypeVarArgs() {
-
-        setVarArgsShort("", b, s)
+        setVarArgsShort('', b, s)
         checkConversionAndVarArgCount(Short.TYPE, 2)
 
-        setVarArgsInteger("", b, s, i)
+        setVarArgsInteger('', b, s, i)
         checkConversionAndVarArgCount(Integer.TYPE, 3)
 
-        setVarArgsLong("", b, s, i, l)
+        setVarArgsLong('', b, s, i, l)
         checkConversionAndVarArgCount(Long.TYPE, 4)
 
-        setVarArgsFloat("", b, s, i, l, f)
+        setVarArgsFloat('', b, s, i, l, f)
         checkConversionAndVarArgCount(Float.TYPE, 5)
 
-        setVarArgsDouble("", b, s, i, l, f, d, bi, bd)
+        setVarArgsDouble('', b, s, i, l, f, d, bi, bd)
         checkConversionAndVarArgCount(Double.TYPE, 8)
     }
 
-    def setVarArgsShort(String str, short... varArgValues) {
+    void setVarArgsShort(String str, short... varArgValues) {
         values = varArgValues
     }
 
-    def setVarArgsInteger(String str, int... varArgValues) {
+    void setVarArgsInteger(String str, int... varArgValues) {
         values = varArgValues
     }
 
-    def setVarArgsLong(String str, long... varArgValues) {
+    void setVarArgsLong(String str, long... varArgValues) {
         values = varArgValues
     }
 
-    def setVarArgsFloat(String str, float... varArgValues) {
+    void setVarArgsFloat(String str, float... varArgValues) {
         values = varArgValues
     }
 
-    def setVarArgsDouble(String str, double... varArgValues) {
+    void setVarArgsDouble(String str, double... varArgValues) {
         values = varArgValues
     }
 
-    def checkConversionAndVarArgCount(expectedType, varArgsCount) {
+    void checkConversionAndVarArgCount(expectedType, varArgsCount) {
         assert values.class.componentType == expectedType
         assert values.size() == varArgsCount
     }

src/test/groovy/bugs/Groovy3139Bug.groovy src/test/groovy/bugs/Groovy3139.groovysrc/test/groovy/bugs/Groovy3139Bug.groovy renamed to src/test/groovy/bugs/Groovy3139.groovy

@@ -21,39 +21,41 @@ package bugs
 import groovy.mock.interceptor.StubFor
 import org.junit.jupiter.api.Test
 
-class Groovy3139Bug {
+final class Groovy3139 {
 
     @Test
     void testStubbingIssueDueToCachingWhenUsing2Stubs() {
         def urlStub1 = new StubFor(URL)
-        urlStub1.demand.openConnection {""}
+        urlStub1.demand.openConnection {''}
         urlStub1.use {
-           def get = new Get2(url: "http://localhost")
+           def get = new Get2(url: 'http://localhost')
            def result = get.text
         }
 
         def urlStub2 = new StubFor(URL)
         // the following stubbed call is on urlStub2 and its demand cound should be separate.
         // Currently due to caching of MockProxyMetaClass, it gets counted towards urlStub1 demands
         // and throws "End of demands" exception
-        urlStub2.demand.openConnection {""}
+        urlStub2.demand.openConnection {''}
         urlStub2.use {
-           def get = new Get2(url: "http://localhost")
+           def get = new Get2(url: 'http://localhost')
            def result = get.text
         }
     }
-}
 
-class Get2{
-    String url
+    static class Get2 {
+
+        String url
 
-    String getText() {
+        String getText() {
             def aUrl = new URL(toString())
-            def conn = aUrl.openConnection()
-            return "DUMMY"
-    }
+                def conn = aUrl.openConnection()
+                return 'DUMMY'
+        }
 
-    String toString(){
-        return url
+        @Override
+        String toString() {
+            return url
+        }
     }
 }

src/test/groovy/bugs/Groovy3163.groovy

@@ -0,0 +1,78 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package bugs
+
+import org.junit.jupiter.api.Test
+
+final class Groovy3163 {
+
+    @Test
+    void testSuperOverStatic() {
+        def siws = new Groovy3163SomeImplementorWithStatic()
+
+        assert siws.build(1)[0] == 1
+
+        def c = { -> 'foo ' }
+
+        //def s = c as Script
+        //assert s.is(siws.build(s)[0])
+
+        assert c.is(siws.build(c)[0])
+    }
+
+    static class Groovy3163SomeBaseClass {
+
+        Object build(Integer i) {
+            return i
+        }
+
+        Object build(BigInteger i) {
+            return i
+        }
+
+        Object build(Class c) {
+            return c
+        }
+
+        Object build(Script s) {
+            return s
+        }
+    }
+
+    static class Groovy3163SomeImplementorWithStatic extends Groovy3163SomeBaseClass {
+
+        // Comment this out, otherwise the super.build(x) calls won't match the members in our parent.
+        static Object build(Closure c) {
+            [c]
+        }
+
+        // This one will also block a super.build, but it's the Script one.
+        static Object build(BigDecimal d) {
+            [d]
+        }
+
+        Object build(Integer i) {
+            [super.build(i)]
+        }
+
+        Object build(Script s) {
+            [super.build(s)]
+        }
+    }
+}