groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject [groovy] 03/03: JUnit 4
Date Sat, 14 Dec 2019 14:44:40 GMT
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 34f33f3d65c6a48b16365233c46bc6485ccaa998
Author: Eric Milles <eric.milles@thomsonreuters.com>
AuthorDate: Fri Dec 13 16:21:57 2019 -0600

    JUnit 4
    
    (cherry picked from commit a1816b35fe789eb7d7677e85d446ad8fbc49bdfe)
---
 src/test/groovy/bugs/Groovy7985.groovy    | 61 +++++++++++++++++++++++++++++
 src/test/groovy/bugs/Groovy7985Bug.groovy | 64 -------------------------------
 2 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/src/test/groovy/bugs/Groovy7985.groovy b/src/test/groovy/bugs/Groovy7985.groovy
new file mode 100644
index 0000000..c1cb35d
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy7985.groovy
@@ -0,0 +1,61 @@
+/*
+ *  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 groovy.bugs
+
+import groovy.transform.CompileStatic
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+@CompileStatic
+final class Groovy7985 {
+
+    @Test
+    void testGenericsCompatibility() {
+        assertScript '''
+            @groovy.transform.AutoFinal
+            @groovy.transform.CompileStatic
+            class Pair<L, R> implements Serializable {
+                public final L left
+                public final R right
+
+                private Pair(L left, R right) {
+                    this.left = left
+                    this.right = right
+                }
+
+                static <L, R> Pair<L, R> of(L left, R right) {
+                    return new Pair<>(left, right)
+                }
+            }
+
+            @groovy.transform.CompileStatic
+            Pair<Pair<String, Integer>, Pair<String, Integer>> doSmething()
{
+                def one = (Pair<String, Integer>) Pair.of('a', 1)
+                def two = (Pair<String, Integer>) Pair.of('b', 2)
+                return Pair.of(one, two)
+            }
+
+            assert doSmething().left.left == 'a'
+            assert doSmething().left.right == 1
+            assert doSmething().right.left == 'b'
+            assert doSmething().right.right == 2
+        '''
+    }
+}
diff --git a/src/test/groovy/bugs/Groovy7985Bug.groovy b/src/test/groovy/bugs/Groovy7985Bug.groovy
deleted file mode 100644
index c2b781a..0000000
--- a/src/test/groovy/bugs/Groovy7985Bug.groovy
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  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 groovy.bugs
-
-import groovy.test.GroovyTestCase
-
-class Groovy7985Bug extends GroovyTestCase {
-    void test1() {
-        assertScript '''
-        import java.io.Serializable;
-        import java.util.Date;
-        import groovy.transform.CompileStatic
-
-        @CompileStatic
-        class Test {
-            Pair<Pair<String, Integer>, Pair<String, Integer>> doSmething()
{
-                def left = (Pair<String, Integer>) Pair.of("a", 1)
-                def right = (Pair<String, Integer>) Pair.of("b", 2)
-                return Pair.of(left, right)
-            }
-        }
-
-        @CompileStatic
-        class Pair<L, R> implements Serializable {
-            public static <L, R> Pair<L, R> of(final L left, final R right) {
-                return new Pair<>(left, right);
-            }
-
-            public final L left;
-            public final R right;
-
-            private Pair(final L left, final R right) {
-                this.left = left;
-                this.right = right;
-            }
-        }
-        
-        assert 'a' == new Test().doSmething().left.left
-        assert 1 == new Test().doSmething().left.right
-        assert 'b' == new Test().doSmething().right.left
-        assert 2 == new Test().doSmething().right.right
-        '''
-    }
-}


Mime
View raw message