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 2021/03/03 03:15:24 UTC
[groovy] branch GROOVY_3_0_X updated (60d966a -> eebe7e9)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 60d966a GROOVY-9914: DGM: add return type parameters for collectEntries variant
new 195b13d add test case
new eebe7e9 GROOVY-9916: primitive boolean corner case: null casts to false
The 2 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.
Summary of changes:
.../typehandling/DefaultTypeTransformation.java | 2 +-
.../DefaultTypeTransformationTest.groovy | 180 ++++++++++++---------
2 files changed, 107 insertions(+), 75 deletions(-)
[groovy] 02/02: GROOVY-9916: primitive boolean corner case: null
casts to false
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit eebe7e9c27f8d4bfd3299809d2525149e5f5a727
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Jan 28 11:11:04 2021 -0600
GROOVY-9916: primitive boolean corner case: null casts to false
class C {
private boolean b
void m() {
b = null; // DefaultTypeTransformation.booleanUnbox(null)
{ ->
b = null // DefaultTypeTransformation.castToType(null,boolean)
}.call()
}
}
---
.../groovy/runtime/typehandling/DefaultTypeTransformation.java | 2 +-
.../runtime/typehandling/DefaultTypeTransformationTest.groovy | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
index ec42a9d..36264af 100644
--- a/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
+++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
@@ -215,7 +215,7 @@ public class DefaultTypeTransformation {
}
public static Object castToType(Object object, Class type) {
- if (object == null) return null;
+ if (object == null) return type == boolean.class ? Boolean.FALSE : null;
if (type == Object.class) return object;
final Class aClass = object.getClass();
diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy b/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy
index ab001e2..b5264ff 100644
--- a/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy
+++ b/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy
@@ -28,6 +28,15 @@ final class DefaultTypeTransformationTest {
void testCastToType() {
def input = null, result
+ result = DefaultTypeTransformation.castToType(input, int)
+ assert result === null
+
+ result = DefaultTypeTransformation.castToType(input, long)
+ assert result === null
+
+ result = DefaultTypeTransformation.castToType(input, boolean)
+ assert result === false // GROOVY-9916
+
result = DefaultTypeTransformation.castToType(input, Object)
assert result === null
[groovy] 01/02: add test case
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 195b13d4fa620b28533e06676023842d7026d6c8
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Jan 28 10:39:13 2021 -0600
add test case
---
.../DefaultTypeTransformationTest.groovy | 177 ++++++++++++---------
1 file changed, 100 insertions(+), 77 deletions(-)
diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy b/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy
index 933ad28..ab001e2 100644
--- a/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy
+++ b/src/test/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformationTest.groovy
@@ -18,76 +18,49 @@
*/
package org.codehaus.groovy.runtime.typehandling
-import groovy.test.GroovyTestCase
+import org.junit.Test
-import static org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation.compareTo
+import static groovy.test.GroovyAssert.shouldFail
-class DefaultTypeTransformationTest extends GroovyTestCase {
+final class DefaultTypeTransformationTest {
- static class MyNumber extends Number {
- def n
-
- MyNumber(n) {
- this.n = n
- }
-
- int intValue() { n }
-
- long longValue() { n }
-
- float floatValue() { n }
+ @Test
+ void testCastToType() {
+ def input = null, result
- double doubleValue() { n }
+ result = DefaultTypeTransformation.castToType(input, Object)
+ assert result === null
- int hashCode() { -n }
+ input = new Object()
+ result = DefaultTypeTransformation.castToType(input, Object)
+ assert result === input
- boolean equals(other) {
- if (other instanceof MyNumber) {
- return n == other.n
- }
- return false
- }
+ input = 'string'
+ result = DefaultTypeTransformation.castToType(input, Object)
+ assert result === input
- String toString() { n.toString() }
- }
-
- static class MyNumberCompareTo extends MyNumber {
-
- MyNumberCompareTo(Object n) {
- super(n)
- }
-
- int compareTo(MyNumber other) {
- return n <=> other.n
- }
- }
-
- static class MyNumberComparable extends MyNumberCompareTo implements Comparable<MyNumber> {
- MyNumberComparable(Object n) {
- super(n)
- }
-
- int compareTo(Object other) {
- return n <=> (MyNumber) other;
- }
+ input = "$input"
+ result = DefaultTypeTransformation.castToType(input, Object)
+ assert result === input
}
+ @Test
void testCompareTo() {
- def object1 = new Object()
- def object2 = new Object()
// objects
- assert compareTo(null, null) == 0
- assert compareTo(object1, null) == 1
- assert compareTo(null, object1) == -1
- assert compareTo(1, 1) == 0
+ Object object1 = new Object()
+ Object object2 = new Object()
+ assert DefaultTypeTransformation.compareTo(null, null) == 0
+ assert DefaultTypeTransformation.compareTo(object1, null) == 1
+ assert DefaultTypeTransformation.compareTo(null, object1) == -1
+ assert DefaultTypeTransformation.compareTo(1, 1) == 0
shouldFail(IllegalArgumentException) {
- compareTo(object1, object2)
+ DefaultTypeTransformation.compareTo(object1, object2)
}
// chars, int values 49 and 50
- Character char1 = '1' as Character
- Character char2 = '2' as Character
+ Character char1 = '1'.charAt(0)
+ Character char2 = '2'.charAt(0)
checkCompareToSymmetricSmallerThan(char1, char2)
MyNumber number1 = new MyNumber(49)
@@ -114,49 +87,40 @@ class DefaultTypeTransformationTest extends GroovyTestCase {
char2, '2',
number2, numCompTo2, numComp2]
- lowers.each { def lower ->
- lowers.each { def lower2 ->
- assert compareTo(lower, lower2) == 0
+ for (lower in lowers) {
+ for (lower2 in lowers) {
+ assert DefaultTypeTransformation.compareTo(lower, lower2) == 0
}
- highers.each { def higher ->
+ for (higher in highers) {
checkCompareToSymmetricSmallerThan(lower, higher)
}
}
shouldFail(IllegalArgumentException) {
- compareTo(1, "22")
+ DefaultTypeTransformation.compareTo(1, "22")
}
shouldFail(IllegalArgumentException) {
- compareTo("22", 1)
+ DefaultTypeTransformation.compareTo("22", 1)
}
// [G]Strings and chars
- assert compareTo('aa1', '2' as Character) > 0
- assert compareTo('2' as Character, 'aa1') < 0
- assert compareTo("aa${1}", '2' as Character) > 0
- assert compareTo('2' as Character, "aa${1}") < 0
+ assert DefaultTypeTransformation.compareTo('aa1', '2'.charAt(0)) > 0
+ assert DefaultTypeTransformation.compareTo('2'.charAt(0), 'aa1') < 0
+ assert DefaultTypeTransformation.compareTo("aa${1}", '2'.charAt(0)) > 0
+ assert DefaultTypeTransformation.compareTo('2'.charAt(0), "aa${1}") < 0
// Strings and GStrings
List lowers2 = ['aa1', "aa${1}"]
List highers2 = ['bb2', "b${2}"]
- lowers2.each { def lower ->
- assert compareTo(lower, lower) == 0
- highers2.each { def higher ->
+ for (lower in lowers2) {
+ assert DefaultTypeTransformation.compareTo(lower, lower) == 0
+ for (higher in highers2) {
checkCompareToSymmetricSmallerThan(lower, higher)
}
}
}
- static void checkCompareToSymmetricSmallerThan(a, b) {
- try {
- assert compareTo(a, b) < 0
- assert compareTo(b, a) > 0
- } catch (AssertionError e) {
- System.err.print(a.class.toString() + ' compared to ' + b.class.toString())
- throw e
- }
- }
-
+ @Test
void testNumberEqualsCharacterGString() {
final String S = 'A'
final GString G = "$S"
@@ -166,6 +130,7 @@ class DefaultTypeTransformationTest extends GroovyTestCase {
assert N == G
}
+ @Test
void testCharacterEqualsCharacterGString() {
final String S = 'A'
final Character C = 'A'
@@ -175,6 +140,7 @@ class DefaultTypeTransformationTest extends GroovyTestCase {
assert C == G
}
+ @Test
void testCharacterGStringsEqualsCharacter() {
final String S = 'A'
final Character C = 'A'
@@ -184,6 +150,7 @@ class DefaultTypeTransformationTest extends GroovyTestCase {
assert G == C
}
+ @Test
void testCharacterGStringEqualsNumber() {
final String S = 'A'
final GString G = "$S"
@@ -192,4 +159,60 @@ class DefaultTypeTransformationTest extends GroovyTestCase {
assert S == N && G == S
assert G == N
}
+
+ //--------------------------------------------------------------------------
+
+ private static void checkCompareToSymmetricSmallerThan(a, b) {
+ try {
+ assert DefaultTypeTransformation.compareTo(a, b) < 0
+ assert DefaultTypeTransformation.compareTo(b, a) > 0
+ } catch (AssertionError e) {
+ System.err.print(a.class.toString() + ' compared to ' + b.class.toString())
+ throw e
+ }
+ }
+
+ static class MyNumber extends Number {
+ def n
+ MyNumber(n) {
+ this.n = n
+ }
+ @Override
+ int intValue() { n }
+ @Override
+ long longValue() { n }
+ @Override
+ float floatValue() { n }
+ @Override
+ double doubleValue() { n }
+ @Override
+ int hashCode() { -n }
+ @Override
+ boolean equals(other) {
+ if (other instanceof MyNumber) {
+ return n == other.n
+ }
+ return false
+ }
+ @Override
+ String toString() { n.toString() }
+ }
+
+ static class MyNumberCompareTo extends MyNumber {
+ MyNumberCompareTo(Object n) {
+ super(n)
+ }
+ int compareTo(MyNumber other) {
+ return n <=> other.n
+ }
+ }
+
+ static class MyNumberComparable extends MyNumberCompareTo implements Comparable<MyNumber> {
+ MyNumberComparable(Object n) {
+ super(n)
+ }
+ int compareTo(Object other) {
+ return n <=> (MyNumber) other;
+ }
+ }
}