You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/07 07:32:49 UTC
groovy git commit: Revert "Update DefaultGroovyMethods boolean
operations (closes #636)"
Repository: groovy
Updated Branches:
refs/heads/master 1ef91d1e5 -> 9356f1139
Revert "Update DefaultGroovyMethods boolean operations (closes #636)"
This reverts commit f83315b
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9356f113
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9356f113
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9356f113
Branch: refs/heads/master
Commit: 9356f11397dcf80d2ffd4548bc99b2181cdc7ba0
Parents: 1ef91d1
Author: sunlan <su...@apache.org>
Authored: Thu Dec 7 15:32:42 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Dec 7 15:32:42 2017 +0800
----------------------------------------------------------------------
.../codehaus/groovy/runtime/DefaultGroovyMethods.java | 8 ++++----
.../groovy/runtime/DefaultGroovyMethodsTest.groovy | 11 +++--------
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9356f113/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index e066998..eec02af 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -15959,7 +15959,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 1.0
*/
public static Boolean and(Boolean left, Boolean right) {
- return Boolean.TRUE.equals(left) && Boolean.TRUE.equals(right);
+ return left && Boolean.TRUE.equals(right);
}
/**
@@ -15971,7 +15971,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 1.0
*/
public static Boolean or(Boolean left, Boolean right) {
- return Boolean.TRUE.equals(left) || Boolean.TRUE.equals(right);
+ return left || Boolean.TRUE.equals(right);
}
/**
@@ -15983,7 +15983,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 1.8.3
*/
public static Boolean implies(Boolean left, Boolean right) {
- return !Boolean.TRUE.equals(left) || Boolean.TRUE.equals(right);
+ return !left || Boolean.TRUE.equals(right);
}
/**
@@ -15995,7 +15995,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 1.0
*/
public static Boolean xor(Boolean left, Boolean right) {
- return Boolean.TRUE.equals(left) ^ Boolean.TRUE.equals(right);
+ return left ^ Boolean.TRUE.equals(right);
}
// public static Boolean negate(Boolean left) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9356f113/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy b/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
index 045a42d..8c567e4 100644
--- a/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
+++ b/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
@@ -17,6 +17,9 @@
* under the License.
*/
package org.codehaus.groovy.runtime
+
+import java.util.*
+
/**
* Tests for DGM methods
*/
@@ -277,10 +280,8 @@ class DefaultGroovyMethodsTest extends GroovyTestCase {
assertTrue(DefaultGroovyMethods.or(true, false))
assertTrue(DefaultGroovyMethods.or(false, true))
assertFalse(DefaultGroovyMethods.or(false, false))
- assertFalse(DefaultGroovyMethods.or(null, false))
assertFalse(DefaultGroovyMethods.or(false, null))
assertTrue(DefaultGroovyMethods.or(true, null))
- assertTrue(DefaultGroovyMethods.or(null, true))
}
void testBooleanAnd() {
@@ -288,10 +289,8 @@ class DefaultGroovyMethodsTest extends GroovyTestCase {
assertFalse(DefaultGroovyMethods.and(true, false))
assertFalse(DefaultGroovyMethods.and(false, true))
assertFalse(DefaultGroovyMethods.and(false, false))
- assertFalse(DefaultGroovyMethods.and(null, false))
assertFalse(DefaultGroovyMethods.and(false, null))
assertFalse(DefaultGroovyMethods.and(true, null))
- assertFalse(DefaultGroovyMethods.and(null, true))
}
void testBooleanXor() {
@@ -299,10 +298,8 @@ class DefaultGroovyMethodsTest extends GroovyTestCase {
assertTrue(DefaultGroovyMethods.xor(true, false))
assertTrue(DefaultGroovyMethods.xor(false, true))
assertFalse(DefaultGroovyMethods.xor(false, false))
- assertFalse(DefaultGroovyMethods.xor(null, false))
assertFalse(DefaultGroovyMethods.xor(false, null))
assertTrue(DefaultGroovyMethods.xor(true, null))
- assertTrue(DefaultGroovyMethods.xor(null, true))
}
void testBooleanImplication() {
@@ -310,9 +307,7 @@ class DefaultGroovyMethodsTest extends GroovyTestCase {
assertFalse(DefaultGroovyMethods.implies(true, false))
assertTrue(DefaultGroovyMethods.implies(false, true))
assertTrue(DefaultGroovyMethods.implies(false, false))
- assertTrue(DefaultGroovyMethods.implies(null, false))
assertTrue(DefaultGroovyMethods.implies(false, null))
assertFalse(DefaultGroovyMethods.implies(true, null))
- assertTrue(DefaultGroovyMethods.implies(null, true))
}
}