You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2016/08/23 02:15:57 UTC
[2/5] groovy git commit: findbugs: impossible cast
findbugs: impossible cast
removed cast that would always fail and added some basic tests.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4f328a19
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4f328a19
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4f328a19
Branch: refs/heads/master
Commit: 4f328a19ae8e827cbe3f11a0b97911ba6875716a
Parents: bf398af
Author: John Wagenleitner <jw...@apache.org>
Authored: Sun Aug 21 15:25:41 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Mon Aug 22 19:11:09 2016 -0700
----------------------------------------------------------------------
.../runtime/typehandling/ShortTypeHandling.java | 1 -
.../typehandling/ShortTypeHandlingTest.groovy | 64 ++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/4f328a19/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java b/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
index 44c0276..f45ca0c 100644
--- a/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
+++ b/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
@@ -41,7 +41,6 @@ public class ShortTypeHandling {
public static String castToString(Object object) {
if (object==null) return null;
- if (object instanceof Class) return (String) object;
return object.toString();
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/4f328a19/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy b/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy
new file mode 100644
index 0000000..6eba4fa
--- /dev/null
+++ b/src/test/org/codehaus/groovy/runtime/typehandling/ShortTypeHandlingTest.groovy
@@ -0,0 +1,64 @@
+/*
+ * 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 org.codehaus.groovy.runtime.typehandling
+
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToClass
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToString
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToChar
+import static org.codehaus.groovy.runtime.typehandling.ShortTypeHandling.castToEnum
+
+class ShortTypeHandlingTest extends GroovyTestCase {
+
+ void testCastToClass() {
+ assert castToClass(null) == null
+ assert castToClass(Integer.class) == Integer.class
+ assert castToClass('java.lang.String') == String.class
+ shouldFail(GroovyCastException) {
+ castToClass(Collections.emptyList())
+ }
+ }
+
+ void testCastToString() {
+ assert castToString(null) == null
+ assert castToString(String.class) == 'class java.lang.String'
+ assert castToString(List.class) == 'interface java.util.List'
+ }
+
+ void testCastToCharacter() {
+ assert castToChar(null) == null
+ char c = (char)'c'
+ assert castToChar((Object)c) == c
+ assert castToChar(Integer.valueOf(99)) == c
+ assert castToChar("${c}") == c
+ assert castToChar('c') == c
+ shouldFail(GroovyCastException) {
+ castToChar(new Date())
+ }
+ }
+
+ void testCastToEnum() {
+ assert castToEnum(null, TestStages) == null
+ assert castToEnum((Object)TestStages.AFTER_CLASS, TestStages) == TestStages.AFTER_CLASS
+ assert castToEnum("BEFORE_TEST", TestStages) == TestStages.BEFORE_TEST
+ }
+
+ enum TestStages {
+ BEFORE_CLASS, BEFORE_TEST, TEST, AFTER_TEST, AFTER_CLASS
+ }
+}