You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/01/02 04:28:39 UTC
[groovy] branch GROOVY_2_5_X updated (dd36f04 -> b01db1b)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from dd36f04 cleanup/remove @author tags as per Apache recommended practices for groovy-bsf, groovy-jmx, groovy-json, groovy-jsr223
new 1630fc1 cleanup/remove @author tags as per Apache recommended practices cont'd
new adc693b test already covered by groovyTestCase cases
new 0b00c8a cleanup/remove @author tags as per Apache recommended practices cont'd
new f8e8ad1 whitespace/formatting plus cleanup/remove @author tags as per Apache recommended practices cont'd
new b01db1b whitespace/formatting plus cleanup/remove @author tags as per Apache recommended practices cont'd
The 5 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:
gradle/pomconfigurer.gradle | 18 +-
src/main/groovy/groovy/transform/ASTTest.java | 1 -
.../groovy/transform/AnnotationCollector.java | 1 -
src/main/groovy/groovy/transform/AutoClone.java | 1 -
.../groovy/groovy/transform/AutoCloneStyle.java | 1 -
src/main/groovy/groovy/transform/BaseScript.java | 4 -
.../groovy/transform/CompilationUnitAware.java | 2 -
.../groovy/groovy/transform/CompileDynamic.groovy | 3 +-
.../groovy/groovy/transform/CompileStatic.java | 3 -
.../groovy/transform/ConditionalInterrupt.groovy | 74 +-
.../groovy/groovy/transform/EqualsAndHashCode.java | 1 -
.../groovy/transform/ExternalizeMethods.java | 1 -
.../groovy/groovy/transform/IndexedProperty.java | 1 -
.../groovy/transform/InheritConstructors.java | 1 -
src/main/groovy/groovy/transform/Memoized.java | 2 -
src/main/groovy/groovy/transform/PackageScope.java | 1 -
.../groovy/transform/PackageScopeTarget.java | 1 -
src/main/groovy/groovy/transform/SelfType.java | 1 -
src/main/groovy/groovy/transform/SourceURI.java | 1 -
src/main/groovy/groovy/transform/Synchronized.java | 1 -
.../groovy/groovy/transform/TailRecursive.groovy | 3 +-
.../groovy/groovy/transform/ThreadInterrupt.groovy | 69 +-
.../groovy/groovy/transform/TimedInterrupt.groovy | 8 +-
src/main/groovy/groovy/transform/ToString.java | 2 -
src/main/groovy/groovy/transform/TypeChecked.java | 1 -
.../groovy/groovy/transform/TypeCheckingMode.java | 2 -
src/main/groovy/groovy/transform/WithReadLock.java | 1 -
.../groovy/groovy/transform/WithWriteLock.java | 1 -
.../test/builder/ObjectGraphBuilderTest.groovy | 2 -
src/test/gls/enums/EnumTest.groovy | 3 -
src/test/gls/innerClass/InnerInterfaceTest.groovy | 2 -
src/test/gls/syntax/BinaryLiteralTest.groovy | 4 -
src/test/gls/syntax/Gep3OrderDslTest.groovy | 3 -
src/test/gls/syntax/UnderscoreInNumbersTest.groovy | 2 -
src/test/groovy/AmbiguousInvocationTest.groovy | 4 +-
src/test/groovy/BinaryStreamsTest.groovy | 2 -
src/test/groovy/BreakContinueLabelTest.groovy | 2 -
src/test/groovy/CallInnerClassCtorTest.groovy | 1 -
src/test/groovy/ClassExpressionTest.groovy | 2 -
src/test/groovy/ClosureAsParamTest.groovy | 3 -
src/test/groovy/ClosureCloneTest.groovy | 3 -
src/test/groovy/ClosureComparatorTest.groovy | 8 +-
src/test/groovy/ClosureComposeTest.groovy | 2 +-
src/test/groovy/ClosureDefaultParameterTest.groovy | 3 -
src/test/groovy/ClosureInStaticMethodTest.groovy | 35 +-
src/test/groovy/ClosureMethodCallTest.groovy | 41 +-
src/test/groovy/ClosureMethodTest.groovy | 140 ++--
src/test/groovy/ClosureMethodsOnFileTest.groovy | 8 +-
src/test/groovy/ClosureMissingMethodTest.groovy | 93 ++-
src/test/groovy/ClosureReturnTest.groovy | 12 +-
src/test/groovy/ClosureTest.groovy | 54 +-
.../groovy/ClosureUsingOuterVariablesTest.groovy | 47 +-
src/test/groovy/ClosureWithDefaultParamTest.groovy | 72 +-
.../groovy/ClosureWithEmptyParametersTest.groovy | 5 +-
src/test/groovy/DummyMethodsGroovy.groovy | 3 -
src/test/groovy/ExceptionInClosureTest.groovy | 11 +-
src/test/groovy/FileTest.groovy | 3 -
src/test/groovy/FilterLineTest.groovy | 2 -
src/test/groovy/Foo.groovy | 2 -
src/test/groovy/GroovyClosureMethodsTest.groovy | 2 -
src/test/groovy/HexTest.groovy | 2 -
src/test/groovy/IdentityClosureTest.groovy | 3 -
src/test/groovy/ImmutableModificationTest.groovy | 43 --
.../groovy/InvokeNormalMethodsFirstTest.groovy | 2 -
src/test/groovy/LiteralTypesTest.groovy | 190 +++---
src/test/groovy/MapConstructionTest.groovy | 2 -
src/test/groovy/MapPropertyTest.groovy | 19 +-
.../MethodParameterAccessWithinClosureTest.groovy | 51 +-
src/test/groovy/MinMaxTest.groovy | 38 +-
src/test/groovy/MultiCatchTest.groovy | 4 +-
src/test/groovy/MultiDimArraysTest.groovy | 6 +-
src/test/groovy/NullPropertyTest.groovy | 11 +-
src/test/groovy/OverridePropertyGetterTest.groovy | 23 +-
...ateVariableAccessFromAnotherInstanceTest.groovy | 14 +-
src/test/groovy/ProcessTest.groovy | 48 +-
src/test/groovy/Property2Test.groovy | 3 -
src/test/groovy/PropertyTest.groovy | 55 +-
src/test/groovy/ReadLineTest.groovy | 43 +-
src/test/groovy/RegularExpressionsTest.groovy | 130 ++--
src/test/groovy/ReturnTest.groovy | 26 +-
src/test/groovy/SocketTest.groovy | 4 +-
src/test/groovy/SortTest.groovy | 38 +-
src/test/groovy/SpreadDotTest.groovy | 99 +--
.../groovy/SwitchWithDifferentTypesTest.groovy | 48 +-
src/test/groovy/TextPropertyTest.groovy | 14 +-
.../UniqueOnCollectionWithClosureTest.groovy | 15 +-
.../UniqueOnCollectionWithComparatorTest.groovy | 153 ++---
src/test/groovy/VarargsMethodTest.groovy | 73 +-
src/test/groovy/annotations/MyIntegerAnno.groovy | 69 +-
src/test/groovy/beans/BindableTest.groovy | 745 ++++++++++-----------
src/test/groovy/io/LineColumnReaderTest.groovy | 3 -
.../groovy/lang/BenchmarkInterceptorTest.groovy | 29 +-
src/test/groovy/lang/ClosureResolvingTest.groovy | 3 +-
.../groovy/lang/DelegatingMetaClassTest.groovy | 8 +-
.../lang/ExpandoMetaClassCreationHandleTest.groovy | 41 +-
src/test/groovy/lang/ExpandoMetaClassTest.groovy | 126 ++--
src/test/groovy/lang/GetMethodsTest.groovy | 13 +-
src/test/groovy/lang/GroovyCodeSourceTest.groovy | 7 +-
src/test/groovy/lang/GroovySystemTest.groovy | 10 +-
src/test/groovy/lang/InterceptorTest.groovy | 4 +-
src/test/groovy/lang/MapOfClosureTest.groovy | 229 +++----
src/test/groovy/lang/MetaClassRegistryTest.groovy | 9 +-
src/test/groovy/lang/PropertyMissingTest.groovy | 22 +-
.../groovy/lang/ReferenceSerializationTest.groovy | 2 -
src/test/groovy/lang/RespondsToTest.groovy | 12 +-
.../lang/ScriptSourcePositionInAstTest.groovy | 4 +-
src/test/groovy/mock/interceptor/Caller.groovy | 15 +-
.../groovy/mock/interceptor/Collaborator.groovy | 11 +-
.../mock/interceptor/MockSingleCallTest.groovy | 38 +-
.../mock/interceptor/StubCallSequenceTest.groovy | 2 -
.../mock/interceptor/StubSingleCallTest.groovy | 6 +-
.../groovy/operator/BitwiseOperatorsTest.groovy | 32 +-
src/test/groovy/operator/NegateListsTest.groovy | 6 +-
src/test/groovy/operator/PowerOperatorsTest.groovy | 21 +-
.../groovy/operator/SpreadListOperatorTest.groovy | 8 +-
.../groovy/operator/SpreadMapOperatorTest.groovy | 64 +-
src/test/groovy/time/TimeCategoryTest.groovy | 10 +-
src/test/groovy/transform/LazyTest.groovy | 18 +-
.../groovy/transform/ThreadInterruptTest.groovy | 2 -
119 files changed, 1637 insertions(+), 1871 deletions(-)
delete mode 100644 src/test/groovy/ImmutableModificationTest.groovy
[groovy] 02/05: test already covered by groovyTestCase cases
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit adc693b6e20d652cae338f0c9451bc6130c0c2b5
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Jan 1 19:21:07 2019 +1000
test already covered by groovyTestCase cases
---
src/test/groovy/ImmutableModificationTest.groovy | 43 ------------------------
1 file changed, 43 deletions(-)
diff --git a/src/test/groovy/ImmutableModificationTest.groovy b/src/test/groovy/ImmutableModificationTest.groovy
deleted file mode 100644
index 3647057..0000000
--- a/src/test/groovy/ImmutableModificationTest.groovy
+++ /dev/null
@@ -1,43 +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
-
-/**
- * check that the new asImmutable() method works
- * as specified in GROOVY-623
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
- */
-
-class ImmutableModificationTest extends GroovyTestCase {
- void testCollectionAsImmutable() {
- def challenger = ["Telson", "Sharna", "Darv", "Astra"]
- def hopefullyImmutable = challenger.asImmutable()
- try {
- challenger.add("Angel One")
- challenger << "Angel Two"
-
- // @todo fail("'challenger' is supposed to be an immutable collection.")
-
- } catch (UnsupportedOperationException e) {
- // success if this exception is thrown
- assert 4 == challenger.size()
- }
- }
-}
\ No newline at end of file
[groovy] 05/05: whitespace/formatting plus cleanup/remove @author
tags as per Apache recommended practices cont'd
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b01db1b0c04711ce3072601d13ce7a802e242e53
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 2 08:45:39 2019 +1000
whitespace/formatting plus cleanup/remove @author tags as per Apache recommended practices cont'd
---
gradle/pomconfigurer.gradle | 3 +
src/main/groovy/groovy/transform/ASTTest.java | 1 -
.../groovy/transform/AnnotationCollector.java | 1 -
src/main/groovy/groovy/transform/AutoClone.java | 1 -
.../groovy/groovy/transform/AutoCloneStyle.java | 1 -
src/main/groovy/groovy/transform/BaseScript.java | 4 --
.../groovy/transform/CompilationUnitAware.java | 2 -
.../groovy/groovy/transform/CompileStatic.java | 3 -
.../groovy/groovy/transform/EqualsAndHashCode.java | 1 -
.../groovy/transform/ExternalizeMethods.java | 1 -
.../groovy/groovy/transform/IndexedProperty.java | 1 -
.../groovy/transform/InheritConstructors.java | 1 -
src/main/groovy/groovy/transform/Memoized.java | 2 -
src/main/groovy/groovy/transform/PackageScope.java | 1 -
.../groovy/transform/PackageScopeTarget.java | 1 -
src/main/groovy/groovy/transform/SelfType.java | 1 -
src/main/groovy/groovy/transform/SourceURI.java | 1 -
src/main/groovy/groovy/transform/Synchronized.java | 1 -
.../groovy/groovy/transform/ThreadInterrupt.groovy | 66 ++++++++++++++++------
src/main/groovy/groovy/transform/ToString.java | 2 -
src/main/groovy/groovy/transform/TypeChecked.java | 1 -
.../groovy/groovy/transform/TypeCheckingMode.java | 2 -
src/main/groovy/groovy/transform/WithReadLock.java | 1 -
.../groovy/groovy/transform/WithWriteLock.java | 1 -
24 files changed, 52 insertions(+), 48 deletions(-)
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index e9bd98b..49e447e 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -720,6 +720,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
name 'Vladimir Vivien'
}
contributor {
+ name 'Vladimir Orany'
+ }
+ contributor {
name 'Joe Wolf'
}
contributor {
diff --git a/src/main/groovy/groovy/transform/ASTTest.java b/src/main/groovy/groovy/transform/ASTTest.java
index 1cdb480..f72759f 100644
--- a/src/main/groovy/groovy/transform/ASTTest.java
+++ b/src/main/groovy/groovy/transform/ASTTest.java
@@ -49,7 +49,6 @@ import java.lang.annotation.Target;
* The <code>node</code> variable refers to the AST node where the AST test annotation is put. In the previous example,
* it means that <i>node</i> refers to the declaration node (int x).
*
- * @author Cedric Champeau
* @since 2.0.0
*
*/
diff --git a/src/main/groovy/groovy/transform/AnnotationCollector.java b/src/main/groovy/groovy/transform/AnnotationCollector.java
index d0a5653..b2476ea 100644
--- a/src/main/groovy/groovy/transform/AnnotationCollector.java
+++ b/src/main/groovy/groovy/transform/AnnotationCollector.java
@@ -170,7 +170,6 @@ import java.lang.annotation.Target;
* assert user.toString() == 'User(mrhaki)'
* </pre>
*
- * @author <a href="mailto:blackdrag@gmx.org">Jochen "blackdrag" Theodorou</a>
* @see org.codehaus.groovy.transform.AnnotationCollectorTransform
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/AutoClone.java b/src/main/groovy/groovy/transform/AutoClone.java
index 995a187..f165cab 100644
--- a/src/main/groovy/groovy/transform/AutoClone.java
+++ b/src/main/groovy/groovy/transform/AutoClone.java
@@ -230,7 +230,6 @@ import java.lang.annotation.Target;
* <li><a href="http://www.agiledeveloper.com/articles/cloning072002.htm">http://www.agiledeveloper.com/articles/cloning072002.htm</a>
* </ul>
*
- * @author Paul King
* @see AutoCloneStyle
* @see ExternalizeMethods
* @since 1.8.0
diff --git a/src/main/groovy/groovy/transform/AutoCloneStyle.java b/src/main/groovy/groovy/transform/AutoCloneStyle.java
index 81b0ebd..d2b4521 100644
--- a/src/main/groovy/groovy/transform/AutoCloneStyle.java
+++ b/src/main/groovy/groovy/transform/AutoCloneStyle.java
@@ -21,7 +21,6 @@ package groovy.transform;
/**
* Intended style to use for cloning when using the {@code @}AutoClone annotation.
*
- * @author Paul King
* @since 1.8.0
* @see groovy.transform.AutoClone
*/
diff --git a/src/main/groovy/groovy/transform/BaseScript.java b/src/main/groovy/groovy/transform/BaseScript.java
index 2720b79..bc058cc 100644
--- a/src/main/groovy/groovy/transform/BaseScript.java
+++ b/src/main/groovy/groovy/transform/BaseScript.java
@@ -139,10 +139,6 @@ import java.lang.annotation.Target;
* assert car.distance == 20
* assert car.state == 'stopped'
* </pre>
- *
- * @author Paul King
- * @author Vladimir Orany
- * @author Jim White
* @since 2.2.0
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/CompilationUnitAware.java b/src/main/groovy/groovy/transform/CompilationUnitAware.java
index b609f43..9d36858 100644
--- a/src/main/groovy/groovy/transform/CompilationUnitAware.java
+++ b/src/main/groovy/groovy/transform/CompilationUnitAware.java
@@ -22,8 +22,6 @@ import org.codehaus.groovy.control.CompilationUnit;
/**
* This interface is for AST transformations which must be aware of the compilation unit where they are applied.
- *
- * @author Cedric Champeau
*/
public interface CompilationUnitAware {
void setCompilationUnit(CompilationUnit unit);
diff --git a/src/main/groovy/groovy/transform/CompileStatic.java b/src/main/groovy/groovy/transform/CompileStatic.java
index 16dbc33..02efd91 100644
--- a/src/main/groovy/groovy/transform/CompileStatic.java
+++ b/src/main/groovy/groovy/transform/CompileStatic.java
@@ -40,9 +40,6 @@ import java.lang.annotation.Target;
* a class can be annotated with CompileStatic, and a method within can be marked
* to skip static checking to use dynamic language features.
*
- * @author <a href="mailto:blackdrag@gmx.org">Jochen "blackdrag" Theodorou</a>
- * @author Cedric Champeau
- *
* @see CompileDynamic
*/
@Documented
diff --git a/src/main/groovy/groovy/transform/EqualsAndHashCode.java b/src/main/groovy/groovy/transform/EqualsAndHashCode.java
index 552a65f..14048eaf 100644
--- a/src/main/groovy/groovy/transform/EqualsAndHashCode.java
+++ b/src/main/groovy/groovy/transform/EqualsAndHashCode.java
@@ -220,7 +220,6 @@ import java.lang.annotation.Target;
* </pre>
*
* @see org.codehaus.groovy.util.HashCodeHelper
- * @author Paul King
* @since 1.8.0
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/ExternalizeMethods.java b/src/main/groovy/groovy/transform/ExternalizeMethods.java
index 5ef37a0..16b27f9 100644
--- a/src/main/groovy/groovy/transform/ExternalizeMethods.java
+++ b/src/main/groovy/groovy/transform/ExternalizeMethods.java
@@ -67,7 +67,6 @@ import java.lang.annotation.Target;
* }
* </pre>
*
- * @author Paul King
* @since 1.8.0
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/IndexedProperty.java b/src/main/groovy/groovy/transform/IndexedProperty.java
index b6d47dc..9ec47b4 100644
--- a/src/main/groovy/groovy/transform/IndexedProperty.java
+++ b/src/main/groovy/groovy/transform/IndexedProperty.java
@@ -96,7 +96,6 @@ import java.lang.annotation.Target;
* assert 'Hubert' == indexedGroup.members[1]
* </pre>
*
- * @author Paul King
* @since 1.7.3
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/InheritConstructors.java b/src/main/groovy/groovy/transform/InheritConstructors.java
index ba7758a..93a01fd 100644
--- a/src/main/groovy/groovy/transform/InheritConstructors.java
+++ b/src/main/groovy/groovy/transform/InheritConstructors.java
@@ -143,7 +143,6 @@ import java.lang.annotation.Target;
* assert 'Liam' == child.name
* </pre>
*
- * @author Paul King
* @since 1.7.3
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/Memoized.java b/src/main/groovy/groovy/transform/Memoized.java
index efecb17..5bd1dc1 100644
--- a/src/main/groovy/groovy/transform/Memoized.java
+++ b/src/main/groovy/groovy/transform/Memoized.java
@@ -124,8 +124,6 @@ import java.lang.annotation.Target;
* // increment is invoked so incrementChange is true.
* assert incrementChange
* </pre>
- *
- * @author Andrey Bloschetsov
*/
@java.lang.annotation.Documented
@Retention(RetentionPolicy.SOURCE)
diff --git a/src/main/groovy/groovy/transform/PackageScope.java b/src/main/groovy/groovy/transform/PackageScope.java
index caa77a7..8b0f6a1 100644
--- a/src/main/groovy/groovy/transform/PackageScope.java
+++ b/src/main/groovy/groovy/transform/PackageScope.java
@@ -59,7 +59,6 @@ import java.lang.annotation.Target;
* This transformation is not frequently needed but can be useful in certain testing scenarios
* or when using a third-party library or framework which relies upon package scoping.
*
- * @author Paul King
* @since 1.8.0
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/PackageScopeTarget.java b/src/main/groovy/groovy/transform/PackageScopeTarget.java
index 726d47a..5952139 100644
--- a/src/main/groovy/groovy/transform/PackageScopeTarget.java
+++ b/src/main/groovy/groovy/transform/PackageScopeTarget.java
@@ -21,7 +21,6 @@ package groovy.transform;
/**
* Intended target when {@code @}PackageScope is placed at the class level.
*
- * @author Paul King
* @since 1.8.0
*/
public enum PackageScopeTarget {
diff --git a/src/main/groovy/groovy/transform/SelfType.java b/src/main/groovy/groovy/transform/SelfType.java
index 5b2ccb3..fcf8cfa 100644
--- a/src/main/groovy/groovy/transform/SelfType.java
+++ b/src/main/groovy/groovy/transform/SelfType.java
@@ -71,7 +71,6 @@ import java.lang.annotation.Target;
* to, which is often the case where a trait needs to be applied on a class provided by a third-party
* library.
*
- * @author Cédric Champeau
* @since 2.4.0
*/
@Documented
diff --git a/src/main/groovy/groovy/transform/SourceURI.java b/src/main/groovy/groovy/transform/SourceURI.java
index 4104369..25bb40d 100644
--- a/src/main/groovy/groovy/transform/SourceURI.java
+++ b/src/main/groovy/groovy/transform/SourceURI.java
@@ -43,7 +43,6 @@ import java.lang.annotation.Target;
* assert sourceURI instanceof java.net.URI
* </pre>
*
- * @author Jim White
* @since 2.3.0
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/Synchronized.java b/src/main/groovy/groovy/transform/Synchronized.java
index 8282270..d7c498a 100644
--- a/src/main/groovy/groovy/transform/Synchronized.java
+++ b/src/main/groovy/groovy/transform/Synchronized.java
@@ -155,7 +155,6 @@ import java.lang.annotation.Target;
* tc2.join()
* </pre>
*
- * @author Paul King
* @since 1.7.3
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/ThreadInterrupt.groovy b/src/main/groovy/groovy/transform/ThreadInterrupt.groovy
index 8c779d4..59cd2a9 100644
--- a/src/main/groovy/groovy/transform/ThreadInterrupt.groovy
+++ b/src/main/groovy/groovy/transform/ThreadInterrupt.groovy
@@ -37,16 +37,26 @@ import java.lang.annotation.Target
* isInterruptedCheck and throw a InterruptedException if the check yields true. The annotation by default
* will apply to any classes defined in the script as well. Annotated a class will cause (by default) all classes
* in the entire file ('Compilation Unit') to be enhanced. You can fine tune what is enhanced using the annotation
- * parameters.
+ * parameters.
* <p>
* The following is sample usage of the annotation:
*
* <pre>
* <code>@groovy.transform.ThreadInterrupt</code>
- * def scriptMethod() {* 4.times {* println 'executing script method...'
- *}*}*
- * class MyClass {* def myMethod() {* for (i in (1..10)) {* println 'executing method...'
- *}*}*}*
+ * def scriptMethod() {
+ * 4.times {
+ * println 'executing script method...'
+ * }
+ * }
+ *
+ * class MyClass {
+ * def myMethod() {
+ * for (i in (1..10)) {
+ * println 'executing method...'
+ * }
+ * }
+ * }
+ *
* scriptMethod()
* new MyClass().myMethod()
* </pre>
@@ -54,22 +64,43 @@ import java.lang.annotation.Target
* Which results in the following code being generated. Notice the checks and exceptions:
*
* <pre>
- * public class script1290627909406 extends groovy.lang.Script {*
- * public java.lang.Object scriptMethod() {* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
- *}* 4.times({* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
- *}* this.println('executing script method...')
- *})
- *}*}* public class MyClass extends java.lang.Object {*
- * public java.lang.Object myMethod() {* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
- *}* for (java.lang.Object i : (1..10)) {* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
- *}* this.println('executing method...')
- *}*}*}*
+ * public class script1290627909406 extends groovy.lang.Script {
+ *
+ * public java.lang.Object scriptMethod() {
+ * if (java.lang.Thread.currentThread().isInterrupted()) {
+ * throw new java.lang.InterruptedException('Execution Interrupted')
+ * }
+ * 4.times({
+ * if (java.lang.Thread.currentThread().isInterrupted()) {
+ * throw new java.lang.InterruptedException('Execution Interrupted')
+ * }
+ * this.println('executing script method...')
+ * })
+ * }
+ * }
+ * public class MyClass extends java.lang.Object {
+ *
+ * public java.lang.Object myMethod() {
+ * if (java.lang.Thread.currentThread().isInterrupted()) {
+ * throw new java.lang.InterruptedException('Execution Interrupted')
+ * }
+ * for (java.lang.Object i : (1..10)) {
+ * if (java.lang.Thread.currentThread().isInterrupted()) {
+ * throw new java.lang.InterruptedException('Execution Interrupted')
+ * }
+ * this.println('executing method...')
+ * }
+ * }
+ * }
+ *
* this.scriptMethod()
* new MyClass().myMethod()
* </pre>
* Additional usage examples can be found in the unit test for this class.
*
- * @see TimedInterrupt* @see ConditionalInterrupt* @since 1.8.0
+ * @see TimedInterrupt
+ * @see ConditionalInterrupt
+ * @since 1.8.0
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
@@ -96,7 +127,8 @@ import java.lang.annotation.Target
* Set to true (the default) for blanket coverage of isInterrupted checks on all methods, loops
* and closures within the class/script.
*
- * @since 2.2.0* @see #applyToAllClasses()
+ * @since 2.2.0
+ * @see #applyToAllClasses()
*/
boolean applyToAllMembers() default true
diff --git a/src/main/groovy/groovy/transform/ToString.java b/src/main/groovy/groovy/transform/ToString.java
index 9a9335f..7ed6e9b 100644
--- a/src/main/groovy/groovy/transform/ToString.java
+++ b/src/main/groovy/groovy/transform/ToString.java
@@ -249,8 +249,6 @@ import java.lang.annotation.Target;
* assert course.title == 'Grails with REST'
* </pre>
*
- * @author Paul King
- * @author Andre Steingress
* @see groovy.transform.Immutable
* @see groovy.transform.Canonical
* @since 1.8.0
diff --git a/src/main/groovy/groovy/transform/TypeChecked.java b/src/main/groovy/groovy/transform/TypeChecked.java
index b902f3f..3d8c902 100644
--- a/src/main/groovy/groovy/transform/TypeChecked.java
+++ b/src/main/groovy/groovy/transform/TypeChecked.java
@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
/**
* This will let the Groovy compiler use compile time checks in the style of Java.
- * @author <a href="mailto:blackdrag@gmx.org">Jochen "blackdrag" Theodorou</a>
*/
@java.lang.annotation.Documented
@Retention(RetentionPolicy.SOURCE)
diff --git a/src/main/groovy/groovy/transform/TypeCheckingMode.java b/src/main/groovy/groovy/transform/TypeCheckingMode.java
index 075bd71..f5971e9 100644
--- a/src/main/groovy/groovy/transform/TypeCheckingMode.java
+++ b/src/main/groovy/groovy/transform/TypeCheckingMode.java
@@ -22,8 +22,6 @@ package groovy.transform;
* This enumeration can be used whenever it is preferred to annotate a class as
* {@link TypeChecked} in general, but where only one or more methods are "dynamic". This allows the user
* to annotate the class itself then annotate only the methods which require exclusion.
- *
- * @author Cedric Champeau
*/
public enum TypeCheckingMode {
PASS,
diff --git a/src/main/groovy/groovy/transform/WithReadLock.java b/src/main/groovy/groovy/transform/WithReadLock.java
index 475786a..7b34c8b 100644
--- a/src/main/groovy/groovy/transform/WithReadLock.java
+++ b/src/main/groovy/groovy/transform/WithReadLock.java
@@ -89,7 +89,6 @@ import java.lang.annotation.Target;
* }
* </pre>
*
- * @author Hamlet D'Arcy
* @since 1.8.0
*/
@java.lang.annotation.Documented
diff --git a/src/main/groovy/groovy/transform/WithWriteLock.java b/src/main/groovy/groovy/transform/WithWriteLock.java
index 1eeb7f0..fbce01a 100644
--- a/src/main/groovy/groovy/transform/WithWriteLock.java
+++ b/src/main/groovy/groovy/transform/WithWriteLock.java
@@ -89,7 +89,6 @@ import java.lang.annotation.Target;
* }
* </pre>
*
- * @author Hamlet D'Arcy
* @since 1.8.0
*/
@java.lang.annotation.Documented
[groovy] 03/05: cleanup/remove @author tags as per Apache
recommended practices cont'd
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0b00c8ad62469c547466d863d3f60f35c29c0adc
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Jan 1 19:42:01 2019 +1000
cleanup/remove @author tags as per Apache recommended practices cont'd
---
gradle/pomconfigurer.gradle | 6 +-
src/test/groovy/FileTest.groovy | 3 -
src/test/groovy/FilterLineTest.groovy | 2 -
src/test/groovy/Foo.groovy | 2 -
src/test/groovy/GroovyClosureMethodsTest.groovy | 2 -
src/test/groovy/HexTest.groovy | 2 -
src/test/groovy/IdentityClosureTest.groovy | 3 -
.../groovy/InvokeNormalMethodsFirstTest.groovy | 2 -
src/test/groovy/LiteralTypesTest.groovy | 190 +++---
src/test/groovy/MapConstructionTest.groovy | 2 -
src/test/groovy/MapPropertyTest.groovy | 19 +-
.../MethodParameterAccessWithinClosureTest.groovy | 51 +-
src/test/groovy/MinMaxTest.groovy | 38 +-
src/test/groovy/MultiCatchTest.groovy | 4 +-
src/test/groovy/MultiDimArraysTest.groovy | 6 +-
src/test/groovy/NullPropertyTest.groovy | 11 +-
src/test/groovy/OverridePropertyGetterTest.groovy | 23 +-
...ateVariableAccessFromAnotherInstanceTest.groovy | 14 +-
src/test/groovy/ProcessTest.groovy | 48 +-
src/test/groovy/Property2Test.groovy | 3 -
src/test/groovy/PropertyTest.groovy | 55 +-
src/test/groovy/ReadLineTest.groovy | 43 +-
src/test/groovy/RegularExpressionsTest.groovy | 130 ++--
src/test/groovy/ReturnTest.groovy | 26 +-
src/test/groovy/SocketTest.groovy | 4 +-
src/test/groovy/SortTest.groovy | 38 +-
src/test/groovy/SpreadDotTest.groovy | 99 +--
.../groovy/SwitchWithDifferentTypesTest.groovy | 48 +-
src/test/groovy/TextPropertyTest.groovy | 14 +-
.../UniqueOnCollectionWithClosureTest.groovy | 15 +-
.../UniqueOnCollectionWithComparatorTest.groovy | 153 ++---
src/test/groovy/VarargsMethodTest.groovy | 73 +-
src/test/groovy/annotations/MyIntegerAnno.groovy | 69 +-
src/test/groovy/beans/BindableTest.groovy | 745 ++++++++++-----------
34 files changed, 947 insertions(+), 996 deletions(-)
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 6a5ce05..61aa7bb 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -588,9 +588,6 @@ project.ext.pomConfigureClosureWithoutTweaks = {
name 'Chris K Wensel'
}
contributor {
- name 'Joachim Baumann'
- }
- contributor {
name 'David Sutherland'
}
contributor {
@@ -684,6 +681,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
name 'Thomas Heller'
}
contributor {
+ name 'John Stump'
+ }
+ contributor {
name 'Ivan Ganza'
}
contributor {
diff --git a/src/test/groovy/FileTest.groovy b/src/test/groovy/FileTest.groovy
index 613a05d..9e9fe11 100644
--- a/src/test/groovy/FileTest.groovy
+++ b/src/test/groovy/FileTest.groovy
@@ -23,9 +23,6 @@ import static groovy.io.FileVisitResult.*
/**
* Unit test for File GDK methods
- *
- * @author Marc Guillemot
- * @author Paul King
*/
class FileTest extends GroovyTestCase {
diff --git a/src/test/groovy/FilterLineTest.groovy b/src/test/groovy/FilterLineTest.groovy
index a091ad9..1611e40 100644
--- a/src/test/groovy/FilterLineTest.groovy
+++ b/src/test/groovy/FilterLineTest.groovy
@@ -22,8 +22,6 @@ package groovy
* check that the new filterLine() method on InputStream is ok
* (and indirectly test newReader() method on InputStream)
* as specified in GROOVY-624 and GROOVY-625
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
class FilterLineTest extends GroovyTestCase {
diff --git a/src/test/groovy/Foo.groovy b/src/test/groovy/Foo.groovy
index ce183e2..889dd53 100644
--- a/src/test/groovy/Foo.groovy
+++ b/src/test/groovy/Foo.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* A dummy bean for testing the use of properties in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class Foo implements Serializable {
diff --git a/src/test/groovy/GroovyClosureMethodsTest.groovy b/src/test/groovy/GroovyClosureMethodsTest.groovy
index 256d1f6..f43a7b5 100644
--- a/src/test/groovy/GroovyClosureMethodsTest.groovy
+++ b/src/test/groovy/GroovyClosureMethodsTest.groovy
@@ -25,8 +25,6 @@ import java.util.concurrent.TimeUnit
* Test case for the eachObject method on a file containing
* zero, one or more objects (object stream). Also test cases
* for eachDir, eachFileMatch and runAfter methods.
- *
- * @author Hein Meling
*/
class GroovyClosureMethodsTest extends GroovyTestCase {
diff --git a/src/test/groovy/HexTest.groovy b/src/test/groovy/HexTest.groovy
index a28acff..aa76b5d 100644
--- a/src/test/groovy/HexTest.groovy
+++ b/src/test/groovy/HexTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* Test cases for encodeHex methods in DefaultGroovyMethods
- *
- * @author Brian Alexander (balexand@gmail.com)
*/
class HexTest extends GroovyTestCase {
diff --git a/src/test/groovy/IdentityClosureTest.groovy b/src/test/groovy/IdentityClosureTest.groovy
index 53fdbdb..65599b8 100644
--- a/src/test/groovy/IdentityClosureTest.groovy
+++ b/src/test/groovy/IdentityClosureTest.groovy
@@ -20,9 +20,6 @@ package groovy
/**
* Check that Object.identity(Closure) method works as expected
- *
- * @author Jeremy Rayner
- * @author Guillaume Laforge
*/
class IdentityClosureTest extends GroovyTestCase {
diff --git a/src/test/groovy/InvokeNormalMethodsFirstTest.groovy b/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
index aae4535..c3a179a 100644
--- a/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
+++ b/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* Invoke normal methods first: if no statically typed method exist, use invokeMethod().
- *
- * @author Guillaume Laforge
*/
class InvokeNormalMethodsFirstTest extends GroovyTestCase {
diff --git a/src/test/groovy/LiteralTypesTest.groovy b/src/test/groovy/LiteralTypesTest.groovy
index bbc4ae4..4a792cd 100644
--- a/src/test/groovy/LiteralTypesTest.groovy
+++ b/src/test/groovy/LiteralTypesTest.groovy
@@ -22,142 +22,140 @@ package groovy
* Test numeric literal types (with and without suffixes)
* @see org.codehaus.groovy.syntax.parser/ASTBuilder#createIntegralNumber()
* @see org.codehaus.groovy.syntax.parser/ASTBuilder#createDecimalNumber()
- *
- * @author Brian Larson
*/
class LiteralTypesTest extends GroovyTestCase {
void testIntegral() {
- def x = 42;
- assert x instanceof Integer;
+ def x = 42
+ assert x instanceof Integer
- x = 42I;
- assert x instanceof Integer;
+ x = 42I
+ assert x instanceof Integer
- x = 42i;
- assert x instanceof Integer;
+ x = 42i
+ assert x instanceof Integer
- x = 42L;
- assert x instanceof Long;
+ x = 42L
+ assert x instanceof Long
- x = 42G;
- assert x instanceof BigInteger;
+ x = 42G
+ assert x instanceof BigInteger
- x = 0xFF; //Hex
- assert x instanceof Integer;
- assert x == new Integer("255");
+ x = 0xFF //Hex
+ assert x instanceof Integer
+ assert x == new Integer("255")
- x = 0xFFL; //Hex
- assert x instanceof Long;
- assert x == new Long("255");
+ x = 0xFFL //Hex
+ assert x instanceof Long
+ assert x == new Long("255")
- x = 0xFFG; //Hex
- assert x instanceof BigInteger;
- assert x == new BigInteger("FF",16);
+ x = 0xFFG //Hex
+ assert x instanceof BigInteger
+ assert x == new BigInteger("FF",16)
- x = 0x9000000000000000;
- assert x instanceof BigInteger;
- assert x == new BigInteger("9000000000000000",16);
+ x = 0x9000000000000000
+ assert x instanceof BigInteger
+ assert x == new BigInteger("9000000000000000",16)
- x = 077; //octal
- assert x instanceof Integer;
- assert x == new Integer("63");
+ x = 077 //octal
+ assert x instanceof Integer
+ assert x == new Integer("63")
- x = 077l; //octal
- assert x instanceof Long;
- assert x == new Long("63");
+ x = 077l //octal
+ assert x instanceof Long
+ assert x == new Long("63")
- x = 077g; //octal
- assert x instanceof BigInteger;
- assert x == new BigInteger("77",8);
+ x = 077g //octal
+ assert x instanceof BigInteger
+ assert x == new BigInteger("77",8)
- x = 2147483647; // max integer value
- assert x instanceof Integer;
- assert x == new Integer("2147483647");
+ x = 2147483647 // max integer value
+ assert x instanceof Integer
+ assert x == new Integer("2147483647")
- x = -2147483648; // min integer constant
+ x = -2147483648 // min integer constant
assert x < 0
- assert x == new Integer("-2147483648");
- assert x instanceof Integer, x.class;
+ assert x == new Integer("-2147483648")
+ assert x instanceof Integer, x.class
- x = -2147483649; // min integer value - 1
- assert x == new Long("-2147483649");
- assert x instanceof Long;
+ x = -2147483649 // min integer value - 1
+ assert x == new Long("-2147483649")
+ assert x instanceof Long
- x = 2147483648; // 1 + max integer value
- assert x == new Long("2147483648");
- assert x instanceof Long;
+ x = 2147483648 // 1 + max integer value
+ assert x == new Long("2147483648")
+ assert x instanceof Long
- x = 9223372036854775807; // max long value
- assert x == new Long("9223372036854775807");
- assert x instanceof Long;
+ x = 9223372036854775807 // max long value
+ assert x == new Long("9223372036854775807")
+ assert x instanceof Long
- x = -9223372036854775808; // min long value
- assert x == new Long("-9223372036854775808");
- assert x instanceof Long;
+ x = -9223372036854775808 // min long value
+ assert x == new Long("-9223372036854775808")
+ assert x instanceof Long
- x = -9223372036854775809; // min long value - 1
- assert x == new BigInteger("-9223372036854775809");
- assert x instanceof BigInteger;
+ x = -9223372036854775809 // min long value - 1
+ assert x == new BigInteger("-9223372036854775809")
+ assert x instanceof BigInteger
- x = 9223372036854775808; // 1 + max long value
- assert x == new BigInteger("9223372036854775808");
- assert x instanceof BigInteger;
+ x = 9223372036854775808 // 1 + max long value
+ assert x == new BigInteger("9223372036854775808")
+ assert x instanceof BigInteger
}
void testDecimal() {
- def x = 3.2;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("3.2");
+ def x = 3.2
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("3.2")
- x = 3.2G;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("3.2");
+ x = 3.2G
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("3.2")
- x = 3.2g;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("3.2");
+ x = 3.2g
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("3.2")
- x = -3.2;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("-3.2");
+ x = -3.2
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("-3.2")
- x = 3.2D;
- assert x instanceof Double;
- assert x == new Double("3.2");
+ x = 3.2D
+ assert x instanceof Double
+ assert x == new Double("3.2")
- x = -3.2d;
- assert x instanceof Double;
- assert x == new Double("-3.2");
+ x = -3.2d
+ assert x instanceof Double
+ assert x == new Double("-3.2")
- x = 3.2F;
- assert x instanceof Float;
- assert x == new Float("3.2");
+ x = 3.2F
+ assert x instanceof Float
+ assert x == new Float("3.2")
- x = -3.2f;
- assert x instanceof Float;
- assert x == new Float("-3.2");
+ x = -3.2f
+ assert x instanceof Float
+ assert x == new Float("-3.2")
}
void testExponential() {
- def x = 3.1415926535e42;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("3.1415926535e42");
+ def x = 3.1415926535e42
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("3.1415926535e42")
- x = 3.2e+2;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("3.2e+2");
+ x = 3.2e+2
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("3.2e+2")
- x = 3.2e-2;
- assert x instanceof BigDecimal;
- assert x == new BigDecimal("3.2e-2");
+ x = 3.2e-2
+ assert x instanceof BigDecimal
+ assert x == new BigDecimal("3.2e-2")
- x = 3.2e2d;
- assert x instanceof Double;
- assert x == new Double("3.2e2");
+ x = 3.2e2d
+ assert x instanceof Double
+ assert x == new Double("3.2e2")
- x = 3.2e2f;
- assert x instanceof Float;
- assert x == new Float("3.2e2");
+ x = 3.2e2f
+ assert x instanceof Float
+ assert x == new Float("3.2e2")
}
}
diff --git a/src/test/groovy/MapConstructionTest.groovy b/src/test/groovy/MapConstructionTest.groovy
index 23e3033..07ba975 100644
--- a/src/test/groovy/MapConstructionTest.groovy
+++ b/src/test/groovy/MapConstructionTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* Tests creating Maps in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class MapConstructionTest extends GroovyTestCase {
diff --git a/src/test/groovy/MapPropertyTest.groovy b/src/test/groovy/MapPropertyTest.groovy
index 3176145..2762721 100644
--- a/src/test/groovy/MapPropertyTest.groovy
+++ b/src/test/groovy/MapPropertyTest.groovy
@@ -18,22 +18,19 @@
*/
package groovy
-/**
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- */
class MapPropertyTest extends GroovyTestCase {
void testGetAndSetProperties() {
- def m = [ 'name' : 'James', 'location' : 'London', 'id':1 ]
-
+ def m = ['name': 'James', 'location': 'London', 'id': 1]
+
assert m.name == 'James'
assert m.location == 'London'
assert m.id == 1
-
+
m.name = 'Bob'
m.location = 'Atlanta'
m.id = 2
-
+
assert m.name == 'Bob'
assert m.location == 'Atlanta'
assert m.id == 2
@@ -41,16 +38,16 @@ class MapPropertyTest extends GroovyTestCase {
void testSetupAndEmptyMap() {
def m = [:]
-
+
m.name = 'Bob'
m.location = 'Atlanta'
m.id = 2
-
+
assert m.name == 'Bob'
assert m.location == 'Atlanta'
assert m.id == 2
}
-
+
void testMapSubclassing() {
def c = new MyClass()
@@ -64,7 +61,7 @@ class MapPropertyTest extends GroovyTestCase {
// GROOVY-5985
void testMapPutAtWithKeyMatchingReadOnlyProperty() {
- def map = [serialVersionUID:123]
+ def map = [serialVersionUID: 123]
assert map["serialVersionUID"] == 123
assert map.serialVersionUID == 123
diff --git a/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy b/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
index c530b94..60d125f 100644
--- a/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
+++ b/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
@@ -20,41 +20,40 @@ package groovy
/**
* To test access to method scoped variable within closure
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
-
-
-class MethodParameterAccessWithinClosureTest extends GroovyTestCase {
+class MethodParameterAccessWithinClosureTest extends GroovyTestCase {
def cheese
def shop
-
+
void setUp() {
cheese = null
shop = ["wensleydale"]
- }
- void testSimpleMethodParameterAccess() {
- assert "wensleydale" == vendor1("wensleydale")
}
+
+ void testSimpleMethodParameterAccess() {
+ assert "wensleydale" == vendor1("wensleydale")
+ }
+
void testMethodParameterWithDifferentNameToPropertyUsingClosure() {
assert "wensleydale" == vendor2("wensleydale")
}
+
void testMethodParameterWithSameNameAsPropertyUsingClosure() {
assert "wensleydale" == vendor3("wensleydale")
}
-
+
void testOptionalMethodParameterUsedInClosure() {
assert "wensleydale" == vendor4("wensleydale")
assert null == vendor4()
}
-
+
void testDoubleParameterAndsingleParameterUsedInClosure() {
- assert vendor5(5.0d,2) == 7.0d
+ assert vendor5(5.0d, 2) == 7.0d
}
-
+
void testAccessToMethodParameterInOverwrittenMethodCalledBySuper() {
- // GROOVY-2107
- assertScript """
+ // GROOVY-2107
+ assertScript """
class A {
// the closure is accessing the parameter
def foo(x){ return {x}}
@@ -66,28 +65,28 @@ class MethodParameterAccessWithinClosureTest extends GroovyTestCase {
}
def b = new B()
assert b.foo(1).call() == 2
- """
+ """
}
-
+
private String vendor1(cheese) {
cheese
}
-
+
private String vendor2(aCheese) {
- shop.find() {it == aCheese}
+ shop.find() { it == aCheese }
}
-
+
private String vendor3(cheese) {
- shop.find() {it == cheese}
+ shop.find() { it == cheese }
}
-
+
/** note: cheese is a field, that is intended **/
- private vendor4(aCheese=cheese) {
- shop.find() {it == aCheese}
+ private vendor4(aCheese = cheese) {
+ shop.find() { it == aCheese }
}
-
+
private vendor5(double a, int b) {
- b.times {a++}
+ b.times { a++ }
return a
}
}
\ No newline at end of file
diff --git a/src/test/groovy/MinMaxTest.groovy b/src/test/groovy/MinMaxTest.groovy
index 131ab39..a11a87a 100644
--- a/src/test/groovy/MinMaxTest.groovy
+++ b/src/test/groovy/MinMaxTest.groovy
@@ -18,48 +18,46 @@
*/
package groovy
-/**
+/**
* Tests the min() and max() functions
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class MinMaxTest extends GroovyTestCase {
void testSimpleMinMax() {
def list = [5, 2, 6, 1, 9, 8]
-
+
def n = list.min()
assert n == 1
-
+
n = list.max()
assert n == 9
}
-
+
void testMinMaxWithComparator() {
def people = getPeople()
// let's find the maximum by name
- def order = new OrderBy( { it.get('@cheese') } )
+ def order = new OrderBy({ it.get('@cheese') })
def p = people.min(order)
- assert p.get("@name") == "Joe" , "found person ${p}"
+ assert p.get("@name") == "Joe", "found person ${p}"
p = people.max(order)
- assert p.get("@name") == "Chris" , "found person ${p}"
+ assert p.get("@name") == "Chris", "found person ${p}"
}
-
+
void testMinMaxOnArraysWithComparator() {
Person[] people = [
- new Person(name:'James', cheese:'Edam', location:'London'),
- new Person(name:'Bob', cheese:'Cheddar', location:'Atlanta'),
- new Person(name:'Chris', cheese:'Red Leicester', location:'London'),
- new Person(name:'Joe', cheese:'Brie', location:'London')
+ new Person(name: 'James', cheese: 'Edam', location: 'London'),
+ new Person(name: 'Bob', cheese: 'Cheddar', location: 'Atlanta'),
+ new Person(name: 'Chris', cheese: 'Red Leicester', location: 'London'),
+ new Person(name: 'Joe', cheese: 'Brie', location: 'London')
]
// let's find the maximum by name
- def order = new OrderBy( { it.cheese } )
+ def order = new OrderBy({ it.cheese })
def p = people.min(order)
assert p.name == "Joe", "Expected to find Joe but found person ${p}"
@@ -71,12 +69,12 @@ class MinMaxTest extends GroovyTestCase {
def getPeople() {
def builder = new NodeBuilder()
def tree = builder.people {
- person(name:'James', cheese:'Edam', location:'London')
- person(name:'Bob', cheese:'Cheddar', location:'Atlanta')
- person(name:'Chris', cheese:'Red Leicester', location:'London')
- person(name:'Joe', cheese:'Brie', location:'London')
+ person(name: 'James', cheese: 'Edam', location: 'London')
+ person(name: 'Bob', cheese: 'Cheddar', location: 'Atlanta')
+ person(name: 'Chris', cheese: 'Red Leicester', location: 'London')
+ person(name: 'Joe', cheese: 'Brie', location: 'London')
}
-
+
return tree.children()
}
diff --git a/src/test/groovy/MultiCatchTest.groovy b/src/test/groovy/MultiCatchTest.groovy
index 06647d6..d23829f 100644
--- a/src/test/groovy/MultiCatchTest.groovy
+++ b/src/test/groovy/MultiCatchTest.groovy
@@ -20,10 +20,8 @@ package groovy
/**
* Test for the multi-catch exception from JDK 7 (Project Coin)
- *
- * @author Cedric Champeau
*/
-class MultiCatchTest extends GroovyTestCase{
+class MultiCatchTest extends GroovyTestCase {
void testDynamicCatch() {
def catched = false
diff --git a/src/test/groovy/MultiDimArraysTest.groovy b/src/test/groovy/MultiDimArraysTest.groovy
index ee32286..4327432 100644
--- a/src/test/groovy/MultiDimArraysTest.groovy
+++ b/src/test/groovy/MultiDimArraysTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* Expose how to deal with multi-dimensional Arrays until this is supported at the language level.
- * @author Dierk Koenig
- * @author Jochen Theodorou
*/
class MultiDimArraysTest extends GroovyTestCase {
@@ -44,13 +42,13 @@ class MultiDimArraysTest extends GroovyTestCase {
def someArrayOfStringArrays = new SomeClass().anArrayOfStringArraysWorkaround()
assert 1 == someArrayOfStringArrays.size()
assert "whatever" == someArrayOfStringArrays[0][0]
- someArrayOfStringArrays.each() { assert it}
+ someArrayOfStringArrays.each() { assert it }
}
void testInsideGroovyMultiDimReplacement() {
Object[] someArrayOfStringArrays = [["a", "a", "a"], ["b", "b", "b", null]]
assert "a" == someArrayOfStringArrays[0][0]
- someArrayOfStringArrays.each() { assert it}
+ someArrayOfStringArrays.each() { assert it }
}
void testMultiDimCreationWithSizes() {
diff --git a/src/test/groovy/NullPropertyTest.groovy b/src/test/groovy/NullPropertyTest.groovy
index 0e75162..7e59c80 100644
--- a/src/test/groovy/NullPropertyTest.groovy
+++ b/src/test/groovy/NullPropertyTest.groovy
@@ -18,15 +18,12 @@
*/
package groovy
-/**
- * @author Jeremy Rayner
- */
-class NullPropertyTest extends GroovyTestCase {
+class NullPropertyTest extends GroovyTestCase {
def wensleydale = null
- void testNullProperty() {
- assert wensleydale == null
- }
+ void testNullProperty() {
+ assert wensleydale == null
+ }
}
diff --git a/src/test/groovy/OverridePropertyGetterTest.groovy b/src/test/groovy/OverridePropertyGetterTest.groovy
index ca6fb2d..70c1c3d 100644
--- a/src/test/groovy/OverridePropertyGetterTest.groovy
+++ b/src/test/groovy/OverridePropertyGetterTest.groovy
@@ -20,25 +20,22 @@ package groovy
/**
* test to ensure that overriding getter doesn't throw a NPE on access
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
-
-class OverridePropertyGetterTest extends GroovyTestCase {
+class OverridePropertyGetterTest extends GroovyTestCase {
def cheese
-
- void testSimpleMethodParameterAccess() {
- def o = new OverridePropertyGetterTest()
- def p = new OverridePropertyGetterTest()
- try {
- //@todo
- //p.cheese = o.cheese
+
+ void testSimpleMethodParameterAccess() {
+ def o = new OverridePropertyGetterTest(cheese: 'Edam')
+ def p = new OverridePropertyGetterTest(cheese: 'Cheddar')
+ try {
+ p.cheese = o.cheese
} catch (Exception e) {
fail(e.getMessage())
}
+ assert p.cheese == 'Edam'
}
-
- public String getCheese() {
+
+ String getCheese() {
return cheese
}
}
diff --git a/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy b/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
index 196baab..a78c054 100644
--- a/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
+++ b/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
@@ -21,27 +21,25 @@ package groovy
/**
* test to ensure that private instance variables are visible to
* other instance variables of the same class
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
-class PrivateVariableAccessFromAnotherInstanceTest extends GroovyTestCase implements Cloneable {
+class PrivateVariableAccessFromAnotherInstanceTest extends GroovyTestCase implements Cloneable {
def foo
private def bar
-
- public PrivateVariableAccessFromAnotherInstanceTest() {
+
+ PrivateVariableAccessFromAnotherInstanceTest() {
super()
foo = "foo"
bar = "bar"
}
-
- public Object clone() {
+
+ Object clone() {
def result = new PrivateVariableAccessFromAnotherInstanceTest()
result.foo = foo
result.bar = bar
return result
}
-
+
void testClone() {
def fred = new PrivateVariableAccessFromAnotherInstanceTest()
diff --git a/src/test/groovy/ProcessTest.groovy b/src/test/groovy/ProcessTest.groovy
index fc0670e..0f75a99 100644
--- a/src/test/groovy/ProcessTest.groovy
+++ b/src/test/groovy/ProcessTest.groovy
@@ -20,63 +20,61 @@ package groovy
/**
* check that groovy Process methods do their job.
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
-
class ProcessTest extends GroovyTestCase {
def myProcess
-
+
void setUp() {
myProcess = new MockProcess()
}
-
+
void testProcessAppendBytes() {
def myBytes = "mooky".getBytes()
-
+
myProcess << myBytes
-
+
def result = myProcess.outputStream.toByteArray()
assert result != null
- assert Arrays.equals(myBytes,result)
+ assert Arrays.equals(myBytes, result)
}
+
void testProcessAppendTwoByteArrays() {
def myBytes1 = "foo".getBytes()
def myBytes2 = "bar".getBytes()
-
+
myProcess << myBytes1 << myBytes2
-
+
def result = myProcess.outputStream.toByteArray()
assert result != null
- assert result.size() == myBytes1.size() + myBytes2.size()
+ assert result.size() == myBytes1.size() + myBytes2.size()
}
-
+
void testProcessAppend() {
myProcess << "mooky"
assert "mooky" == myProcess.outputStream.toString()
}
-
+
void testProcessInputStream() {
assert myProcess.in instanceof InputStream
assert myProcess.in != null
}
-
+
void testProcessText() {
assert "" == myProcess.text
}
-
+
void testProcessErrorStream() {
assert myProcess.err instanceof InputStream
assert myProcess.err != null
}
-
+
void testProcessOutputStream() {
assert myProcess.out instanceof OutputStream
assert myProcess.out != null
}
-
+
// @todo - ps.waitForOrKill(secs) creates it's own thread, leave this out of test suite for now...
-
+
void tearDown() {
myProcess.destroy()
}
@@ -89,17 +87,23 @@ class MockProcess extends Process {
private def e
private def i
private def o
-
- public MockProcess() {
+
+ MockProcess() {
e = new AnotherMockInputStream()
i = new AnotherMockInputStream()
o = new ByteArrayOutputStream()
}
+
void destroy() {}
+
int exitValue() { return 0 }
+
InputStream getErrorStream() { return e }
- public InputStream getInputStream() { return i }
- public OutputStream getOutputStream() { return o }
+
+ InputStream getInputStream() { return i }
+
+ OutputStream getOutputStream() { return o }
+
int waitFor() { return 0 }
}
diff --git a/src/test/groovy/Property2Test.groovy b/src/test/groovy/Property2Test.groovy
index e098f81..130fb32 100644
--- a/src/test/groovy/Property2Test.groovy
+++ b/src/test/groovy/Property2Test.groovy
@@ -20,9 +20,6 @@ package groovy
/**
* Tests the use of getMetaPropertyValues() and getProperties() for Beans and Expandos.
- *
- * @author john stump
- * @author dierk koenig
*/
class Property2Test extends GroovyTestCase {
diff --git a/src/test/groovy/PropertyTest.groovy b/src/test/groovy/PropertyTest.groovy
index 59b41e9..2cf74f1 100644
--- a/src/test/groovy/PropertyTest.groovy
+++ b/src/test/groovy/PropertyTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* Tests the use of properties in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class PropertyTest extends GroovyTestCase {
@@ -66,7 +64,7 @@ class PropertyTest extends GroovyTestCase {
// methods should fail on non-existent method calls
//shouldFail { foo.blah = 4 }
- shouldFail {foo.setBlah(4)}
+ shouldFail { foo.setBlah(4) }
}
void testCannotSeePrivateProperties() {
@@ -76,7 +74,7 @@ class PropertyTest extends GroovyTestCase {
//shouldFail { def x = foo.invisible } //todo: correct handling of access rules
// methods should fail on non-existent method calls
- shouldFail {foo.getQ()}
+ shouldFail { foo.getQ() }
}
void testConstructorWithNamedProperties() {
@@ -105,10 +103,10 @@ class PropertyTest extends GroovyTestCase {
assert s.length == 10
// this def does not mean there is a getLength() method
- shouldFail {i.getLength()}
+ shouldFail { i.getLength() }
// verify we can't set this def, it's read-only
- shouldFail {i.length = 6}
+ shouldFail { i.length = 6 }
}
void testGstringAssignment() {
@@ -184,21 +182,21 @@ class PropertyTest extends GroovyTestCase {
c.superThing = 'bar thing'
assert c.superthing() == 'bar1bar thing'
}
-
+
void testOverwritingNormalProperty() {
- def c = new Child();
+ def c = new Child()
assert c.normalProperty == 2
}
//GROOVY-2244
- public void testWriteOnlyBeanProperty() {
+ void testWriteOnlyBeanProperty() {
def bean = new Child()
// assert the property exists
- assert bean.metaClass.properties.findAll{it.name == 'superThing'}
+ assert bean.metaClass.properties.findAll { it.name == 'superThing' }
// attempt to write to it
- bean.superThing= 'x'
+ bean.superThing = 'x'
// attempt to read it
shouldFail(MissingPropertyException) {
@@ -219,7 +217,7 @@ class PropertyTest extends GroovyTestCase {
'''
}
- public void testPropertyWithMultipleSetters() {
+ void testPropertyWithMultipleSetters() {
assertScript '''
class A {
private field
@@ -256,45 +254,56 @@ class Base {
protected String field = 'bar'
protected thing = 'foo thing'
- def getXprop() {'foo x prop'}
- def x() {'foo x'}
- void setThing(value) {thing = value}
-
+
+ def getXprop() { 'foo x prop' }
+
+ def x() { 'foo x' }
+
+ void setThing(value) { thing = value }
+
//testing final property getter
- final getFinalProperty() {1}
-
+ final getFinalProperty() { 1 }
+
// testing normal property
def normalProperty = 1
}
class Child extends Base {
protected String field = 'foo' + super.field
- public getField() {field}
- void setSuperField(value) {super.field = value}
- public getSuperField() {super.field}
+
+ def getField() { field }
+
+ void setSuperField(value) { super.field = value }
+
+ def getSuperField() { super.field }
def thing = 'bar thing'
+
def superthing() {
'bar1' + super.thing
}
+
def x() {
'bar2' + super.x()
}
+
def getXprop() {
'bar3' + super.xprop
}
+
def getXpropViaMethod() {
'bar4' + super.getXprop()
}
+
def setSuperThing(value) {
super.thing = value
}
-
+
// testing final property getter
// the following property should not add a new getter
// method, this would result in a verify error
def finalProperty = 32
-
+
// testing overwriting normal property
def normalProperty = 2
}
diff --git a/src/test/groovy/ReadLineTest.groovy b/src/test/groovy/ReadLineTest.groovy
index dbdca06..4d56367 100644
--- a/src/test/groovy/ReadLineTest.groovy
+++ b/src/test/groovy/ReadLineTest.groovy
@@ -21,26 +21,24 @@ package groovy
/**
* Test to ensure that readLine() method works on Reader/InputStream
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
- * @author Joachim Baumann
*/
-
class ReadLineTest extends GroovyTestCase {
def file
+
void setUp() {
file = new File("src/test/groovy/ReadLineTest.groovy")
}
+
void testReadOneLineFromReader() {
def line
- file.withReader() {line = it.readLine()}
+ file.withReader() { line = it.readLine() }
assert line == "// Do not remove this line: it is used in test below"
}
-
+
static testString = " �\n �\n\n �\r\n 5\r\r 7\n\r 9"
- static expectedLines = [ " �", " �", "", " �", " 5", "", " 7", "", " 9" ]
- static String[] expectedLinesSlow = [ " �", " �", " �", " 5", " 7" ]
- static int[] expectedChars = [' ', '9', -1];
+ static expectedLines = [" �", " �", "", " �", " 5", "", " 7", "", " 9"]
+ static String[] expectedLinesSlow = [" �", " �", " �", " 5", " 7"]
+ static int[] expectedChars = [' ', '9', -1]
void readFromReader(Reader reader) throws IOException {
expectedLines.each { expected ->
@@ -50,12 +48,12 @@ class ReadLineTest extends GroovyTestCase {
assertNull("Readline should return null", reader.readLine())
}
- public void testBufferedReader() throws IOException {
+ void testBufferedReader() throws IOException {
Reader reader = new BufferedReader(new StringReader(testString))
readFromReader(reader)
}
- public void testReaderSupportingMark() throws IOException {
+ void testReaderSupportingMark() throws IOException {
Reader reader = new StringReader(testString)
readFromReader(reader)
}
@@ -64,24 +62,27 @@ class ReadLineTest extends GroovyTestCase {
* In this case we cannot read more than one line separator
* Thus empty lines can be returned if line separation is \r\n.
*/
- public void testReaderSlow() throws IOException {
- Reader reader = new SlowStringReader(testString);
+
+ void testReaderSlow() throws IOException {
+ Reader reader = new SlowStringReader(testString)
expectedLinesSlow.each { expected ->
String line = reader.readLine()
- while(line != null && line.length() == 0) {
+ while (line != null && line.length() == 0) {
line = reader.readLine()
- }
- assertEquals("Readline should return correct line", expected, line);
+ }
+ assertEquals("Readline should return correct line", expected, line)
}
- assertEquals("Readline should return empty string", "", reader.readLine());
+ assertEquals("Readline should return empty string", "", reader.readLine())
expectedChars.each { expected ->
- assertEquals("Remaining characters incorrect", expected, reader.read())
+ assertEquals("Remaining characters incorrect", expected, reader.read())
}
- assertNull(reader.readLine());
+ assertNull(reader.readLine())
}
}
+
class SlowStringReader extends StringReader {
- public SlowStringReader(String s) { super(s); }
- public boolean markSupported() { return false }
+ SlowStringReader(String s) { super(s) }
+
+ boolean markSupported() { return false }
}
diff --git a/src/test/groovy/RegularExpressionsTest.groovy b/src/test/groovy/RegularExpressionsTest.groovy
index 817188b..7d5d08a 100644
--- a/src/test/groovy/RegularExpressionsTest.groovy
+++ b/src/test/groovy/RegularExpressionsTest.groovy
@@ -18,20 +18,12 @@
*/
package groovy
-/**
- * Tests Groovy's regular expression syntax and DGM methods.
- *
- * @author Sam Pullara
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- * @author Pilho Kim
- * @author Graham Miller
- * @author Paul King
- * @author Ted Naleid
- */
-
import java.util.regex.Matcher
import java.util.regex.Pattern
+/**
+ * Tests Groovy's regular expression syntax and DGM methods.
+ */
class RegularExpressionsTest extends GroovyTestCase {
void testMatchOperator() {
@@ -52,12 +44,16 @@ class RegularExpressionsTest extends GroovyTestCase {
assert m instanceof Matcher
- while (m) { i = i + 1 }
+ while (m) {
+ i = i + 1
+ }
assert i == 2
i = 0
m = "cheesecheese" =~ "e+"
- while (m) { i = i + 1 }
+ while (m) {
+ i = i + 1
+ }
assert i == 4
m.reset()
@@ -66,17 +62,17 @@ class RegularExpressionsTest extends GroovyTestCase {
m.find()
assert m.group() == "ee"
}
-
+
// From the javadoc of the getAt() method
void testMatcherWithIntIndex() {
def p = /ab[d|f]/
def m = "abcabdabeabf" =~ p
assert 2 == m.count
assert 2 == m.size() // synonym for m.getCount()
- assert ! m.hasGroup()
+ assert !m.hasGroup()
assert 0 == m.groupCount()
def matches = ["abd", "abf"]
- for (i in 0 ..< m.count) {
+ for (i in 0..<m.count) {
assert m[i] == matches[i]
}
@@ -86,7 +82,7 @@ class RegularExpressionsTest extends GroovyTestCase {
assert m.hasGroup()
assert 1 == m.groupCount()
matches = [["abc", "c"], ["abd", "d"], ["abe", "e"], ["abf", "f"]]
- for (i in 0 ..< m.count) {
+ for (i in 0..<m.count) {
assert m[i] == matches[i]
}
@@ -95,7 +91,7 @@ class RegularExpressionsTest extends GroovyTestCase {
assert m.hasGroup()
assert 1 == m.groupCount()
matches = [["abd", "d"], ["abxyz", "xyz"], ["abx", "x"]]
- for (i in 0 ..< m.count) {
+ for (i in 0..<m.count) {
assert m[i] == matches[i]
}
}
@@ -105,20 +101,20 @@ class RegularExpressionsTest extends GroovyTestCase {
def matcher = string =~ "e+"
assert "ee" == matcher[2]
- assert ["ee", "e"] == matcher[2..3]
+ assert ["ee", "e"] == matcher[2..3]
assert ["ee", "ee"] == matcher[0, 2]
assert ["ee", "e", "ee"] == matcher[0, 1..2]
-
+
matcher = "cheese please" =~ /([^e]+)e+/
assert ["se", "s"] == matcher[1]
assert [["se", "s"], [" ple", " pl"]] == matcher[1, 2]
- assert [["se", "s"], [" ple", " pl"]] == matcher[1 .. 2]
+ assert [["se", "s"], [" ple", " pl"]] == matcher[1..2]
assert [["chee", "ch"], [" ple", " pl"], ["ase", "as"]] == matcher[0, 2..3]
-
+
matcher = "cheese please" =~ /([^e]+)e+/
shouldFail { matcher[0, [1, 2]] }
}
-
+
void testMatcherIterator() {
def matcher = "cheesecheese" =~ "e+"
def iter = matcher.iterator()
@@ -131,7 +127,7 @@ class RegularExpressionsTest extends GroovyTestCase {
assert "ee" == iter.next()
assert iter.hasNext()
assert "e" == iter.next()
- assert ! iter.hasNext()
+ assert !iter.hasNext()
shouldFail(NoSuchElementException.class, { iter.next() })
matcher = "cheese please" =~ /([^e]+)e+/
@@ -145,9 +141,9 @@ class RegularExpressionsTest extends GroovyTestCase {
assert [" ple", " pl"] == iter.next()
assert iter.hasNext()
assert ["ase", "as"] == iter.next()
- assert ! iter.hasNext()
+ assert !iter.hasNext()
shouldFail(NoSuchElementException.class, { iter.next() })
-
+
// collect() uses iterator
matcher = "cheesecheese" =~ "e+"
assert ["ee", "e", "ee", "e"] == matcher.collect { it }
@@ -159,13 +155,13 @@ class RegularExpressionsTest extends GroovyTestCase {
void testMatcherEach() {
def count = 0
def result = []
- ("cheesecheese" =~ "cheese").each {value -> result += value; count = count + 1}
+ ("cheesecheese" =~ "cheese").each { value -> result += value; count = count + 1 }
assert count == 2
assert result == ['cheese', 'cheese']
count = 0
result = []
- ("cheesecheese" =~ "ee+").each { result += it; count = count + 1}
+ ("cheesecheese" =~ "ee+").each { result += it; count = count + 1 }
assert count == 2
assert result == ['ee', 'ee']
@@ -178,13 +174,13 @@ class RegularExpressionsTest extends GroovyTestCase {
}
assert ["chee", "se", " ple", "ase"] == resultAll
assert ["ch", "s", " pl", "as"] == resultGroup
-
+
matcher = "cheese please" =~ /([^e]+)e+/
result = []
matcher.each { result << it }
assert [["chee", "ch"], ["se", "s"], [" ple", " pl"], ["ase", "as"]] == result
}
-
+
// Check consistency between each and collect
void testMatcherEachVsCollect() {
def matcher = "cheese cheese" =~ "e+"
@@ -266,13 +262,13 @@ class RegularExpressionsTest extends GroovyTestCase {
def BOUNDS = /\b/
def rhyme = /$BOUNDS\w*ain$BOUNDS/
def found = ''
- myFairStringy.eachMatch(rhyme) {match ->
+ myFairStringy.eachMatch(rhyme) { match ->
found += match + ' '
}
assert found == 'rain Spain plain '
// a second way that is equivalent
found = ''
- (myFairStringy =~ rhyme).each {match ->
+ (myFairStringy =~ rhyme).each { match ->
found += match + ' '
}
assert found == 'rain Spain plain '
@@ -318,7 +314,7 @@ class RegularExpressionsTest extends GroovyTestCase {
def result = []
def letters = ''
def numbers = ''
- string.eachMatch(/([a-z]):(\d)/) {full, group1, group2 ->
+ string.eachMatch(/([a-z]):(\d)/) { full, group1, group2 ->
result += full
letters += group1
numbers += group2
@@ -331,7 +327,7 @@ class RegularExpressionsTest extends GroovyTestCase {
letters = ''
numbers = ''
def matcher = string =~ /([a-z]):(\d)/
- matcher.each {match ->
+ matcher.each { match ->
result += match[0]
letters += match[1]
numbers += match[2]
@@ -386,8 +382,12 @@ class RegularExpressionsTest extends GroovyTestCase {
}
void testReplaceWithClosure() {
- assert '1-FISH, two fish' == "one fish, two fish".replaceFirst(~/([a-z]{3})\s([a-z]{4})/) { [one:1, two:2][it[1]] + '-' + it[2].toUpperCase() }
- assert '1-FISH, 2-FISH' == "one fish, two fish".replaceAll(~/([a-z]{3})\s([a-z]{4})/) { [one:1, two:2][it[1]] + '-' + it[2].toUpperCase() }
+ assert '1-FISH, two fish' == "one fish, two fish".replaceFirst(~/([a-z]{3})\s([a-z]{4})/) {
+ [one: 1, two: 2][it[1]] + '-' + it[2].toUpperCase()
+ }
+ assert '1-FISH, 2-FISH' == "one fish, two fish".replaceAll(~/([a-z]{3})\s([a-z]{4})/) {
+ [one: 1, two: 2][it[1]] + '-' + it[2].toUpperCase()
+ }
}
void testNoGroupMatcherAndGet() {
@@ -424,7 +424,7 @@ class RegularExpressionsTest extends GroovyTestCase {
}
assert result == ['0:[abd, d]', '1:[abxyz, xyz]', '2:[abx, x]']
}
-
+
void replaceAllHelper(p, c) {
assert 'x12345' == 'x123z45'.replaceAll(p, c)
assert '12345' == '12345z'.replaceAll(p, c)
@@ -442,7 +442,7 @@ class RegularExpressionsTest extends GroovyTestCase {
assert '\\23\\\\45\\' == '\\23\\\\45\\'.replaceAll(p, c)
assert '$\\23\\$\\45\\' == '$\\23\\$\\45\\'.replaceAll(p, c)
}
-
+
void testReplaceAllClosure() {
def p = /([^z]*)(z)/
def c = { all, m, d -> m }
@@ -466,7 +466,7 @@ class RegularExpressionsTest extends GroovyTestCase {
assert null == 'foo foo baz'.find(p)
assert 'bar' == 'foo bar baz'.find(p)
assert 'car' == 'car'.find(p)
-
+
def patternWithGroups = /(.)ar/
assert null == ''.find(patternWithGroups)
assert 'bar' == 'foo bar baz'.find(patternWithGroups)
@@ -481,50 +481,50 @@ class RegularExpressionsTest extends GroovyTestCase {
def c = { match -> return "-$match-" }
assert null == 'foo foo baz'.find(p, c)
assert '-bar-' == 'foo bar baz'.find(p, c)
- assert '-car-' == 'car'.find(p, c)
+ assert '-car-' == 'car'.find(p, c)
def compiledPattern = ~p
assert null == 'foo foo baz'.find(compiledPattern, c)
assert '-bar-' == 'foo bar baz'.find(compiledPattern, c)
assert '-car-' == 'car'.find(compiledPattern, c)
}
-
+
void testFindClosureWithGroups() {
def AREA_CODE = /\d{3}/
def EXCHANGE = /\d{3}/
def STATION_NUMBER = /\d{4}/
def phone = /($AREA_CODE)-($EXCHANGE)-($STATION_NUMBER)/
- def c = { match, areaCode, exchange, stationNumber ->
- return "($areaCode) $exchange-$stationNumber"
- }
-
- assert null == 'foo'.find(phone) { match, areaCode, exchange, stationNumber -> return match }
- assert "612-555-1212" == 'foo 612-555-1212 bar'.find(phone) { match, areaCode, exchange, stationNumber -> return match }
- assert "(612) 555-1212" == 'foo 612-555-1212 bar'.find(phone, c)
+ def c = { match, areaCode, exchange, stationNumber ->
+ return "($areaCode) $exchange-$stationNumber"
+ }
+
+ assert null == 'foo'.find(phone) { match, areaCode, exchange, stationNumber -> return match }
+ assert "612-555-1212" == 'foo 612-555-1212 bar'.find(phone) { match, areaCode, exchange, stationNumber -> return match }
+ assert "(612) 555-1212" == 'foo 612-555-1212 bar'.find(phone, c)
def compiledPhonePattern = ~phone
- assert "(888) 555-1212" == "bar 888-555-1212 foo".find (compiledPhonePattern, c)
+ assert "(888) 555-1212" == "bar 888-555-1212 foo".find(compiledPhonePattern, c)
- def closureSingleVar = { matchArray ->
- return "(${matchArray[1]}) ${matchArray[2]}-${matchArray[3]}"
+ def closureSingleVar = { matchArray ->
+ return "(${matchArray[1]}) ${matchArray[2]}-${matchArray[3]}"
}
-
- assert "(888) 555-1212" == "bar 888-555-1212 foo".find (compiledPhonePattern, closureSingleVar)
- }
+
+ assert "(888) 555-1212" == "bar 888-555-1212 foo".find(compiledPhonePattern, closureSingleVar)
+ }
void testFindAll() {
def p = /.at/
def compiledPattern = ~p
assert [] == "".findAll(p)
assert [] == "".findAll(compiledPattern)
-
+
def orig = "The cat sat on the hat"
assert ["cat", "sat", "hat"] == orig.findAll(p)
assert ["cat", "sat", "hat"] == orig.findAll(compiledPattern)
assert ["+cat", "+sat", "+hat"] == orig.findAll(p) { "+$it" }
assert ["+cat", "+sat", "+hat"] == orig.findAll(compiledPattern) { "+$it" }
- }
+ }
void testFindAllWithGroups() {
def p = /(.)a(.)/
@@ -532,13 +532,13 @@ class RegularExpressionsTest extends GroovyTestCase {
def orig = "The cat sat on the hat"
assert ["cat", "sat", "hat"] == orig.findAll(p)
assert ["cat", "sat", "hat"] == orig.findAll(compiledPattern)
-
- def c = { match, firstLetter, lastLetter -> return "$firstLetter+$match+$lastLetter" }
- assert ["c+cat+t", "s+sat+t", "h+hat+t"] == orig.findAll(p, c)
+
+ def c = { match, firstLetter, lastLetter -> return "$firstLetter+$match+$lastLetter" }
+ assert ["c+cat+t", "s+sat+t", "h+hat+t"] == orig.findAll(p, c)
assert ["c+cat+t", "s+sat+t", "h+hat+t"] == orig.findAll(compiledPattern, c)
def closureSingleVar = { matchArray -> return "${matchArray[1]}+${matchArray[0]}+${matchArray[2]}" }
-
+
assert ["c+cat+t", "s+sat+t", "h+hat+t"] == orig.findAll(p, closureSingleVar)
assert ["c+cat+t", "s+sat+t", "h+hat+t"] == orig.findAll(compiledPattern, closureSingleVar)
}
@@ -548,11 +548,11 @@ class RegularExpressionsTest extends GroovyTestCase {
def pattern = /\w+@\w+\.\w{2,}/
def useCases = [
- "glaforge@gmail.com" : true,
- "glaforge" : true,
- "!!!!" : false,
- "glaforge@" : true,
- "glaforge@@" : false
+ "glaforge@gmail.com": true,
+ "glaforge" : true,
+ "!!!!" : false,
+ "glaforge@" : true,
+ "glaforge@@" : false
]
useCases.each { String email, boolean bool ->
diff --git a/src/test/groovy/ReturnTest.groovy b/src/test/groovy/ReturnTest.groovy
index c0e4358..9d1c385 100644
--- a/src/test/groovy/ReturnTest.groovy
+++ b/src/test/groovy/ReturnTest.groovy
@@ -18,10 +18,8 @@
*/
package groovy
-/**
+/**
* Tests the use of returns in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ReturnTest extends GroovyTestCase {
void testIntegerReturnValues() {
@@ -35,13 +33,13 @@ class ReturnTest extends GroovyTestCase {
}
def foo(x) {
- return ( x * 2 )
+ return (x * 2)
}
def bar(x) {
return x > 5
}
-
+
void testVoidReturn() {
explicitVoidReturn()
implicitVoidReturn()
@@ -58,13 +56,13 @@ class ReturnTest extends GroovyTestCase {
}
void explicitVoidReturnWithoutFinalReturn() {
- def x = 4;
+ def x = 4
if (x == 3) {
- return;
+ return
} else {
try {
- x = 3;
- return;
+ x = 3
+ return
} finally {
//do nothing
}
@@ -72,16 +70,16 @@ class ReturnTest extends GroovyTestCase {
}
def implicitVoidReturnWithoutFinalReturn() {
- def x = 4;
+ def x = 4
if (x == 3) {
- return;
+ return
} else {
try {
- x = 3;
- return;
+ x = 3
+ return
} finally {
//do nothing
}
}
- }
+ }
}
diff --git a/src/test/groovy/SocketTest.groovy b/src/test/groovy/SocketTest.groovy
index 209c0c0..a426188 100644
--- a/src/test/groovy/SocketTest.groovy
+++ b/src/test/groovy/SocketTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* check that groovy Socket methods do their job.
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
class SocketTest extends GroovyTestCase {
def mySocket
@@ -53,7 +51,7 @@ class SocketTest extends GroovyTestCase {
}
void testSocketWithStreamsClosure() {
- mySocket.withStreams {i, o ->
+ mySocket.withStreams { i, o ->
assert i instanceof InputStream
assert i != null
assert o instanceof OutputStream
diff --git a/src/test/groovy/SortTest.groovy b/src/test/groovy/SortTest.groovy
index 2aade57..90962b9 100644
--- a/src/test/groovy/SortTest.groovy
+++ b/src/test/groovy/SortTest.groovy
@@ -18,9 +18,6 @@
*/
package groovy
-/**
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- */
class SortTest extends GroovyTestCase {
// GROOVY-1956
@@ -42,21 +39,21 @@ class SortTest extends GroovyTestCase {
// GROOVY-1956
void testSortWithNullUsingOrderBy() {
def x = [1, 2, 'Z', 'a', null]
- def y = x.sort()
+ def y = x.sort()
assert y == [null, 1, 2, 'Z', 'a']
- def z = x.sort{ it?.respondsTo('toUpperCase') ? it?.toUpperCase() : it }
+ def z = x.sort { it?.respondsTo('toUpperCase') ? it?.toUpperCase() : it }
assert z == [null, 1, 2, 'a', 'Z']
}
void testSortWithOrderBy() {
def list = getPeople()
- def order = new OrderBy( { it.cheese } )
- list.sort(true,order)
+ def order = new OrderBy({ it.cheese })
+ list.sort(true, order)
assert list[0].name == 'Joe'
assert list[-1].name == 'Chris'
assert list.name == ['Joe', 'Bob', 'James', 'Chris']
}
-
+
void testSortWithClosure() {
def list = getPeople()
list.sort { it.cheese }
@@ -69,7 +66,9 @@ class SortTest extends GroovyTestCase {
assert words.sort() == ['The', 'brown', 'dog', 'fox', 'jumped', 'lazy', 'over', 'quick', 'the'] as String[]
assert words.sort(new IgnoreCaseComparator()) == ['brown', 'dog', 'fox', 'jumped', 'lazy', 'over', 'quick', 'The', 'the'] as String[]
words = s.split() // back to a known order
- assert words.sort{ it.size() } == ['The', 'fox', 'the', 'dog', 'over', 'lazy', 'quick', 'brown', 'jumped'] as String[]
+ assert words.sort {
+ it.size()
+ } == ['The', 'fox', 'the', 'dog', 'over', 'lazy', 'quick', 'brown', 'jumped'] as String[]
}
void testSortClassHierarchy() {
@@ -78,18 +77,18 @@ class SortTest extends GroovyTestCase {
new AFoo(7),
new ABar(4),
new ABar(6)
- ]
+ ]
def sorted = aFooList.sort()
- assert sorted.collect{ it.class } == [ABar, AFoo, ABar, AFoo]
- assert sorted.collect{ it.key } == (4..7).toList()
+ assert sorted.collect { it.class } == [ABar, AFoo, ABar, AFoo]
+ assert sorted.collect { it.key } == (4..7).toList()
}
def getPeople() {
def answer = []
- answer << new Expando(name:'James', cheese:'Edam', location:'London')
- answer << new Expando(name:'Bob', cheese:'Cheddar', location:'Atlanta')
- answer << new Expando(name:'Chris', cheese:'Red Leicester', location:'London')
- answer << new Expando(name:'Joe', cheese:'Brie', location:'London')
+ answer << new Expando(name: 'James', cheese: 'Edam', location: 'London')
+ answer << new Expando(name: 'Bob', cheese: 'Cheddar', location: 'Atlanta')
+ answer << new Expando(name: 'Chris', cheese: 'Red Leicester', location: 'London')
+ answer << new Expando(name: 'Joe', cheese: 'Brie', location: 'London')
return answer
}
@@ -97,17 +96,20 @@ class SortTest extends GroovyTestCase {
class AFoo implements Comparable {
int key
+
AFoo(int key) { this.key = key }
+
int compareTo(Object rhs) { key - rhs.key }
+
String toString() { this.class.name + ": " + key }
}
class ABar extends AFoo {
- public ABar(int x) {super(x)}
+ ABar(int x) { super(x) }
}
class IgnoreCaseComparator implements Comparator {
- public int compare(Object o1, Object o2) {
+ int compare(Object o1, Object o2) {
return o1.toUpperCase() <=> o2.toUpperCase()
}
}
diff --git a/src/test/groovy/SpreadDotTest.groovy b/src/test/groovy/SpreadDotTest.groovy
index 3edd010..7f0c6a9 100644
--- a/src/test/groovy/SpreadDotTest.groovy
+++ b/src/test/groovy/SpreadDotTest.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
- package groovy
+package groovy
/**
* Test for the spread dot operator "*.".
@@ -25,16 +25,13 @@
* list*.property
* means
* list.collect { it?.property }
- *
- * @author Pilho Kim
- * @author Paul King
*/
-public class SpreadDotTest extends GroovyTestCase {
+class SpreadDotTest extends GroovyTestCase {
void testSpreadDot() {
- def m1 = ["a":1, "b":2]
- def m2 = ["a":11, "b":22]
- def m3 = ["a":111, "b":222]
- def x = [m1,m2,m3]
+ def m1 = ["a": 1, "b": 2]
+ def m2 = ["a": 11, "b": 22]
+ def m3 = ["a": 111, "b": 222]
+ def x = [m1, m2, m3]
assert x*.a == [1, 11, 111]
assert x*."a" == [1, 11, 111]
assert x == [m1, m2, m3]
@@ -66,7 +63,7 @@ public class SpreadDotTest extends GroovyTestCase {
def x = [a, b]
assert x*.fnB("1") == [a.fnB("1"), b.fnB("1")]
- assert [a,b]*.fnB() == [a.fnB(), b.fnB()]
+ assert [a, b]*.fnB() == [a.fnB(), b.fnB()]
}
void testSpreadDotArrays() {
@@ -75,7 +72,7 @@ public class SpreadDotTest extends GroovyTestCase {
Object[] x = [a, b]
assert x*.fnB("1") == [a.fnB("1"), b.fnB("1")]
- assert [a,b]*.fnB() == [a.fnB(), b.fnB()]
+ assert [a, b]*.fnB() == [a.fnB(), b.fnB()]
int[] nums = [3, 4, 5]
assert nums*.toString() == ['3', '4', '5']
@@ -87,36 +84,36 @@ public class SpreadDotTest extends GroovyTestCase {
assert pets*.length() == nums
}
- void testSpreadDotOnArrays2 () {
+ void testSpreadDotOnArrays2() {
def books = [Book1, Book2, Book3] as Object[]
books*.metaClass*.foo = { "Hello, ${delegate.class.name}" }
- assertEquals "Hello, groovy.Book1", new Book1 ().foo ()
- assertEquals "Hello, groovy.Book2", new Book2 ().foo ()
- assertEquals "Hello, groovy.Book3", new Book3 ().foo ()
+ assertEquals "Hello, groovy.Book1", new Book1().foo()
+ assertEquals "Hello, groovy.Book2", new Book2().foo()
+ assertEquals "Hello, groovy.Book3", new Book3().foo()
}
-
+
void testSpreadDotAdvanced() {
- assertEquals ([3, 3], ['cat', 'dog']*.size())
- assertEquals ([3, 3], (['cat', 'dog'] as Vector)*.size())
- assertEquals ([3, 3], (['cat', 'dog'] as String[])*.size())
- assertEquals ([3, 3], (['cat', 'dog'] as Vector).elements()*.size())
- assertEquals ([1, 1, 1], 'zoo'*.size())
- assertEquals (Object, new Object().getClass())
- assertEquals ([Object], new Object()*.getClass())
- assertEquals ('Large', new Shirt().size())
- assertEquals (['Large'], new Shirt()*.size())
+ assertEquals([3, 3], ['cat', 'dog']*.size())
+ assertEquals([3, 3], (['cat', 'dog'] as Vector)*.size())
+ assertEquals([3, 3], (['cat', 'dog'] as String[])*.size())
+ assertEquals([3, 3], (['cat', 'dog'] as Vector).elements()*.size())
+ assertEquals([1, 1, 1], 'zoo'*.size())
+ assertEquals(Object, new Object().getClass())
+ assertEquals([Object], new Object()*.getClass())
+ assertEquals('Large', new Shirt().size())
+ assertEquals(['Large'], new Shirt()*.size())
}
- void testSpreadDotMap () {
- def map = [A:"one", B:"two", C:"three"]
- assert map.collect { child -> child.value.size() } == [3, 3, 5]
+ void testSpreadDotMap() {
+ def map = [A: "one", B: "two", C: "three"]
+ assert map.collect { child -> child.value.size() } == [3, 3, 5]
assert map*.value*.size() == [3, 3, 5]
assert map*.getKey() == ['A', 'B', 'C']
}
- public void testSpreadDotAttribute() {
+ void testSpreadDotAttribute() {
def s = new Singlet()
assert s.size == 1
assert s.@size == 12
@@ -126,60 +123,68 @@ public class SpreadDotTest extends GroovyTestCase {
}
void testNewLine() {
- def x = [ a:1, b:2 ]
+ def x = [a: 1, b: 2]
def y = x
- *.value
- *.toString()
- assert y == [ '1', '2' ]
+ *.value
+ *.toString()
+ assert y == ['1', '2']
def z = x
- *.value
- .sum()
+ *.value
+ .sum()
assert z == 3
- x = [ new Singlet(), new Singlet() ]
+ x = [new Singlet(), new Singlet()]
y = x
- *.@size
- assert y == [ 12, 12 ]
+ *.@size
+ assert y == [12, 12]
}
}
class SpreadDotDemo {
- public java.util.Date getA() {
+ java.util.Date getA() {
return new Date()
}
- public String fnB() {
+
+ String fnB() {
return "bb"
}
- public String fnB(String m) {
+
+ String fnB(String m) {
return "BB$m"
}
}
class SpreadDotDemo2 {
- public String getAttribute(String key) {
+ String getAttribute(String key) {
return "Attribute $key"
}
- public String get(String key) {
+
+ String get(String key) {
return getAttribute("Get $key")
}
- public String fnB() {
+
+ String fnB() {
return "cc"
}
- public String fnB(String m) {
+
+ String fnB(String m) {
return "CC$m"
}
}
class Book1 {}
+
class Book2 {}
+
class Book3 {}
class Shirt {
- def size() { 'Large' }
+ def size() { 'Large' }
}
class Singlet {
private size = 12
- def getSize() {1}
+
+ def getSize() { 1 }
}
diff --git a/src/test/groovy/SwitchWithDifferentTypesTest.groovy b/src/test/groovy/SwitchWithDifferentTypesTest.groovy
index 51c8306..e1968b8 100644
--- a/src/test/groovy/SwitchWithDifferentTypesTest.groovy
+++ b/src/test/groovy/SwitchWithDifferentTypesTest.groovy
@@ -18,10 +18,8 @@
*/
package groovy
-/**
+/**
* A test case for switch statement with different types
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class SwitchWithDifferentTypesTest extends GroovyTestCase {
@@ -32,7 +30,7 @@ class SwitchWithDifferentTypesTest extends GroovyTestCase {
void testSwitchWithDoubleValues() {
assertSwitch(1.5, 2.4, 3.2, 4.1)
}
-
+
void testSwitchWithStringValues() {
assertSwitch("abc", "def", "xyz", "unknown")
}
@@ -59,29 +57,29 @@ class SwitchWithDifferentTypesTest extends GroovyTestCase {
assertSwitchMixed(bd2, bi, 2, 3)
assertSwitchMixed(bd2, bd1, 2, 3)
}
-
+
void assertSwitchMixed(switchValue, matchingValue, nonmatchingValue1, nonmatchingValue2) {
- assertSwitchMatch1(switchValue, matchingValue, nonmatchingValue1, nonmatchingValue2)
- assertSwitchMatch2(switchValue, nonmatchingValue1, matchingValue, nonmatchingValue2)
- assertSwitchMatch3(switchValue, nonmatchingValue1, nonmatchingValue2, matchingValue)
+ assertSwitchMatch1(switchValue, matchingValue, nonmatchingValue1, nonmatchingValue2)
+ assertSwitchMatch2(switchValue, nonmatchingValue1, matchingValue, nonmatchingValue2)
+ assertSwitchMatch3(switchValue, nonmatchingValue1, nonmatchingValue2, matchingValue)
}
-
+
void assertSwitch(a, b, c, d) {
assertSwitchMatch1(a, a, b, c)
assertSwitchMatch2(b, a, b, c)
assertSwitchMatch3(c, a, b, c)
assertSwitchMatchDefault(d, a, b, c)
}
-
+
void assertSwitchMatch1(value, case1Value, case2Value, case3Value) {
switch (value) {
- case case1Value:
+ case case1Value:
// worked
break
- case case2Value:
+ case case2Value:
failNotEquals(value, case2Value)
break
- case case3Value:
+ case case3Value:
failNotEquals(value, case3Value)
break
default:
@@ -92,13 +90,13 @@ class SwitchWithDifferentTypesTest extends GroovyTestCase {
void assertSwitchMatch2(value, case1Value, case2Value, case3Value) {
switch (value) {
- case case1Value:
+ case case1Value:
failNotEquals(value, case1Value)
break
- case case2Value:
+ case case2Value:
// worked
break
- case case3Value:
+ case case3Value:
failNotEquals(value, case3Value)
break
default:
@@ -106,16 +104,16 @@ class SwitchWithDifferentTypesTest extends GroovyTestCase {
break
}
}
-
+
void assertSwitchMatch3(value, case1Value, case2Value, case3Value) {
switch (value) {
- case case1Value:
+ case case1Value:
failNotEquals(value, case1Value)
break
- case case2Value:
+ case case2Value:
failNotEquals(value, case2Value)
break
- case case3Value:
+ case case3Value:
// worked
break
default:
@@ -123,16 +121,16 @@ class SwitchWithDifferentTypesTest extends GroovyTestCase {
break
}
}
-
+
void assertSwitchMatchDefault(value, case1Value, case2Value, case3Value) {
switch (value) {
- case case1Value:
+ case case1Value:
failNotEquals(value, case1Value)
break
- case case2Value:
+ case case2Value:
failNotEquals(value, case2Value)
break
- case case3Value:
+ case case3Value:
failNotEquals(value, case3Value)
break
default:
@@ -146,6 +144,6 @@ class SwitchWithDifferentTypesTest extends GroovyTestCase {
}
void failNotDefault(value) {
- fail("value: " + value + " should not match the default switch clause" )
+ fail("value: " + value + " should not match the default switch clause")
}
}
diff --git a/src/test/groovy/TextPropertyTest.groovy b/src/test/groovy/TextPropertyTest.groovy
index 49d9476..3f307de 100644
--- a/src/test/groovy/TextPropertyTest.groovy
+++ b/src/test/groovy/TextPropertyTest.groovy
@@ -17,6 +17,7 @@
* under the License.
*/
package groovy
+
/**
* check that text def is available on...
*
@@ -26,33 +27,30 @@ package groovy
* myReader.text,
* myBufferedReader.text,
* myProcess.text
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
-
class TextPropertyTest extends GroovyTestCase {
def myReader
def myInputStream
def myBigEndianEncodedInputStream
-
+
void setUp() {
myReader = new StringReader("digestive")
myInputStream = new ByteArrayInputStream("chocolate chip".bytes)
myBigEndianEncodedInputStream = new ByteArrayInputStream("shortbread".getBytes("UTF-16BE"))
}
-
+
void testBigEndianEncodedInputStreamText() {
assert "shortbread" == myBigEndianEncodedInputStream.getText("UTF-16BE")
}
-
+
void testInputStreamText() {
assert "chocolate chip" == myInputStream.text
}
-
+
void testReaderText() {
assert "digestive" == myReader.text
}
-
+
void tearDown() {
myInputStream = null
myReader = null
diff --git a/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy b/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
index 7cc3138..ea7b4d5 100644
--- a/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
+++ b/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
@@ -18,16 +18,11 @@
*/
package groovy
-/**
- * @author Michael Baehr
- * @author Paul King
- * @author Tim Yates
- */
class UniqueOnCollectionWithClosureTest extends GroovyTestCase {
void testUniqueOnIterator() {
def list = [-1, 0, 1, 1, 0, -1]
- def closure = {a, b -> Math.abs(a) <=> Math.abs(b)}
+ def closure = { a, b -> Math.abs(a) <=> Math.abs(b) }
def it = list.iterator().unique(closure)
assert it instanceof Iterator
def result = it.toList()
@@ -37,21 +32,21 @@ class UniqueOnCollectionWithClosureTest extends GroovyTestCase {
/** GROOVY-3213 */
void testUniqueWithTwoParameterClosureOnSet() {
def set = [-1, 0, 1] as Set
- def closure = {a, b -> Math.abs(a) <=> Math.abs(b)}
+ def closure = { a, b -> Math.abs(a) <=> Math.abs(b) }
assert set.unique(closure).size() == 2
}
/** GROOVY-1236 */
void testUniqueWithTwoParameterClosure() {
def list = [-1, 0, 1, 1, 0, -1]
- def closure = {a, b -> Math.abs(a) <=> Math.abs(b)}
+ def closure = { a, b -> Math.abs(a) <=> Math.abs(b) }
assert list.unique(closure) == [-1, 0]
}
/** GROOVY-1236 */
void testUniqueWithOneParameterClosure() {
def list = [-1, 0, 1, 1, 0, -1]
- def closure = {a -> Math.abs(a)}
+ def closure = { a -> Math.abs(a) }
assert list.unique(closure) == [-1, 0]
}
@@ -66,7 +61,7 @@ class UniqueOnCollectionWithClosureTest extends GroovyTestCase {
/** GROOVY-4742 */
void testImmutableCollectionWithTwoParamClosure() {
def orig = [2, 3, 3, 4]
- def uniq = orig.unique( false ) { a, b -> a <=> b }
+ def uniq = orig.unique(false) { a, b -> a <=> b }
assert orig == [2, 3, 3, 4]
assert uniq == [2, 3, 4]
}
diff --git a/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy b/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
index beb8190..f8b5eed 100644
--- a/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
+++ b/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
@@ -1,80 +1,75 @@
-/*
- * 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
-
-/**
- * @author Michael Baehr
- * @author Paul King
- * @author Tim Yates
- */
-class UniqueOnCollectionWithComparatorTest extends GroovyTestCase {
-
- void testUniqueOnIterator() {
- def list = [-1, 0, 1, 1, 0, -1]
- def comparator = new ClosureComparator({a, b -> Math.abs(a) <=> Math.abs(b)})
- def it = list.iterator().unique(comparator)
- assert it instanceof Iterator
- def result = it.toList()
- assert result == [-1, 0]
- }
-
- void testUniqueWithComparatorList() {
- def list = [-1, 0, 1, 1, 0, -1]
- def comparator = new ClosureComparator({a, b -> Math.abs(a) <=> Math.abs(b)})
- assert list.unique(comparator) == [-1, 0]
- }
-
- void testUniqueWithComparatorSet() {
- def set = [-1, 0, 1] as Set
- def comparator = new ClosureComparator({a, b -> Math.abs(a) <=> Math.abs(b)})
- assert set.unique(comparator).size() == 2
- }
-
- /** GROOVY-4742 */
- void testImmutableUniqueWithComparatorList() {
- def list = [-1, 0, 1, 1, 0, -1]
- def comparator = new ClosureComparator({a, b -> Math.abs(a) <=> Math.abs(b)})
- def result = list.unique(false, comparator)
- assert result == [-1, 0]
- assert list == [-1, 0, 1, 1, 0, -1]
- }
-
- /** GROOVY-4742 */
- void testImmutableUniqueWithComparatorSet() {
- def set = [-1, 0, 1] as Set
- def comparator = new ClosureComparator({a, b -> Math.abs(a) <=> Math.abs(b)})
- def result = set.unique(false, comparator).size()
- assert result == 2
- assert set == [-1, 0, 1] as Set
- }
-
- /** GROOVY-4742 */
- void testImmutableUniqueWithComparator() {
- def comparator = [ compare:{ p1, p2 -> p1.lname <=> p2.lname ?: p1.fname <=> p2.fname } ] as Comparator
-
- def a = [fname:"John", lname:"Taylor"]
- def b = [fname:"Clark", lname:"Taylor"]
- def c = [fname:"Tom", lname:"Cruz"]
- def d = [fname:"Clark", lname:"Taylor"]
-
- def list = [a, b, c, d]
- List list2 = list.unique(false, comparator)
- assert( list2 != list && list2 == [a, b, c] )
- }
+/*
+ * 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
+
+class UniqueOnCollectionWithComparatorTest extends GroovyTestCase {
+
+ void testUniqueOnIterator() {
+ def list = [-1, 0, 1, 1, 0, -1]
+ def comparator = new ClosureComparator({ a, b -> Math.abs(a) <=> Math.abs(b) })
+ def it = list.iterator().unique(comparator)
+ assert it instanceof Iterator
+ def result = it.toList()
+ assert result == [-1, 0]
+ }
+
+ void testUniqueWithComparatorList() {
+ def list = [-1, 0, 1, 1, 0, -1]
+ def comparator = new ClosureComparator({ a, b -> Math.abs(a) <=> Math.abs(b) })
+ assert list.unique(comparator) == [-1, 0]
+ }
+
+ void testUniqueWithComparatorSet() {
+ def set = [-1, 0, 1] as Set
+ def comparator = new ClosureComparator({ a, b -> Math.abs(a) <=> Math.abs(b) })
+ assert set.unique(comparator).size() == 2
+ }
+
+ /** GROOVY-4742 */
+ void testImmutableUniqueWithComparatorList() {
+ def list = [-1, 0, 1, 1, 0, -1]
+ def comparator = new ClosureComparator({ a, b -> Math.abs(a) <=> Math.abs(b) })
+ def result = list.unique(false, comparator)
+ assert result == [-1, 0]
+ assert list == [-1, 0, 1, 1, 0, -1]
+ }
+
+ /** GROOVY-4742 */
+ void testImmutableUniqueWithComparatorSet() {
+ def set = [-1, 0, 1] as Set
+ def comparator = new ClosureComparator({ a, b -> Math.abs(a) <=> Math.abs(b) })
+ def result = set.unique(false, comparator).size()
+ assert result == 2
+ assert set == [-1, 0, 1] as Set
+ }
+
+ /** GROOVY-4742 */
+ void testImmutableUniqueWithComparator() {
+ def comparator = [compare: { p1, p2 -> p1.lname <=> p2.lname ?: p1.fname <=> p2.fname }] as Comparator
+
+ def a = [fname: "John", lname: "Taylor"]
+ def b = [fname: "Clark", lname: "Taylor"]
+ def c = [fname: "Tom", lname: "Cruz"]
+ def d = [fname: "Clark", lname: "Taylor"]
+
+ def list = [a, b, c, d]
+ List list2 = list.unique(false, comparator)
+ assert (list2 != list && list2 == [a, b, c])
+ }
}
\ No newline at end of file
diff --git a/src/test/groovy/VarargsMethodTest.groovy b/src/test/groovy/VarargsMethodTest.groovy
index c3ea6ec..b3a2d1a 100644
--- a/src/test/groovy/VarargsMethodTest.groovy
+++ b/src/test/groovy/VarargsMethodTest.groovy
@@ -18,27 +18,22 @@
*/
package groovy
-/**
+/**
* VarargsMethodTest.groovy
*
* 1) Test to fix the Jira issues GROOVY-1023 and GROOVY-1026.
* 2) Test the feature that the length of arguments can be variable
* when invoking methods with or without parameters.
- *
- * @author Dierk Koenig
- * @author Pilho Kim
- * @author Hein Meling
*/
-
-class VarargsMethodTest extends GroovyTestCase {
+class VarargsMethodTest extends GroovyTestCase {
void testVarargsOnly() {
- assertEquals 1, varargsOnlyMethod('')
- assertEquals 1, varargsOnlyMethod(1)
- assertEquals 2, varargsOnlyMethod('','')
- assertEquals 1, varargsOnlyMethod( ['',''] )
- assertEquals 2, varargsOnlyMethod( ['',''] as Object[])
- assertEquals 2, varargsOnlyMethod( *['',''] )
+ assertEquals 1, varargsOnlyMethod('')
+ assertEquals 1, varargsOnlyMethod(1)
+ assertEquals 2, varargsOnlyMethod('','')
+ assertEquals 1, varargsOnlyMethod( ['',''] )
+ assertEquals 2, varargsOnlyMethod( ['',''] as Object[])
+ assertEquals 2, varargsOnlyMethod( *['',''] )
// GROOVY-1023
assertEquals 0, varargsOnlyMethod()
@@ -46,9 +41,9 @@ class VarargsMethodTest extends GroovyTestCase {
// GROOVY-1026
assertEquals(-1, varargsOnlyMethod(null))
assertEquals(2, varargsOnlyMethod(null, null))
- }
+ }
- Integer varargsOnlyMethod(Object[] args) {
+ Integer varargsOnlyMethod(Object[] args) {
// GROOVY-1023 (Java 5 feature)
// If this method having varargs is invoked with no parameter,
// then args is not null, but an array of length 0.
@@ -57,29 +52,29 @@ class VarargsMethodTest extends GroovyTestCase {
// null, then args is null, and so -1 is returned here.
if (args == null)
return -1
- return args.size()
- }
-
- void testVarargsLast() {
- assertEquals 0, varargsLastMethod('')
- assertEquals 0, varargsLastMethod(1)
- assertEquals 1, varargsLastMethod('','')
- assertEquals 2, varargsLastMethod('','','')
- assertEquals 1, varargsLastMethod('', ['',''] )
- assertEquals 2, varargsLastMethod('', ['',''] as Object[])
- assertEquals 2, varargsLastMethod('', *['',''] )
+ return args.size()
+ }
- // GROOVY-1026
- assertEquals(-1, varargsLastMethod('',null))
- assertEquals(2, varargsLastMethod('',null, null))
- }
-
- Integer varargsLastMethod(Object first, Object[] args) {
- // GROOVY-1026 (Java 5 feature)
- // If this method having varargs is invoked with two parameters
- // 1 and null, then args is null, and so -1 is returned here.
- if (args == null)
- return -1
- return args.size()
- }
+ void testVarargsLast() {
+ assertEquals 0, varargsLastMethod('')
+ assertEquals 0, varargsLastMethod(1)
+ assertEquals 1, varargsLastMethod('','')
+ assertEquals 2, varargsLastMethod('','','')
+ assertEquals 1, varargsLastMethod('', ['',''] )
+ assertEquals 2, varargsLastMethod('', ['',''] as Object[])
+ assertEquals 2, varargsLastMethod('', *['',''] )
+
+ // GROOVY-1026
+ assertEquals(-1, varargsLastMethod('', null))
+ assertEquals(2, varargsLastMethod('', null, null))
+ }
+
+ Integer varargsLastMethod(Object first, Object[] args) {
+ // GROOVY-1026 (Java 5 feature)
+ // If this method having varargs is invoked with two parameters
+ // 1 and null, then args is null, and so -1 is returned here.
+ if (args == null)
+ return -1
+ return args.size()
+ }
}
diff --git a/src/test/groovy/annotations/MyIntegerAnno.groovy b/src/test/groovy/annotations/MyIntegerAnno.groovy
index f182d34..db1a56a 100644
--- a/src/test/groovy/annotations/MyIntegerAnno.groovy
+++ b/src/test/groovy/annotations/MyIntegerAnno.groovy
@@ -1,36 +1,33 @@
-/*
- * 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.annotations
-
-import java.lang.annotation.*
-
-import static java.lang.annotation.RetentionPolicy.*
-import org.codehaus.groovy.transform.GroovyASTTransformationClass
-
-/**
- * Test annotation
- *
- * @author Paul King
- */
-
-@Retention(RUNTIME)
-@GroovyASTTransformationClass("groovy.annotations.MyIntegerAnnoTraceASTTransformation")
-public @interface MyIntegerAnno {
- int value()
-}
+/*
+ * 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.annotations
+
+import java.lang.annotation.*
+
+import static java.lang.annotation.RetentionPolicy.*
+import org.codehaus.groovy.transform.GroovyASTTransformationClass
+
+/**
+ * Test annotation
+ */
+@Retention(RUNTIME)
+@GroovyASTTransformationClass("groovy.annotations.MyIntegerAnnoTraceASTTransformation")
+@interface MyIntegerAnno {
+ int value()
+}
diff --git a/src/test/groovy/beans/BindableTest.groovy b/src/test/groovy/beans/BindableTest.groovy
index ca6a1aa..1b88758 100644
--- a/src/test/groovy/beans/BindableTest.groovy
+++ b/src/test/groovy/beans/BindableTest.groovy
@@ -1,375 +1,372 @@
-/*
- * 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.beans
-
-import org.codehaus.groovy.control.CompilationFailedException
-
-import java.beans.PropertyChangeListener
-
-import static java.lang.reflect.Modifier.isPublic
-import static java.lang.reflect.Modifier.isSynthetic
-
-/**
- * @author Danno Ferrin (shemnon)
- */
-class BindableTest extends GroovyTestCase {
-
- void testSimpleBindableProperty() {
- assertScript """
- import groovy.beans.Bindable
-
- class BindableTestBean1 {
- @Bindable String name
- }
-
- sb = new BindableTestBean1()
- sb.name = "bar"
- changed = false
- sb.propertyChange = {changed = true}
- sb.name = "foo"
- assert changed
- """
- }
-
- void testMultipleBindableProperty() {
- assertScript """
- import groovy.beans.Bindable
-
- class BindableTestBean2 {
- @Bindable String name
- @Bindable String value
- }
-
- sb = new BindableTestBean2(name:"foo", value:"bar")
- changed = 0
- sb.propertyChange = {changed++}
- sb.name = "baz"
- sb.value = "biff"
- assert changed == 2
- """
- }
-
- void testMutatingSetter() {
- assertScript """
- class BindableTestBean3 {
- @groovy.beans.Bindable String name
- void setName(String newName) {
- this.@name = "x\$newName"
- }
- }
- sb = new BindableTestBean3(name:"foo")
- changed = 0
- sb.propertyChange = {evt ->
- assert evt.newValue =~ '^x'
- changed++
- }
- sb.name = "baz"
- assert changed == 1
- """
- }
-
- void testWithSettersAndGetters() {
- for (int i = 0; i < 16; i++) {
- boolean bindClass = i & 1
- boolean field = i & 2
- boolean setter = i & 4
- boolean getter = i & 8
- int expectedCount = (bindClass && !field)?2:1
- String script = """
- import groovy.beans.Bindable
-
- ${bindClass?'@Bindable ':''}class BindableTestSettersAndGetters$i {
-
- @Bindable String alwaysBound
- ${field?'protected ':''} String name
-
- ${setter?'':'//'}void setName(String newName) { this.@name = "x\$newName" }
- ${getter?'':'//'}String getName() { return this.@name }
- }
- sb = new BindableTestSettersAndGetters$i(name:"foo", alwaysBound:"bar")
- changed = 0
- sb.propertyChange = {evt ->
- changed++
- }
- sb.alwaysBound = "baz"
- sb.name = "bif"
- sb.name = "bif"
- assert changed == $expectedCount
- """
- try {
- GroovyShell shell = new GroovyShell()
- shell.evaluate(script);
- } catch (Throwable t) {
- System.out.println("Failed Script: $script")
- throw t
- }
- }
- }
-
- void testOnField() {
- GroovyShell shell = new GroovyShell()
- shouldFail(CompilationFailedException) {
- shell.evaluate("""
- class BindableTestBean4 {
- public @groovy.beans.Bindable String name
- }
- """)
- }
- }
-
- void testOnStaticField() {
- GroovyShell shell = new GroovyShell()
- shouldFail(CompilationFailedException) {
- shell.evaluate("""
- class BindableTestBean5 {
- @groovy.beans.Bindable static String name
- }
- """)
- }
- }
-
- void testClassMarkers() {
- for (int i = 0; i < 7; i++) {
- boolean bindField = i & 1
- boolean bindClass = i & 2
- boolean staticField = i & 4
- int bindCount = bindClass?(staticField?2:3):(bindField?1:0);
-
- String script = """
- import groovy.beans.Bindable
-
- ${bindClass?'@Bindable ':''}class ClassMarkerBindable$i {
- String neither
-
- ${bindField?'@Bindable ':''}String bind
-
- ${staticField?'static ':''}String staticString
- }
-
- cb = new ClassMarkerBindable$i(neither:'a', bind:'b', staticString:'c')
- bindCount = 0
- ${bindClass|bindField?'cb.propertyChange = { bindCount++ }':''}
- cb.neither = 'd'
- cb.bind = 'e'
- cb.staticString = 'f'
- assert bindCount == $bindCount
- """
- try {
- GroovyShell shell = new GroovyShell()
- shell.evaluate(script);
- } catch (Throwable t) {
- System.out.println("Failed Script: $script")
- throw t
- }
- }
- }
-
- void testPrimitiveTypes() {
- assertScript """
- import groovy.beans.Bindable
-
- class BindableTestBean7 {
- @Bindable String testField
- @Bindable boolean testBoolean
- @Bindable byte testByte
- @Bindable short testShort
- @Bindable int testInt
- @Bindable long testLong
- @Bindable float testFloat
- @Bindable double testDouble
- }
-
- sb = new BindableTestBean7()
- sb.testField = "bar"
- int changed = 0
- sb.propertyChange = {changed++}
- sb.testField = "foo"
- sb.testBoolean = true
- sb.testByte = 1
- sb.testShort = 1
- sb.testInt = 1
- sb.testLong = 1
- sb.testFloat = 1
- sb.testDouble = 1
- assert changed == 8
- """
- }
-
- void testBadInheritance() {
- shouldFail(CompilationFailedException) {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
- import groovy.beans.Bindable
-
- class BindableTestBean8 {
- @Bindable String testField
- void addPropertyChangeListener(java.beans.PropertyChangeListener l) {}
- }
- new BindableTestBean8()
- """)
- }
- shouldFail(CompilationFailedException) {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
- import groovy.beans.Bindable
-
- class BindableTestBean9 {
- void addPropertyChangeListener(java.beans.PropertyChangeListener l) {}
- }
-
- class BindableTestBean10 extends BindableTestBean9 {
- @Bindable String testField
- }
-
- new BindableTestBean10()
- """)
- }
- }
-
- void testBindableParent() {
- assertScript """
- import groovy.beans.Bindable
- import java.beans.PropertyChangeEvent
- import java.beans.PropertyChangeListener
-
- @Bindable
- class BindableTestBeanChild extends BindableTestBeanParent {
- String prop2
- BindableTestBeanChild() {
- super()
- }
- }
-
- @Bindable
- class BindableTestBeanParent implements PropertyChangeListener {
- String prop1
- BindableTestBeanParent() {
- addPropertyChangeListener(this)
- }
-
- void propertyChange(PropertyChangeEvent event) {}
- }
-
- new BindableTestBeanChild()
- """
- }
-
- void testFinalProperty() {
- shouldFail(CompilationFailedException) {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
- import groovy.beans.Bindable
-
- class BindableTestBean11 {
- @Bindable final String testField
- }
- 1+1
- """)
- }
- }
-
- void testOnClassFinalProperty() {
- shouldFail(ReadOnlyPropertyException) {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
- import groovy.beans.Bindable
-
- @Bindable class BindableTestBean12 {
- String testField
- final String anotherTestField = 'Fixed'
- }
-
- sb = new BindableTestBean12()
- int changed = 0
- sb.propertyChange = {changed++}
- sb.testField = 'newValue'
- assert changed == 1
-
- sb.anotherTestField = 'Changed'
- """)
- }
- }
-
- void testFinalClass() {
- shouldFail(ReadOnlyPropertyException) {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
- import groovy.beans.Bindable
-
- @Bindable final class BindableTestBean12 {
- String testField
- final String anotherTestField = 'Fixed'
- }
-
- sb = new BindableTestBean12()
- int changed = 0
- sb.propertyChange = {changed++}
- sb.testField = 'newValue'
- assert changed == 1
-
- sb.anotherTestField = 'Changed'
- """)
- }
- }
-
- void testGetPropertyChangeListeners() {
- assertScript """
- import groovy.beans.Bindable
- import java.beans.PropertyChangeListener
- import java.beans.PropertyChangeEvent
-
- class BindableTestBean14 {
- @Bindable String foo
- @Bindable String bar
- }
-
- class FooListener implements PropertyChangeListener {
- void propertyChange( PropertyChangeEvent e ) { }
- }
-
- sb = new BindableTestBean14()
- assert !sb.propertyChangeListeners
- listener = new FooListener()
- sb.addPropertyChangeListener("foo",listener)
- assert !sb.getPropertyChangeListeners("bar")
- assert sb.getPropertyChangeListeners("foo") == [listener]
- assert sb.propertyChangeListeners.size() == 1
- """
- }
-
- void testPropertyChangeMethodsNotSynthetic() {
- def clazz = new GroovyClassLoader().parseClass('class MyBean { @groovy.beans.Bindable String dummy }', 'dummyName')
- def modifiers = clazz.getMethod('addPropertyChangeListener', PropertyChangeListener).modifiers
- assert isPublic(modifiers)
- assert !isSynthetic(modifiers)
- }
-
- void testPropertyChangeMethodWithCompileStatic() {
- assertScript """
- import groovy.beans.Bindable
- import groovy.transform.CompileStatic
-
- @CompileStatic
- class MyBean {
- @Bindable String test = "a test"
- }
- assert new MyBean()
- """
- }
+/*
+ * 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.beans
+
+import org.codehaus.groovy.control.CompilationFailedException
+
+import java.beans.PropertyChangeListener
+
+import static java.lang.reflect.Modifier.isPublic
+import static java.lang.reflect.Modifier.isSynthetic
+
+class BindableTest extends GroovyTestCase {
+
+ void testSimpleBindableProperty() {
+ assertScript """
+ import groovy.beans.Bindable
+
+ class BindableTestBean1 {
+ @Bindable String name
+ }
+
+ sb = new BindableTestBean1()
+ sb.name = "bar"
+ changed = false
+ sb.propertyChange = {changed = true}
+ sb.name = "foo"
+ assert changed
+ """
+ }
+
+ void testMultipleBindableProperty() {
+ assertScript """
+ import groovy.beans.Bindable
+
+ class BindableTestBean2 {
+ @Bindable String name
+ @Bindable String value
+ }
+
+ sb = new BindableTestBean2(name:"foo", value:"bar")
+ changed = 0
+ sb.propertyChange = {changed++}
+ sb.name = "baz"
+ sb.value = "biff"
+ assert changed == 2
+ """
+ }
+
+ void testMutatingSetter() {
+ assertScript """
+ class BindableTestBean3 {
+ @groovy.beans.Bindable String name
+ void setName(String newName) {
+ this.@name = "x\$newName"
+ }
+ }
+ sb = new BindableTestBean3(name:"foo")
+ changed = 0
+ sb.propertyChange = {evt ->
+ assert evt.newValue =~ '^x'
+ changed++
+ }
+ sb.name = "baz"
+ assert changed == 1
+ """
+ }
+
+ void testWithSettersAndGetters() {
+ for (int i = 0; i < 16; i++) {
+ boolean bindClass = i & 1
+ boolean field = i & 2
+ boolean setter = i & 4
+ boolean getter = i & 8
+ int expectedCount = (bindClass && !field) ? 2 : 1
+ String script = """
+ import groovy.beans.Bindable
+
+ ${bindClass ? '@Bindable ' : ''}class BindableTestSettersAndGetters$i {
+
+ @Bindable String alwaysBound
+ ${field ? 'protected ' : ''} String name
+
+ ${setter ? '' : '//'}void setName(String newName) { this.@name = "x\$newName" }
+ ${getter ? '' : '//'}String getName() { return this.@name }
+ }
+ sb = new BindableTestSettersAndGetters$i(name:"foo", alwaysBound:"bar")
+ changed = 0
+ sb.propertyChange = {evt ->
+ changed++
+ }
+ sb.alwaysBound = "baz"
+ sb.name = "bif"
+ sb.name = "bif"
+ assert changed == $expectedCount
+ """
+ try {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate(script);
+ } catch (Throwable t) {
+ System.out.println("Failed Script: $script")
+ throw t
+ }
+ }
+ }
+
+ void testOnField() {
+ GroovyShell shell = new GroovyShell()
+ shouldFail(CompilationFailedException) {
+ shell.evaluate("""
+ class BindableTestBean4 {
+ public @groovy.beans.Bindable String name
+ }
+ """)
+ }
+ }
+
+ void testOnStaticField() {
+ GroovyShell shell = new GroovyShell()
+ shouldFail(CompilationFailedException) {
+ shell.evaluate("""
+ class BindableTestBean5 {
+ @groovy.beans.Bindable static String name
+ }
+ """)
+ }
+ }
+
+ void testClassMarkers() {
+ for (int i = 0; i < 7; i++) {
+ boolean bindField = i & 1
+ boolean bindClass = i & 2
+ boolean staticField = i & 4
+ int bindCount = bindClass ? (staticField ? 2 : 3) : (bindField ? 1 : 0);
+
+ String script = """
+ import groovy.beans.Bindable
+
+ ${bindClass ? '@Bindable ' : ''}class ClassMarkerBindable$i {
+ String neither
+
+ ${bindField ? '@Bindable ' : ''}String bind
+
+ ${staticField ? 'static ' : ''}String staticString
+ }
+
+ cb = new ClassMarkerBindable$i(neither:'a', bind:'b', staticString:'c')
+ bindCount = 0
+ ${bindClass | bindField ? 'cb.propertyChange = { bindCount++ }' : ''}
+ cb.neither = 'd'
+ cb.bind = 'e'
+ cb.staticString = 'f'
+ assert bindCount == $bindCount
+ """
+ try {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate(script);
+ } catch (Throwable t) {
+ System.out.println("Failed Script: $script")
+ throw t
+ }
+ }
+ }
+
+ void testPrimitiveTypes() {
+ assertScript """
+ import groovy.beans.Bindable
+
+ class BindableTestBean7 {
+ @Bindable String testField
+ @Bindable boolean testBoolean
+ @Bindable byte testByte
+ @Bindable short testShort
+ @Bindable int testInt
+ @Bindable long testLong
+ @Bindable float testFloat
+ @Bindable double testDouble
+ }
+
+ sb = new BindableTestBean7()
+ sb.testField = "bar"
+ int changed = 0
+ sb.propertyChange = {changed++}
+ sb.testField = "foo"
+ sb.testBoolean = true
+ sb.testByte = 1
+ sb.testShort = 1
+ sb.testInt = 1
+ sb.testLong = 1
+ sb.testFloat = 1
+ sb.testDouble = 1
+ assert changed == 8
+ """
+ }
+
+ void testBadInheritance() {
+ shouldFail(CompilationFailedException) {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
+ import groovy.beans.Bindable
+
+ class BindableTestBean8 {
+ @Bindable String testField
+ void addPropertyChangeListener(java.beans.PropertyChangeListener l) {}
+ }
+ new BindableTestBean8()
+ """)
+ }
+ shouldFail(CompilationFailedException) {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
+ import groovy.beans.Bindable
+
+ class BindableTestBean9 {
+ void addPropertyChangeListener(java.beans.PropertyChangeListener l) {}
+ }
+
+ class BindableTestBean10 extends BindableTestBean9 {
+ @Bindable String testField
+ }
+
+ new BindableTestBean10()
+ """)
+ }
+ }
+
+ void testBindableParent() {
+ assertScript """
+ import groovy.beans.Bindable
+ import java.beans.PropertyChangeEvent
+ import java.beans.PropertyChangeListener
+
+ @Bindable
+ class BindableTestBeanChild extends BindableTestBeanParent {
+ String prop2
+ BindableTestBeanChild() {
+ super()
+ }
+ }
+
+ @Bindable
+ class BindableTestBeanParent implements PropertyChangeListener {
+ String prop1
+ BindableTestBeanParent() {
+ addPropertyChangeListener(this)
+ }
+
+ void propertyChange(PropertyChangeEvent event) {}
+ }
+
+ new BindableTestBeanChild()
+ """
+ }
+
+ void testFinalProperty() {
+ shouldFail(CompilationFailedException) {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
+ import groovy.beans.Bindable
+
+ class BindableTestBean11 {
+ @Bindable final String testField
+ }
+ 1+1
+ """)
+ }
+ }
+
+ void testOnClassFinalProperty() {
+ shouldFail(ReadOnlyPropertyException) {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
+ import groovy.beans.Bindable
+
+ @Bindable class BindableTestBean12 {
+ String testField
+ final String anotherTestField = 'Fixed'
+ }
+
+ sb = new BindableTestBean12()
+ int changed = 0
+ sb.propertyChange = {changed++}
+ sb.testField = 'newValue'
+ assert changed == 1
+
+ sb.anotherTestField = 'Changed'
+ """)
+ }
+ }
+
+ void testFinalClass() {
+ shouldFail(ReadOnlyPropertyException) {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
+ import groovy.beans.Bindable
+
+ @Bindable final class BindableTestBean12 {
+ String testField
+ final String anotherTestField = 'Fixed'
+ }
+
+ sb = new BindableTestBean12()
+ int changed = 0
+ sb.propertyChange = {changed++}
+ sb.testField = 'newValue'
+ assert changed == 1
+
+ sb.anotherTestField = 'Changed'
+ """)
+ }
+ }
+
+ void testGetPropertyChangeListeners() {
+ assertScript """
+ import groovy.beans.Bindable
+ import java.beans.PropertyChangeListener
+ import java.beans.PropertyChangeEvent
+
+ class BindableTestBean14 {
+ @Bindable String foo
+ @Bindable String bar
+ }
+
+ class FooListener implements PropertyChangeListener {
+ void propertyChange( PropertyChangeEvent e ) { }
+ }
+
+ sb = new BindableTestBean14()
+ assert !sb.propertyChangeListeners
+ listener = new FooListener()
+ sb.addPropertyChangeListener("foo",listener)
+ assert !sb.getPropertyChangeListeners("bar")
+ assert sb.getPropertyChangeListeners("foo") == [listener]
+ assert sb.propertyChangeListeners.size() == 1
+ """
+ }
+
+ void testPropertyChangeMethodsNotSynthetic() {
+ def clazz = new GroovyClassLoader().parseClass('class MyBean { @groovy.beans.Bindable String dummy }', 'dummyName')
+ def modifiers = clazz.getMethod('addPropertyChangeListener', PropertyChangeListener).modifiers
+ assert isPublic(modifiers)
+ assert !isSynthetic(modifiers)
+ }
+
+ void testPropertyChangeMethodWithCompileStatic() {
+ assertScript """
+ import groovy.beans.Bindable
+ import groovy.transform.CompileStatic
+
+ @CompileStatic
+ class MyBean {
+ @Bindable String test = "a test"
+ }
+ assert new MyBean()
+ """
+ }
}
\ No newline at end of file
[groovy] 04/05: whitespace/formatting plus cleanup/remove @author
tags as per Apache recommended practices cont'd
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit f8e8ad1d58fc3b879cfbb793b123eb25f9e047eb
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 2 08:35:36 2019 +1000
whitespace/formatting plus cleanup/remove @author tags as per Apache recommended practices cont'd
---
gradle/pomconfigurer.gradle | 3 +
.../groovy/groovy/transform/CompileDynamic.groovy | 3 +-
.../groovy/transform/ConditionalInterrupt.groovy | 74 ++++---
.../groovy/groovy/transform/TailRecursive.groovy | 3 +-
.../groovy/groovy/transform/ThreadInterrupt.groovy | 127 +++++-------
.../groovy/groovy/transform/TimedInterrupt.groovy | 8 +-
src/test/groovy/io/LineColumnReaderTest.groovy | 3 -
.../groovy/lang/BenchmarkInterceptorTest.groovy | 29 +--
src/test/groovy/lang/ClosureResolvingTest.groovy | 3 +-
.../groovy/lang/DelegatingMetaClassTest.groovy | 8 +-
.../lang/ExpandoMetaClassCreationHandleTest.groovy | 41 ++--
src/test/groovy/lang/ExpandoMetaClassTest.groovy | 126 ++++++------
src/test/groovy/lang/GetMethodsTest.groovy | 13 +-
src/test/groovy/lang/GroovyCodeSourceTest.groovy | 7 +-
src/test/groovy/lang/GroovySystemTest.groovy | 10 +-
src/test/groovy/lang/InterceptorTest.groovy | 4 +-
src/test/groovy/lang/MapOfClosureTest.groovy | 229 +++++++++++----------
src/test/groovy/lang/MetaClassRegistryTest.groovy | 9 +-
src/test/groovy/lang/PropertyMissingTest.groovy | 22 +-
.../groovy/lang/ReferenceSerializationTest.groovy | 2 -
src/test/groovy/lang/RespondsToTest.groovy | 12 +-
.../lang/ScriptSourcePositionInAstTest.groovy | 4 +-
src/test/groovy/mock/interceptor/Caller.groovy | 15 +-
.../groovy/mock/interceptor/Collaborator.groovy | 11 +-
.../mock/interceptor/MockSingleCallTest.groovy | 38 ++--
.../mock/interceptor/StubCallSequenceTest.groovy | 2 -
.../mock/interceptor/StubSingleCallTest.groovy | 6 +-
.../groovy/operator/BitwiseOperatorsTest.groovy | 32 ++-
src/test/groovy/operator/NegateListsTest.groovy | 6 +-
src/test/groovy/operator/PowerOperatorsTest.groovy | 21 +-
.../groovy/operator/SpreadListOperatorTest.groovy | 8 +-
.../groovy/operator/SpreadMapOperatorTest.groovy | 64 +++---
src/test/groovy/time/TimeCategoryTest.groovy | 10 +-
src/test/groovy/transform/LazyTest.groovy | 18 +-
.../groovy/transform/ThreadInterruptTest.groovy | 2 -
35 files changed, 444 insertions(+), 529 deletions(-)
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 61aa7bb..e9bd98b 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -755,6 +755,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
contributor {
name 'Peter Gromov'
}
+ contributor {
+ name 'Johannes Link'
+ }
}
mailingLists {
mailingList {
diff --git a/src/main/groovy/groovy/transform/CompileDynamic.groovy b/src/main/groovy/groovy/transform/CompileDynamic.groovy
index c5247d4..11cd23b 100644
--- a/src/main/groovy/groovy/transform/CompileDynamic.groovy
+++ b/src/main/groovy/groovy/transform/CompileDynamic.groovy
@@ -25,10 +25,9 @@ import java.lang.annotation.Documented
* This can be used for example if you statically compile a full class but you want to skip
* some methods without having to use the full annotation.
*
- * @author Cedric Champeau
* @since 2.1.0
*/
@Documented
@AnnotationCollector(processor = "org.codehaus.groovy.transform.CompileDynamicProcessor")
-public @interface CompileDynamic {
+@interface CompileDynamic {
}
\ No newline at end of file
diff --git a/src/main/groovy/groovy/transform/ConditionalInterrupt.groovy b/src/main/groovy/groovy/transform/ConditionalInterrupt.groovy
index 66aa64c..0877775 100644
--- a/src/main/groovy/groovy/transform/ConditionalInterrupt.groovy
+++ b/src/main/groovy/groovy/transform/ConditionalInterrupt.groovy
@@ -102,9 +102,6 @@ import java.lang.annotation.Target
*
* @see TimedInterrupt
* @see ThreadInterrupt
- * @author Cedric Champeau
- * @author Hamlet D'Arcy
- * @author Paul King
* @since 1.8.0
*/
@java.lang.annotation.Documented
@@ -112,44 +109,43 @@ import java.lang.annotation.Target
@Target([ElementType.PACKAGE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.LOCAL_VARIABLE])
@GroovyASTTransformationClass(["org.codehaus.groovy.transform.ConditionalInterruptibleASTTransformation"])
@interface ConditionalInterrupt {
- /**
- * Set this to false if you have multiple classes within one source file and only
- * want a conditional check on some of the classes. Place annotations on the classes
- * you want enhanced. Set to true (the default) for blanket coverage of conditional
- * checks on all methods, loops and closures within all classes/script code.
- *
- * For even finer-grained control see {@code applyToAllMembers}.
- *
- * @see #applyToAllMembers()
- */
- boolean applyToAllClasses() default true
+ /**
+ * Set this to false if you have multiple classes within one source file and only
+ * want a conditional check on some of the classes. Place annotations on the classes
+ * you want enhanced. Set to true (the default) for blanket coverage of conditional
+ * checks on all methods, loops and closures within all classes/script code.
+ *
+ * For even finer-grained control see {@code applyToAllMembers}.
+ *
+ * @see #applyToAllMembers()
+ */
+ boolean applyToAllClasses() default true
- /**
- * Set this to false if you have multiple methods/closures within a class or script and only
- * want conditional checks on some of them. Place annotations on the methods/closures that
- * you want enhanced. When false, {@code applyToAllClasses} is automatically set to false.
- *
- * Set to true (the default) for blanket coverage of conditional checks on all methods, loops
- * and closures within the class/script.
- *
- * @since 2.2.0
- * @see #applyToAllClasses()
- */
- boolean applyToAllMembers() default true
+ /**
+ * Set this to false if you have multiple methods/closures within a class or script and only
+ * want conditional checks on some of them. Place annotations on the methods/closures that
+ * you want enhanced. When false, {@code applyToAllClasses} is automatically set to false.
+ *
+ * Set to true (the default) for blanket coverage of conditional checks on all methods, loops
+ * and closures within the class/script.
+ *
+ * @since 2.2.0* @see #applyToAllClasses()
+ */
+ boolean applyToAllMembers() default true
- /**
- * By default a conditional check is added to the start of all user-defined methods. To turn this off simply
- * set this parameter to false.
- */
- boolean checkOnMethodStart() default true
+ /**
+ * By default a conditional check is added to the start of all user-defined methods. To turn this off simply
+ * set this parameter to false.
+ */
+ boolean checkOnMethodStart() default true
- /**
- * Sets the type of exception which is thrown.
- */
- Class thrown() default InterruptedException
+ /**
+ * Sets the type of exception which is thrown.
+ */
+ Class thrown() default InterruptedException
- /**
- * Conditional check - set as a closure expression.
- */
- Class value()
+ /**
+ * Conditional check - set as a closure expression.
+ */
+ Class value()
}
diff --git a/src/main/groovy/groovy/transform/TailRecursive.groovy b/src/main/groovy/groovy/transform/TailRecursive.groovy
index afbee50..e4e9936 100644
--- a/src/main/groovy/groovy/transform/TailRecursive.groovy
+++ b/src/main/groovy/groovy/transform/TailRecursive.groovy
@@ -77,11 +77,10 @@ import java.lang.annotation.Target
* assert sizeOfList(1..10000) == 10000
* </pre>
*
- * @author Johannes Link
* @since 2.3
*/
@Retention(RetentionPolicy.SOURCE)
@Target([ElementType.METHOD])
@GroovyASTTransformationClass(["org.codehaus.groovy.transform.tailrec.TailRecursiveASTTransformation"])
-public @interface TailRecursive {
+@interface TailRecursive {
}
diff --git a/src/main/groovy/groovy/transform/ThreadInterrupt.groovy b/src/main/groovy/groovy/transform/ThreadInterrupt.groovy
index 817507a..8c779d4 100644
--- a/src/main/groovy/groovy/transform/ThreadInterrupt.groovy
+++ b/src/main/groovy/groovy/transform/ThreadInterrupt.groovy
@@ -43,20 +43,10 @@ import java.lang.annotation.Target
*
* <pre>
* <code>@groovy.transform.ThreadInterrupt</code>
- * def scriptMethod() {
- * 4.times {
- * println 'executing script method...'
- * }
- * }
- *
- * class MyClass {
- * def myMethod() {
- * for (i in (1..10)) {
- * println 'executing method...'
- * }
- * }
- * }
- *
+ * def scriptMethod() {* 4.times {* println 'executing script method...'
+ *}*}*
+ * class MyClass {* def myMethod() {* for (i in (1..10)) {* println 'executing method...'
+ *}*}*}*
* scriptMethod()
* new MyClass().myMethod()
* </pre>
@@ -64,85 +54,60 @@ import java.lang.annotation.Target
* Which results in the following code being generated. Notice the checks and exceptions:
*
* <pre>
- * public class script1290627909406 extends groovy.lang.Script {
- *
- * public java.lang.Object scriptMethod() {
- * if (java.lang.Thread.currentThread().isInterrupted()) {
- * throw new java.lang.InterruptedException('Execution Interrupted')
- * }
- * 4.times({
- * if (java.lang.Thread.currentThread().isInterrupted()) {
- * throw new java.lang.InterruptedException('Execution Interrupted')
- * }
- * this.println('executing script method...')
- * })
- * }
- * }
- * public class MyClass extends java.lang.Object {
- *
- * public java.lang.Object myMethod() {
- * if (java.lang.Thread.currentThread().isInterrupted()) {
- * throw new java.lang.InterruptedException('Execution Interrupted')
- * }
- * for (java.lang.Object i : (1..10)) {
- * if (java.lang.Thread.currentThread().isInterrupted()) {
- * throw new java.lang.InterruptedException('Execution Interrupted')
- * }
- * this.println('executing method...')
- * }
- * }
- * }
- *
+ * public class script1290627909406 extends groovy.lang.Script {*
+ * public java.lang.Object scriptMethod() {* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
+ *}* 4.times({* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
+ *}* this.println('executing script method...')
+ *})
+ *}*}* public class MyClass extends java.lang.Object {*
+ * public java.lang.Object myMethod() {* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
+ *}* for (java.lang.Object i : (1..10)) {* if (java.lang.Thread.currentThread().isInterrupted()) {* throw new java.lang.InterruptedException('Execution Interrupted')
+ *}* this.println('executing method...')
+ *}*}*}*
* this.scriptMethod()
* new MyClass().myMethod()
* </pre>
* Additional usage examples can be found in the unit test for this class.
*
- * @see TimedInterrupt
- * @see ConditionalInterrupt
- * @author Cedric Champeau
- * @author Hamlet D'Arcy
- * @author Paul King
- * @since 1.8.0
+ * @see TimedInterrupt* @see ConditionalInterrupt* @since 1.8.0
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
@Target([ElementType.PACKAGE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.LOCAL_VARIABLE])
@GroovyASTTransformationClass(["org.codehaus.groovy.transform.ThreadInterruptibleASTTransformation"])
@interface ThreadInterrupt {
- /**
- * Set this to false if you have multiple classes within one source file and only
- * want isInterrupted checks on some of the classes. Place annotations on the classes
- * you want enhanced. Set to true (the default) for blanket coverage of isInterrupted
- * checks on all methods, loops and closures within all classes/script code.
- *
- * For even finer-grained control see {@code applyToAllMembers}.
- *
- * @see #applyToAllMembers()
- */
- boolean applyToAllClasses() default true
+ /**
+ * Set this to false if you have multiple classes within one source file and only
+ * want isInterrupted checks on some of the classes. Place annotations on the classes
+ * you want enhanced. Set to true (the default) for blanket coverage of isInterrupted
+ * checks on all methods, loops and closures within all classes/script code.
+ *
+ * For even finer-grained control see {@code applyToAllMembers}.
+ *
+ * @see #applyToAllMembers()
+ */
+ boolean applyToAllClasses() default true
- /**
- * Set this to false if you have multiple methods/closures within a class or script and only
- * want isInterrupted checks on some of them. Place annotations on the methods/closures that
- * you want enhanced. When false, {@code applyToAllClasses} is automatically set to false.
- *
- * Set to true (the default) for blanket coverage of isInterrupted checks on all methods, loops
- * and closures within the class/script.
- *
- * @since 2.2.0
- * @see #applyToAllClasses()
- */
- boolean applyToAllMembers() default true
+ /**
+ * Set this to false if you have multiple methods/closures within a class or script and only
+ * want isInterrupted checks on some of them. Place annotations on the methods/closures that
+ * you want enhanced. When false, {@code applyToAllClasses} is automatically set to false.
+ *
+ * Set to true (the default) for blanket coverage of isInterrupted checks on all methods, loops
+ * and closures within the class/script.
+ *
+ * @since 2.2.0* @see #applyToAllClasses()
+ */
+ boolean applyToAllMembers() default true
- /**
- * By default an isInterrupted check is added to the start of all user-defined methods. To turn this off simply
- * set this parameter to false.
- */
- boolean checkOnMethodStart() default true
+ /**
+ * By default an isInterrupted check is added to the start of all user-defined methods. To turn this off simply
+ * set this parameter to false.
+ */
+ boolean checkOnMethodStart() default true
- /**
- * Sets the type of exception which is thrown.
- */
- Class thrown() default InterruptedException
+ /**
+ * Sets the type of exception which is thrown.
+ */
+ Class thrown() default InterruptedException
}
diff --git a/src/main/groovy/groovy/transform/TimedInterrupt.groovy b/src/main/groovy/groovy/transform/TimedInterrupt.groovy
index 0a0c193..03fe784 100644
--- a/src/main/groovy/groovy/transform/TimedInterrupt.groovy
+++ b/src/main/groovy/groovy/transform/TimedInterrupt.groovy
@@ -79,16 +79,13 @@ import java.util.concurrent.TimeoutException
* </pre>
* See the unit test for this class for additional examples.
*
- * @author Hamlet D'Arcy
- * @author Cedric Champeau
- * @author Paul King
* @see ThreadInterrupt
* @see ConditionalInterrupt
* @since 1.8.0
*/
@Documented
@Retention(RetentionPolicy.SOURCE)
-@Target([ ElementType.PACKAGE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.LOCAL_VARIABLE])
+@Target([ElementType.PACKAGE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.LOCAL_VARIABLE])
@GroovyASTTransformationClass(["org.codehaus.groovy.transform.TimedInterruptibleASTTransformation"])
@interface TimedInterrupt {
/**
@@ -113,8 +110,7 @@ import java.util.concurrent.TimeoutException
* Set to true (the default) for blanket coverage of timeout checks on all methods, loops
* and closures within the class/script.
*
- * @since 2.2.0
- * @see #applyToAllClasses()
+ * @since 2.2.0* @see #applyToAllClasses()
*/
boolean applyToAllMembers() default true
diff --git a/src/test/groovy/io/LineColumnReaderTest.groovy b/src/test/groovy/io/LineColumnReaderTest.groovy
index 56c0793..b7ff52d 100644
--- a/src/test/groovy/io/LineColumnReaderTest.groovy
+++ b/src/test/groovy/io/LineColumnReaderTest.groovy
@@ -20,9 +20,6 @@ package groovy.io
import java.nio.CharBuffer
-/**
- * @author Guillaume Laforge
- */
class LineColumnReaderTest extends GroovyTestCase {
String text = '''L'invitation au voyage
diff --git a/src/test/groovy/lang/BenchmarkInterceptorTest.groovy b/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
index 58a0c97..ceeece7 100644
--- a/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
+++ b/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
@@ -19,38 +19,29 @@
package groovy.lang
/**
-* Test for the BenchmarkInterceptor
-* @author Dierk Koenig
-**/
-class BenchmarkInterceptorTest extends GroovyTestCase{
+ * Test for the BenchmarkInterceptor
+ */
+class BenchmarkInterceptorTest extends GroovyTestCase {
Interceptor benchmarkInterceptor
def proxy
void setUp() {
benchmarkInterceptor = new BenchmarkInterceptor()
- proxy = ProxyMetaClass.getInstance(Date.class)
+ proxy = ProxyMetaClass.getInstance(Date)
proxy.setInterceptor(benchmarkInterceptor)
}
- // this test is not valid any more as we don't log calls
void testSimpleInterception() {
-/*
proxy.use {
- def x = new Date(0)
- x++
+ def x = new Date(0)
+ x++
}
def stats = benchmarkInterceptor.statistic()
assertEquals 2, stats.size()
- assert stats.find{it[0] == 'ctor'}
- assert stats.find{it[0] == 'next'}
- assert stats.every{it[1] == 1}
- assert stats.every{it[2] < 200}
-*/
+ assert stats.find { it[0] == 'ctor' }
+ assert stats.find { it[0] == 'next' }
+ assert stats.every { it[1] == 1 }
+ assert stats.every { it[2] < 200 }
}
-
-
}
-
-
-
diff --git a/src/test/groovy/lang/ClosureResolvingTest.groovy b/src/test/groovy/lang/ClosureResolvingTest.groovy
index e4dddf0..64e3ea2 100644
--- a/src/test/groovy/lang/ClosureResolvingTest.groovy
+++ b/src/test/groovy/lang/ClosureResolvingTest.groovy
@@ -20,8 +20,7 @@ package groovy.lang
/**
* Tests how closures resolve to either a delegate or an owner for a given resolveStrategy
-
- * @author Graeme Rocher
+ *
* @since 1.5
*/
diff --git a/src/test/groovy/lang/DelegatingMetaClassTest.groovy b/src/test/groovy/lang/DelegatingMetaClassTest.groovy
index 54556c7..4607069 100644
--- a/src/test/groovy/lang/DelegatingMetaClassTest.groovy
+++ b/src/test/groovy/lang/DelegatingMetaClassTest.groovy
@@ -18,13 +18,9 @@
*/
package groovy.lang
-
/**
* Tests for the DelegatingMetaClass
- *
- * @author Graeme Rocher
- **/
-
+ */
class DelegatingMetaClassTest extends GroovyTestCase {
void testIsGroovyObject() {
@@ -34,4 +30,4 @@ class DelegatingMetaClassTest extends GroovyTestCase {
assertEquals DelegatingMetaClassTest, metaClass.getTheClass()
}
-}
\ No newline at end of file
+}
diff --git a/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy b/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
index 35c71fd..172f7a7 100644
--- a/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
+++ b/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
@@ -18,9 +18,6 @@
*/
package groovy.lang;
-/**
- * @author Graeme Rocher
- */
class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
def registry = GroovySystem.metaClassRegistry
MetaClass savedStringMeta
@@ -45,7 +42,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
String foo = "hello"
assertEquals "HELLO", foo.toUpperCase()
- Object.metaClass.doStuff = {-> delegate.toString().toUpperCase() }
+ Object.metaClass.doStuff = { -> delegate.toString().toUpperCase() }
assertEquals "HELLO", foo.doStuff()
}
@@ -58,7 +55,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
def metaClass = registry.getMetaClass(IBar)
assertTrue(metaClass instanceof ExpandoMetaClass)
- metaClass.helloWorld = {-> "goodbye!" }
+ metaClass.helloWorld = { -> "goodbye!" }
def t = new Test1()
assertEquals "goodbye!", t.helloWorld()
@@ -72,8 +69,8 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
assertTrue(metaClass instanceof ExpandoMetaClass)
def map = [:]
- metaClass.getAt = {Integer i -> map[i] }
- metaClass.putAt = {Integer i, val -> map[i] = val }
+ metaClass.getAt = { Integer i -> map[i] }
+ metaClass.putAt = { Integer i, val -> map[i] = val }
def t = new Test1()
//assertEquals 2, t.metaClass.getExpandoMethods().size()
@@ -93,9 +90,13 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
def metaClass = registry.getMetaClass(Foo)
def testValue = null
- metaClass.setProperty = {String name, value ->
+ metaClass.setProperty = { String name, value ->
def mp = delegate.metaClass.getMetaProperty(name)
- if (mp) { mp.setProperty(delegate, value) } else { testValue = value }
+ if (mp) {
+ mp.setProperty(delegate, value)
+ } else {
+ testValue = value
+ }
}
def t = new Test1()
@@ -113,7 +114,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
def metaClass = registry.getMetaClass(Foo)
- metaClass.getProperty = {String name ->
+ metaClass.getProperty = { String name ->
def mp = delegate.metaClass.getMetaProperty(name)
mp ? mp.getProperty(delegate) : "foo $name"
}
@@ -134,7 +135,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
def metaClass = registry.getMetaClass(Foo)
- metaClass.invokeMethod = {String name, args ->
+ metaClass.invokeMethod = { String name, args ->
def mm = delegate.metaClass.getMetaMethod(name, args)
mm ? mm.invoke(delegate, args) : "bar!!"
}
@@ -152,8 +153,8 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
def metaClass = registry.getMetaClass(List)
assertTrue(metaClass instanceof ExpandoMetaClass)
- metaClass.sizeDoubled = {-> delegate.size() * 2 }
- metaClass.isFull = {-> false }
+ metaClass.sizeDoubled = { -> delegate.size() * 2 }
+ metaClass.isFull = { -> false }
def list = new ArrayList()
@@ -178,7 +179,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
metaClass = registry.getMetaClass(url.getClass())
assertTrue(metaClass instanceof ExpandoMetaClass)
- metaClass.toUpperString = {->
+ metaClass.toUpperString = { ->
delegate.toString().toUpperCase()
}
@@ -195,7 +196,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
metaClass = registry.getMetaClass(Object)
}
- metaClass.toFoo = {-> "foo" }
+ metaClass.toFoo = { -> "foo" }
def uri = new URI("http://bar.com")
def s = "bar"
@@ -203,7 +204,7 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
assertEquals "foo", uri.toFoo()
assertEquals "foo", s.toFoo()
- metaClass.toBar = {-> "bar" }
+ metaClass.toBar = { -> "bar" }
assertEquals "bar", uri.toBar()
assertEquals "bar", s.toBar()
@@ -213,13 +214,13 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
registry.removeMetaClass(Test1)
registry.removeMetaClass(EMCInheritTest)
- EMCInheritTest.metaClass.foo = {-> "hello!" }
+ EMCInheritTest.metaClass.foo = { -> "hello!" }
def emc = new EMCInheritTest()
assertEquals "hello!", emc.foo()
- Test1.metaClass.foo = {-> "uck" }
+ Test1.metaClass.foo = { -> "uck" }
emc = new EMCInheritTest()
// make sure original foo wasn't overridden
assertEquals "hello!", emc.foo()
@@ -232,13 +233,13 @@ class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
registry.removeMetaClass(IBar)
registry.removeMetaClass(Object)
- EMCInheritTest.metaClass.methodMissing = {String name, args -> "hello!" }
+ EMCInheritTest.metaClass.methodMissing = { String name, args -> "hello!" }
def emc = new EMCInheritTest()
assertEquals "hello!", emc.foo()
- Test1.metaClass.methodMissing = {String name, args -> "uck" }
+ Test1.metaClass.methodMissing = { String name, args -> "uck" }
emc = new EMCInheritTest()
// make sure original foo wasn't overridden
assertEquals "hello!", emc.bar()
diff --git a/src/test/groovy/lang/ExpandoMetaClassTest.groovy b/src/test/groovy/lang/ExpandoMetaClassTest.groovy
index 7451127..f285ad4 100644
--- a/src/test/groovy/lang/ExpandoMetaClassTest.groovy
+++ b/src/test/groovy/lang/ExpandoMetaClassTest.groovy
@@ -18,9 +18,6 @@
*/
package groovy.lang
-/**
- * @author Graeme Rocher
- */
class ExpandoMetaClassTest extends GroovyTestCase {
@Override
@@ -42,7 +39,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testClosureCallDoCall() {
ExpandoMetaClass.enableGlobally()
- def cl = {assert it.class == Object[]}
+ def cl = { assert it.class == Object[] }
Object[] item = [1]
try {
cl(item)
@@ -50,7 +47,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
ExpandoMetaClass.disableGlobally()
def reg = GroovySystem.metaClassRegistry
reg.removeMetaClass(cl.class)
- }
+ }
}
void testFindAll() {
@@ -69,33 +66,33 @@ class ExpandoMetaClassTest extends GroovyTestCase {
"""
} finally {
ExpandoMetaClass.disableGlobally()
- }
+ }
}
void testMethodsAfterAddingNewMethod() {
- EMCT_Class.metaClass.newMethod = {-> "foo" }
+ EMCT_Class.metaClass.newMethod = { -> "foo" }
- def methods = EMCT_Class.metaClass.methods.findAll {it.name == "newMethod"}
+ def methods = EMCT_Class.metaClass.methods.findAll { it.name == "newMethod" }
assert methods
assertEquals 1, methods.size()
- EMCT_Class.metaClass.newMethod = {-> "foo" }
+ EMCT_Class.metaClass.newMethod = { -> "foo" }
- methods = EMCT_Class.metaClass.methods.findAll {it.name == "newMethod"}
+ methods = EMCT_Class.metaClass.methods.findAll { it.name == "newMethod" }
assert methods
assertEquals 1, methods.size()
}
void testPropertiesAfterAddingProperty() {
- EMCT_Class.metaClass.getNewProp = {-> "foo" }
+ EMCT_Class.metaClass.getNewProp = { -> "foo" }
- def props = EMCT_Class.metaClass.properties.findAll {it.name == "newProp"}
+ def props = EMCT_Class.metaClass.properties.findAll { it.name == "newProp" }
assert props
assertEquals 1, props.size()
- EMCT_Class.metaClass.setNewProp = {String txt -> }
+ EMCT_Class.metaClass.setNewProp = { String txt -> }
- props = EMCT_Class.metaClass.properties.findAll {it.name == "newProp"}
+ props = EMCT_Class.metaClass.properties.findAll { it.name == "newProp" }
assert props
assertEquals 1, props.size()
}
@@ -123,7 +120,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
mc.initialize()
GroovySystem.metaClassRegistry.setMetaClass(EMCT_InvokeMethod.class, mc)
- mc.'static'.getHello = {-> "bar!"}
+ mc.'static'.getHello = { -> "bar!" }
assertEquals "bar!", EMCT_InvokeMethod.hello
}
@@ -133,7 +130,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
mc.initialize()
GroovySystem.metaClassRegistry.setMetaClass(EMCT_InvokeMethod.class, mc)
- mc.'static'.invokeMethod = {String methodName, args ->
+ mc.'static'.invokeMethod = { String methodName, args ->
def metaMethod = mc.getStaticMetaMethod(methodName, args)
def result = null
if (metaMethod) result = metaMethod.invoke(delegate, args)
@@ -153,7 +150,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
assert mc.hasMetaMethod("invokeMe", [String] as Class[])
- mc.invokeMethod = {String name, args ->
+ mc.invokeMethod = { String name, args ->
def mm = delegate.metaClass.getMetaMethod(name, args)
mm ? mm.invoke(delegate, args) : "bar!!"
}
@@ -172,10 +169,14 @@ class ExpandoMetaClassTest extends GroovyTestCase {
assert mc.hasMetaProperty("name")
def testValue = null
- mc.setProperty = {String name, value ->
+ mc.setProperty = { String name, value ->
def mp = delegate.metaClass.getMetaProperty(name)
- if (mp) {mp.setProperty(delegate, value)} else {testValue = value}
+ if (mp) {
+ mp.setProperty(delegate, value)
+ } else {
+ testValue = value
+ }
}
def t = new EMCT_GetProperty()
@@ -194,7 +195,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
assert mc.hasMetaProperty("name")
- mc.getProperty = {String name ->
+ mc.getProperty = { String name ->
def mp = delegate.metaClass.getMetaProperty(name)
mp ? mp.getProperty(delegate) : "foo $name"
@@ -212,7 +213,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testBooleanGetterWithClosure() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, false, true)
metaClass.initialize()
- metaClass.isValid = {-> true}
+ metaClass.isValid = { -> true }
def t = new EMCT_Class()
t.metaClass = metaClass
@@ -224,12 +225,12 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testAllowAdditionOfProperties() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, false, true)
- metaClass.getOne << {->
+ metaClass.getOne << { ->
"testme"
}
metaClass.initialize()
try {
- metaClass.getTwo << {->
+ metaClass.getTwo << { ->
"testagain"
}
}
@@ -247,12 +248,12 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testAllowAdditionOfMethods() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, false, true)
- metaClass.myMethod << {->
+ metaClass.myMethod << { ->
"testme"
}
metaClass.initialize()
try {
- metaClass.mySecondMethod << {->
+ metaClass.mySecondMethod << { ->
"testagain"
}
}
@@ -291,7 +292,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testPropertyGetterWithClosure() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
- metaClass.getSomething = {-> "testme"}
+ metaClass.getSomething = { -> "testme" }
metaClass.initialize()
@@ -306,7 +307,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
def testSet = null
- metaClass.setSomething = {String txt -> testSet = txt}
+ metaClass.setSomething = { String txt -> testSet = txt }
metaClass.initialize()
@@ -323,7 +324,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testNewMethodOverloading() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
- metaClass.overloadMe << {String txt -> txt} << {Integer i -> i}
+ metaClass.overloadMe << { String txt -> txt } << { Integer i -> i }
metaClass.initialize()
@@ -342,7 +343,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, false, true)
metaClass.initialize()
- metaClass.doSomething = {Integer i -> i + 1}
+ metaClass.doSomething = { Integer i -> i + 1 }
t.metaClass = metaClass
@@ -358,7 +359,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, false, true)
- metaClass.doSomething = {Integer i -> i + 1}
+ metaClass.doSomething = { Integer i -> i + 1 }
metaClass.initialize()
@@ -399,7 +400,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testCheckFailOnExisting() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
try {
- metaClass.existing << {->
+ metaClass.existing << { ->
"should fail. already exists!"
}
fail("Should have thrown exception when method already exists")
@@ -412,7 +413,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testCheckFailOnExistingConstructor() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
try {
- metaClass.constructor << {->
+ metaClass.constructor << { ->
"should fail. already exists!"
}
fail("Should have thrown exception when method already exists")
@@ -425,7 +426,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testCheckFailOnExistingStaticMethod() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
try {
- metaClass.'static'.existingStatic << {->
+ metaClass.'static'.existingStatic << { ->
"should fail. already exists!"
}
fail("Should have thrown exception when method already exists")
@@ -438,7 +439,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testNewStaticMethod() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, true)
- metaClass.'static'.myStaticMethod << {String txt ->
+ metaClass.'static'.myStaticMethod << { String txt ->
"testme"
}
metaClass.initialize()
@@ -449,7 +450,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testReplaceStaticMethod() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, true)
- metaClass.'static'.existingStatic = {->
+ metaClass.'static'.existingStatic = { ->
"testme"
}
metaClass.initialize()
@@ -461,7 +462,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testNewZeroArgumentStaticMethod() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, true)
- metaClass.'static'.myStaticMethod = {->
+ metaClass.'static'.myStaticMethod = { ->
"testme"
}
metaClass.initialize()
@@ -487,7 +488,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testNewConstructor() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, true)
- metaClass.constructor << {String txt ->
+ metaClass.constructor << { String txt ->
def t = EMCT_Class.class.newInstance()
t.name = txt
return t
@@ -505,7 +506,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testReplaceConstructor() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class, true)
- metaClass.constructor = {->
+ metaClass.constructor = { ->
"testme"
}
@@ -521,7 +522,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testReplaceInstanceMethod() {
def metaClass = new ExpandoMetaClass(EMCT_Class.class)
- metaClass.existing2 = {Object i ->
+ metaClass.existing2 = { Object i ->
"testme"
}
metaClass.initialize()
@@ -555,7 +556,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
metaClass.withOptional {
String first, String second = "no param" ->
- "$first + $second"
+ "$first + $second"
}
def t = new EMCT_Class()
@@ -699,11 +700,11 @@ class ExpandoMetaClassTest extends GroovyTestCase {
def doMethods(clazz) {
def metaClass = clazz.metaClass
- metaClass.setErrors = {errors ->
+ metaClass.setErrors = { errors ->
thingo = errors
}
- metaClass.getErrors = {->
+ metaClass.getErrors = { ->
return thingo
}
}
@@ -711,19 +712,17 @@ class ExpandoMetaClassTest extends GroovyTestCase {
void testGetProperty() {
def x = new EMCT_SuperClass()
def mc = x.metaClass
- mc.getProperty = {String name ->
+ mc.getProperty = { String name ->
MetaProperty mp = mc.getMetaProperty(name)
if (mp)
mp.getProperty(delegate)
else {
if (thingo) {
thingo."$name"
- }
- else {
+ } else {
if (application) {
"non-null application"
- }
- else {
+ } else {
String methodName = "get${name[0].toUpperCase()}${name.substring(1)}"
mc."$methodName" = {
-> "$name"
@@ -762,7 +761,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
}
}
- mc.render = {String txt ->
+ mc.render = { String txt ->
txt
}
@@ -771,7 +770,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
}
void testInterfaceWithGetProperty() {
- EMCT_Implemented.metaClass.getProperty = {String name ->
+ EMCT_Implemented.metaClass.getProperty = { String name ->
return "META " + delegate.class.metaClass.getMetaProperty(name).getProperty(delegate)
}
EMCT_InterfaceWithFormat.metaClass.getFormat = {
@@ -782,15 +781,15 @@ class ExpandoMetaClassTest extends GroovyTestCase {
}
void testPickMethodForVarg() {
- // as of 1.6 a metaClass is often the HandleMetaclass, which delegates
- // methods to an underlaying meta class. hasMethod is a Method on EMC
- // that takes a Class[] vargs argument as last part. If that part is not
- // given, then hasMetaMethod will still work, but the code actually
- // invoking the method in EMC.invokeMehod(String,Object) has to correct the
- // arguments.
- assert "".metaClass.pickMethod("trim")
- }
-
+ // as of 1.6 a metaClass is often the HandleMetaclass, which delegates
+ // methods to an underlaying meta class. hasMethod is a Method on EMC
+ // that takes a Class[] vargs argument as last part. If that part is not
+ // given, then hasMetaMethod will still work, but the code actually
+ // invoking the method in EMC.invokeMehod(String,Object) has to correct the
+ // arguments.
+ assert "".metaClass.pickMethod("trim")
+ }
+
void testEMCMetaClassProperty() {
// GROOVY-2516
try {
@@ -799,7 +798,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
GroovySystem.metaClassRegistry.removeMetaClass(ExpandoMetaClass.class)
}
}
-
+
void testDynamicAddedMethodWithGStringCall() {
// GROOVY-4691
assertScript """
@@ -822,7 +821,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
}
static class X {
- def foo() {2}
+ def foo() { 2 }
}
void testPOJOMetaClassInterception() {
@@ -837,6 +836,7 @@ class ExpandoMetaClassTest extends GroovyTestCase {
invoking.metaClass = null
}
}
+
void testPOGOMetaClassInterception() {
X entity = new X()
try {
@@ -868,9 +868,9 @@ class EMCT_ChildClass extends EMCT_SuperClass {
}
class EMCT_InvokeMethod {
- def invokeMe(String boo) {"Foo!! $boo"}
+ def invokeMe(String boo) { "Foo!! $boo" }
- static myStaticMethod() {"bar!"}
+ static myStaticMethod() { "bar!" }
}
class EMCT_GetProperty {
@@ -888,7 +888,7 @@ class EMCT_Class {
"hello!"
}
- def doSomething(Object txt) {txt}
+ def doSomething(Object txt) { txt }
static existingStatic() {
"I exist"
diff --git a/src/test/groovy/lang/GetMethodsTest.groovy b/src/test/groovy/lang/GetMethodsTest.groovy
index 99c96d5..da079d6 100644
--- a/src/test/groovy/lang/GetMethodsTest.groovy
+++ b/src/test/groovy/lang/GetMethodsTest.groovy
@@ -20,17 +20,16 @@ package groovy.lang
/**
* Tests the behaviour of the runtime evaluating methods of Groovy's MetaClass system
-
- * @author Graeme Rocher
+ *
* @since 1.5
*/
class GetMethodsTest extends GroovyTestCase {
void testGetMethods() {
- GMTest2.metaClass.doStuff = {-> "foo" }
- GMTest2.metaClass.getFoo = {-> "foo" }
+ GMTest2.metaClass.doStuff = { -> "foo" }
+ GMTest2.metaClass.getFoo = { -> "foo" }
GMTest2.metaClass.bar = "bar"
- GMTest2.metaClass.'static'.doMoreStuff = {-> "more" }
+ GMTest2.metaClass.'static'.doMoreStuff = { -> "more" }
def t = new GMTest2()
assert t.metaClass.methods.find { it.name == 'one' }
@@ -50,7 +49,7 @@ class GetMethodsTest extends GroovyTestCase {
}
void testGetProperties() {
- GMTest2.metaClass.getFoo = {-> "foo" }
+ GMTest2.metaClass.getFoo = { -> "foo" }
GMTest2.metaClass.bar = "bar"
def t = new GMTest2()
@@ -68,7 +67,7 @@ class GMTest1 {
String five
def two = { "three" }
- def one() { "two"}
+ def one() { "two" }
def one(String one) { "two: $one" }
diff --git a/src/test/groovy/lang/GroovyCodeSourceTest.groovy b/src/test/groovy/lang/GroovyCodeSourceTest.groovy
index 7308ce4..9f8422f 100644
--- a/src/test/groovy/lang/GroovyCodeSourceTest.groovy
+++ b/src/test/groovy/lang/GroovyCodeSourceTest.groovy
@@ -18,9 +18,6 @@
*/
package groovy.lang
-/**
- * @author Merlyn Albery-Speyer
- */
class GroovyCodeSourceTest extends GroovyTestCase {
void testValidEncoding() {
new GroovyCodeSource(createTemporaryGroovyClassFile(), "UTF-8")
@@ -37,7 +34,7 @@ class GroovyCodeSourceTest extends GroovyTestCase {
void testInvalidFile() {
try {
- new GroovyCodeSource(new File("SomeFileThatDoesNotExist"+System.currentTimeMillis()), "UTF-8")
+ new GroovyCodeSource(new File("SomeFileThatDoesNotExist" + System.currentTimeMillis()), "UTF-8")
fail("expected IOException")
} catch (IOException) {
assert true
@@ -54,7 +51,7 @@ class GroovyCodeSourceTest extends GroovyTestCase {
}
File createTemporaryGroovyClassFile() {
- String testName = "GroovyCodeSourceTest"+System.currentTimeMillis()
+ String testName = "GroovyCodeSourceTest" + System.currentTimeMillis()
File groovyCode = new File(System.getProperty("java.io.tmpdir"), testName)
groovyCode.write("class SomeClass { }")
groovyCode.deleteOnExit()
diff --git a/src/test/groovy/lang/GroovySystemTest.groovy b/src/test/groovy/lang/GroovySystemTest.groovy
index 7bb716e..448247d 100644
--- a/src/test/groovy/lang/GroovySystemTest.groovy
+++ b/src/test/groovy/lang/GroovySystemTest.groovy
@@ -18,15 +18,9 @@
*/
package groovy.lang
-import java.util.logging.*
-
/**
* Tests for the GroovySystem class
- *
- * @author Graeme Rocher
- * @author Roshan Dawrani
- **/
-
+ */
class GroovySystemTest extends GroovyTestCase {
void testGetMetaClassRegistry() {
@@ -37,4 +31,4 @@ class GroovySystemTest extends GroovyTestCase {
void testGroovyVersion() {
assert GroovySystem.getVersion()
}
-}
\ No newline at end of file
+}
diff --git a/src/test/groovy/lang/InterceptorTest.groovy b/src/test/groovy/lang/InterceptorTest.groovy
index 2e15539..3d74369 100644
--- a/src/test/groovy/lang/InterceptorTest.groovy
+++ b/src/test/groovy/lang/InterceptorTest.groovy
@@ -25,9 +25,7 @@ import org.codehaus.groovy.runtime.StringBufferWriter
* TracingInterceptor. Makes also use of the ProxyMetaClass and
* shows the collaboration.
* As a side Effect, the ProxyMetaClass is also partly tested.
- *
- * @author Dierk Koenig
- * */
+ */
class InterceptorTest extends GroovyTestCase {
def Interceptor logInterceptor
diff --git a/src/test/groovy/lang/MapOfClosureTest.groovy b/src/test/groovy/lang/MapOfClosureTest.groovy
index 0919bb5..653bfcb 100644
--- a/src/test/groovy/lang/MapOfClosureTest.groovy
+++ b/src/test/groovy/lang/MapOfClosureTest.groovy
@@ -1,115 +1,116 @@
-/*
- * 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.lang
-
-/**
- * Tests maps of closures coerced to classes by asType()
- *
- * @author Jochen Theodorou
- * @author Guillaume Laforge
- */
-class MapOfClosureTest extends GroovyTestCase {
-
- void testInterfaceProxy() {
- def outer = 1
- def x = [run: { outer++ }] as Runnable
- x.run()
-
- assert x instanceof Runnable
- assert outer == 2
- }
-
- void testInterfaceProxyWithoutAllMethods() {
- def proxy = [ methodOne: { 'some string' } ] as MultiMethodInterface
-
- assert proxy instanceof MultiMethodInterface
-
- assertEquals 'some string', proxy.methodOne()
-
- shouldFail(UnsupportedOperationException) {
- proxy.methodTwo()
- }
- }
-
- void testObject() {
- def m = [bar: { "foo" }]
- def x = m as Object
-
- assert x.is(m)
- assert "foo" == x.bar()
- }
-
- void testAbstractClassSubclassing() {
- def outer = 1
- def x = [run: { outer++ }] as TimerTask
- x.run()
- assert x instanceof TimerTask
- assert outer == 2
- }
-
- /**
- * Checks public and protected methods from parents can also be overridden by the Map coercion to classes.
- */
- void testOverrideProtectedMethods() {
- def b = [pub: { "map pub" }, prot: { "map prot" }, child: { "map child" }] as B
-
- assert "map pub" == b.pub()
- assert "map prot" == b.prot()
- assert "map child" == b.child()
- assert "abstract" == b.abstractMethod()
- }
-
- /**
- * Checks that abstract methods can also be overridden.
- */
- void testAbstractMethodIsOverrided() {
- def a = [abstractMethod: { "map abstract" }] as A
-
- assert "map abstract" == a.abstractMethod()
- }
-
- /**
- * Verify that complex method signatures, even with primitive types and arrays, can be overridden.
- */
- void testComplexMethodSignature() {
- def c = [foo: { int a, List b, Double[] c -> ["map foo"] as String[] }] as C
-
- assert ["map foo"] as String[] == c.foo(1, ['a', 'b'], [0.2, 0.3] as Double[])
- }
-}
-
-abstract class A {
- protected prot() { "prot" }
- def pub() { "pub" }
- abstract abstractMethod()
-}
-
-class B extends A {
- protected child() { "child" }
- def abstractMethod() { "abstract" }
-}
-
-class C {
- String[] foo(int a, List b, Double[] c) { ["foo"] as String[] }
-}
-
-interface MultiMethodInterface {
- String methodOne()
- String methodTwo()
+/*
+ * 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.lang
+
+/**
+ * Tests maps of closures coerced to classes by asType()
+ */
+class MapOfClosureTest extends GroovyTestCase {
+
+ void testInterfaceProxy() {
+ def outer = 1
+ def x = [run: { outer++ }] as Runnable
+ x.run()
+
+ assert x instanceof Runnable
+ assert outer == 2
+ }
+
+ void testInterfaceProxyWithoutAllMethods() {
+ def proxy = [methodOne: { 'some string' }] as MultiMethodInterface
+
+ assert proxy instanceof MultiMethodInterface
+
+ assertEquals 'some string', proxy.methodOne()
+
+ shouldFail(UnsupportedOperationException) {
+ proxy.methodTwo()
+ }
+ }
+
+ void testObject() {
+ def m = [bar: { "foo" }]
+ def x = m as Object
+
+ assert x.is(m)
+ assert "foo" == x.bar()
+ }
+
+ void testAbstractClassSubclassing() {
+ def outer = 1
+ def x = [run: { outer++ }] as TimerTask
+ x.run()
+ assert x instanceof TimerTask
+ assert outer == 2
+ }
+
+ /**
+ * Checks public and protected methods from parents can also be overridden by the Map coercion to classes.
+ */
+ void testOverrideProtectedMethods() {
+ def b = [pub: { "map pub" }, prot: { "map prot" }, child: { "map child" }] as B
+
+ assert "map pub" == b.pub()
+ assert "map prot" == b.prot()
+ assert "map child" == b.child()
+ assert "abstract" == b.abstractMethod()
+ }
+
+ /**
+ * Checks that abstract methods can also be overridden.
+ */
+ void testAbstractMethodIsOverrided() {
+ def a = [abstractMethod: { "map abstract" }] as A
+
+ assert "map abstract" == a.abstractMethod()
+ }
+
+ /**
+ * Verify that complex method signatures, even with primitive types and arrays, can be overridden.
+ */
+ void testComplexMethodSignature() {
+ def c = [foo: { int a, List b, Double[] c -> ["map foo"] as String[] }] as C
+
+ assert ["map foo"] as String[] == c.foo(1, ['a', 'b'], [0.2, 0.3] as Double[])
+ }
+}
+
+abstract class A {
+ protected prot() { "prot" }
+
+ def pub() { "pub" }
+
+ abstract abstractMethod()
+}
+
+class B extends A {
+ protected child() { "child" }
+
+ def abstractMethod() { "abstract" }
+}
+
+class C {
+ String[] foo(int a, List b, Double[] c) { ["foo"] as String[] }
+}
+
+interface MultiMethodInterface {
+ String methodOne()
+
+ String methodTwo()
}
\ No newline at end of file
diff --git a/src/test/groovy/lang/MetaClassRegistryTest.groovy b/src/test/groovy/lang/MetaClassRegistryTest.groovy
index 120bb4c..83d4f13 100644
--- a/src/test/groovy/lang/MetaClassRegistryTest.groovy
+++ b/src/test/groovy/lang/MetaClassRegistryTest.groovy
@@ -21,9 +21,6 @@ package groovy.lang
/**
* GROOVY-2875: MetaClassRegistryImpl constantMetaClasses map is leaking resources
* GROOVY-4481: the listener and iterator mechanism over the MetaClassRegistry wasn't working.
- *
- * @author Jochen Theodorou
- * @author Guillaume Laforge
*/
class MetaClassRegistryTest extends GroovyTestCase {
@@ -32,7 +29,7 @@ class MetaClassRegistryTest extends GroovyTestCase {
static {
try {
Class.forName("org.codehaus.groovy.vmplugin.v7.IndyInterface", true, MetaClassRegistryTest.classLoader)
- } catch(e){
+ } catch (e) {
}
initSize = GroovySystem.metaClassRegistry.metaClassRegistryChangeEventListeners.size()
}
@@ -42,7 +39,7 @@ class MetaClassRegistryTest extends GroovyTestCase {
def listener = { event -> called = event } as MetaClassRegistryChangeEventListener
registry.addMetaClassRegistryChangeEventListener listener
- Integer.metaClass.foo = {->}
+ Integer.metaClass.foo = { -> }
assert 1.foo() == null
assert called != null
@@ -94,7 +91,7 @@ class MetaClassRegistryTest extends GroovyTestCase {
}
void testIteratorRemove() {
- Integer.metaClass.foo {-> 1 }
+ Integer.metaClass.foo { -> 1 }
assert 1.foo() == 1
for (def it = registry.iterator(); it.hasNext();) {
it.remove()
diff --git a/src/test/groovy/lang/PropertyMissingTest.groovy b/src/test/groovy/lang/PropertyMissingTest.groovy
index 9ef4ae8..7016464 100644
--- a/src/test/groovy/lang/PropertyMissingTest.groovy
+++ b/src/test/groovy/lang/PropertyMissingTest.groovy
@@ -21,14 +21,13 @@ package groovy.lang
/**
* Tests the behaviour of the propertyMissing functionality of Groovy
*
- * @author Graeme Rocher
* @since 1.5
*/
class PropertyMissingTest extends GroovyTestCase {
void testPropertyMissingWithMethods() {
- def t = new PMTest1()
+ def t = new PMTest1()
assertEquals "bar", t.foo
t.foo = "changed"
@@ -43,21 +42,21 @@ class PropertyMissingTest extends GroovyTestCase {
void testPropertyMissingViaMetaClass() {
def store = [:]
PMTest2.metaClass.propertyMissing = { String name ->
- store.name
+ store.name
}
PMTest2.metaClass.propertyMissing = { String name, value ->
- store.name = value
+ store.name = value
}
def t = new PMTest2()
- assertEquals "bar", t.foo
- t.foo = "changed"
- assertEquals "changed", t.foo
- assertNull t.bar
- t.bar = "keepme"
+ assertEquals "bar", t.foo
+ t.foo = "changed"
+ assertEquals "changed", t.foo
+ assertNull t.bar
+ t.bar = "keepme"
- assertEquals "keepme", t.bar
+ assertEquals "keepme", t.bar
}
@@ -102,9 +101,11 @@ class PropertyMissingTest extends GroovyTestCase {
class PMTest1 {
def store = [:]
String foo = "bar"
+
String propertyMissing(String name) {
store.name
}
+
void propertyMissing(String name, value) {
store.name = value
}
@@ -116,6 +117,7 @@ class PMTest2 {
class PMTest3 {
String foo = 'bar'
+
void propertyMissing(String name, value) {
foo = "${name}-${value}"
}
diff --git a/src/test/groovy/lang/ReferenceSerializationTest.groovy b/src/test/groovy/lang/ReferenceSerializationTest.groovy
index c6bb043..603cf12 100644
--- a/src/test/groovy/lang/ReferenceSerializationTest.groovy
+++ b/src/test/groovy/lang/ReferenceSerializationTest.groovy
@@ -20,8 +20,6 @@ package groovy.lang
/**
* GROOVY-4305: Make groovy.lang.Reference implement Serializable
- *
- * @author Guillaume Laforge
*/
class ReferenceSerializationTest extends GroovyTestCase implements Serializable {
diff --git a/src/test/groovy/lang/RespondsToTest.groovy b/src/test/groovy/lang/RespondsToTest.groovy
index 7ca2a8d..890ed44 100644
--- a/src/test/groovy/lang/RespondsToTest.groovy
+++ b/src/test/groovy/lang/RespondsToTest.groovy
@@ -21,13 +21,12 @@ package groovy.lang
/**
* Tests the respondsTo functionality of Groovy
*
- * @author Graeme Rocher
* @since 1.6.0
*/
class RespondsToTest extends GroovyTestCase {
void testRespondsToForMethodEvaluation() {
- RespondsToTestClass.metaClass.invokeMethod = {String name, args ->
+ RespondsToTestClass.metaClass.invokeMethod = { String name, args ->
def methods = RespondsToTestClass.metaClass.respondsTo(delegate, name, args*.getClass() as Class[])
def result
if (methods) {
@@ -36,8 +35,7 @@ class RespondsToTest extends GroovyTestCase {
result = methods[0].invoke(delegate, [args] as Object[])
else
result = methods[0].invoke(delegate, args)
- }
- else {
+ } else {
result = "foo"
}
result
@@ -58,7 +56,7 @@ class RespondsToTest extends GroovyTestCase {
}
void testRespondsTo() {
- RTTest2.metaClass.newM = {-> "foo" }
+ RTTest2.metaClass.newM = { -> "foo" }
def t = new RTTest2()
assert t.metaClass.respondsTo(t, "one")
assert t.metaClass.respondsTo(t, "three")
@@ -90,7 +88,7 @@ class RespondsToTest extends GroovyTestCase {
}
void testHasProperty() {
- RTTest2.metaClass.getNewProp = {-> "new" }
+ RTTest2.metaClass.getNewProp = { -> "new" }
def t = new RTTest2()
assert t.metaClass.hasProperty(t, "two")
assert t.metaClass.hasProperty(t, "newtwo")
@@ -128,7 +126,7 @@ class RTTest1 {
String five
def two = { "three" }
- def one() { "two"}
+ def one() { "two" }
def one(String one) { "two: $one" }
diff --git a/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy b/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
index 55e7a84..d550ddb 100644
--- a/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
+++ b/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
@@ -23,8 +23,6 @@ import org.codehaus.groovy.control.Phases
/**
* Check that scripts have proper source position in the AST
- *
- * @author Guillaume Laforge
*/
class ScriptSourcePositionInAstTest extends GroovyTestCase {
@@ -32,7 +30,7 @@ class ScriptSourcePositionInAstTest extends GroovyTestCase {
CompilationUnit cu = new CompilationUnit()
cu.addSource("scriptSourcePosition.groovy", text)
cu.compile(Phases.SEMANTIC_ANALYSIS)
-
+
def node = cu.getAST().getClass("scriptSourcePosition")
[[node.getLineNumber(), node.getColumnNumber()], [node.getLastLineNumber(), node.getLastColumnNumber()]]
diff --git a/src/test/groovy/mock/interceptor/Caller.groovy b/src/test/groovy/mock/interceptor/Caller.groovy
index c3a93cf..386f695 100644
--- a/src/test/groovy/mock/interceptor/Caller.groovy
+++ b/src/test/groovy/mock/interceptor/Caller.groovy
@@ -19,23 +19,25 @@
package groovy.mock.interceptor
/**
- Helper class for testing.
- @author Dierk Koenig
-*/
-
+ * Helper class for testing.
+ */
class Caller {
int collaborateOne() {
return new Collaborator().one()
}
+
int collaborateOne(int arg) {
- return new Collaborator().one( arg )
+ return new Collaborator().one(arg)
}
+
int collaborateOne(int one, two) {
- return new Collaborator().one( one, two )
+ return new Collaborator().one(one, two)
}
+
int collaborateTwo() {
return new Collaborator().two()
}
+
String collaborateJava() {
return 'whatever'.toString()
}
@@ -43,6 +45,7 @@ class Caller {
String callFoo1() {
return new Collaborator().foo
}
+
String callFoo2() {
return new Collaborator().foo
}
diff --git a/src/test/groovy/mock/interceptor/Collaborator.groovy b/src/test/groovy/mock/interceptor/Collaborator.groovy
index df3895d..7c1b503 100644
--- a/src/test/groovy/mock/interceptor/Collaborator.groovy
+++ b/src/test/groovy/mock/interceptor/Collaborator.groovy
@@ -19,24 +19,25 @@
package groovy.mock.interceptor
/**
- Helper class for testing.
- @author Dierk Koenig
-*/
-
+ * Helper class for testing.
+ */
class Collaborator {
String foo = "bar"
String bar = "foo"
-
+
def one() {
throw new RuntimeException('Never reach here. Should have been mocked.')
}
+
def one(int arg) {
throw new RuntimeException('Never reach here. Should have been mocked.')
}
+
def one(int one, int two) {
throw new RuntimeException('Never reach here. Should have been mocked.')
}
+
def two() {
throw new RuntimeException('Never reach here. Should have been mocked.')
}
diff --git a/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy b/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
index 04ddb04..36f8605 100644
--- a/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
+++ b/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
@@ -21,11 +21,9 @@ package groovy.mock.interceptor
import junit.framework.AssertionFailedError
/**
- Testing Groovy Mock support for single calls to the Collaborator with
- no, one, multiple, or arbitrary arguments, exceptions and failures.
- @author Dierk Koenig
-*/
-
+ * Testing Groovy Mock support for single calls to the Collaborator with
+ * no, one, multiple, or arbitrary arguments, exceptions and failures.
+ */
class MockSingleCallTest extends GroovyTestCase {
MockFor mocker
@@ -35,18 +33,18 @@ class MockSingleCallTest extends GroovyTestCase {
}
void testMockGetter() {
- mocker.demand.getFoo { "foo" }
- mocker.demand.getFoo { "foobar" }
- mocker.use {
- assertEquals "foo", new Caller().callFoo1()
- assertEquals "foobar", new Caller().callFoo2()
- }
+ mocker.demand.getFoo { "foo" }
+ mocker.demand.getFoo { "foobar" }
+ mocker.use {
+ assertEquals "foo", new Caller().callFoo1()
+ assertEquals "foobar", new Caller().callFoo2()
+ }
}
void testMockSetter() {
def result = null
-
+
mocker.demand.setBar { result = it }
mocker.demand.setBar { result = it }
@@ -58,25 +56,28 @@ class MockSingleCallTest extends GroovyTestCase {
}
}
-
+
void testSingleCallNoArgs() {
mocker.demand.one { 1 }
mocker.use {
assertEquals 1, new Caller().collaborateOne()
}
}
+
void testSingleCallOneArg() {
mocker.demand.one { arg -> return arg }
mocker.use {
assertEquals 2, new Caller().collaborateOne(2)
}
}
+
void testSingleCallTwoArgs() {
mocker.demand.one { one, two -> return one + two }
mocker.use {
assertEquals 2, new Caller().collaborateOne(1, 1)
}
}
+
void testNoSingleCallTwoArgsWhenNoArgDemanded() {
mocker.demand.one { 2 }
mocker.use {
@@ -85,18 +86,21 @@ class MockSingleCallTest extends GroovyTestCase {
}
}
}
+
void testSingleCallTwoArgsWhenArbitraryArgsDemanded() {
- mocker.demand.one { Object[] arg -> 2 }
+ mocker.demand.one { Object[] arg -> 2 }
mocker.use {
assertEquals 2, new Caller().collaborateOne(1, 1)
}
}
+
void testSingleCallTwoArgsWhenDefaultArgsDemanded() {
- mocker.demand.one { one=null, two=null -> 2 }
+ mocker.demand.one { one = null, two = null -> 2 }
mocker.use {
assertEquals 2, new Caller().collaborateOne(1, 1)
}
}
+
void testVerifyFailsIfOneDemandedButNoneExcecuted() {
mocker.demand.one { 1 }
def msg = shouldFail(AssertionFailedError.class) {
@@ -110,6 +114,7 @@ class MockSingleCallTest extends GroovyTestCase {
exception. */
// assert msg =~ /0.*1..1.*never called/
}
+
void testFirstOptionalOmitted() {
mocker.demand.one(0..1) { 1 }
mocker.use {
@@ -117,6 +122,7 @@ class MockSingleCallTest extends GroovyTestCase {
}
// Getting here means no exception, which is what we want to test. (Fix for GROOVY-2309)
}
+
void testSingleCallExceptionDemanded() {
mocker.demand.one { throw new IllegalArgumentException() }
mocker.use {
@@ -126,12 +132,14 @@ class MockSingleCallTest extends GroovyTestCase {
}
}
}
+
void testSingleCallFailDemanded() {
mocker.demand.one { fail 'just kidding' }
mocker.use {
shouldFail() { new Caller().collaborateOne() }
}
}
+
void testJavaCall() {
mocker = new MockFor(String.class)
mocker.demand.toString { 'groovy' }
diff --git a/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy b/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
index d0e51bd..1011743 100644
--- a/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
+++ b/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
@@ -23,8 +23,6 @@ import junit.framework.AssertionFailedError
/**
* Testing Groovy Stub support for multiple calls to the Collaborator with
* demanding one or two methods multiple and and various ranges.
- *
- * @author Dierk Koenig
*/
class StubCallSequenceTest extends GroovyTestCase {
diff --git a/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy b/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
index 48c21f3..3785175 100644
--- a/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
+++ b/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
@@ -19,10 +19,8 @@
package groovy.mock.interceptor
/**
- Testing Groovy Stub support for single calls to the Collaborator
- @author Dierk Koenig
-*/
-
+ * Testing Groovy Stub support for single calls to the Collaborator
+ */
class StubSingleCallTest extends GroovyTestCase {
StubFor stub
diff --git a/src/test/groovy/operator/BitwiseOperatorsTest.groovy b/src/test/groovy/operator/BitwiseOperatorsTest.groovy
index 5e29e37..fc5c719 100644
--- a/src/test/groovy/operator/BitwiseOperatorsTest.groovy
+++ b/src/test/groovy/operator/BitwiseOperatorsTest.groovy
@@ -18,10 +18,8 @@
*/
package groovy.operator
-/**
+/**
* Test Bitwise Operations
- *
- * @author Pilho Kim
*/
class BitwiseOperatorsTest extends GroovyTestCase {
@@ -166,38 +164,38 @@ class BitwiseOperatorsTest extends GroovyTestCase {
}
void testBitwiseOrInClosure() {
- def c1 = {x, y -> return x | y}
+ def c1 = { x, y -> return x | y }
assert c1(14, 5) == 15 // 0x0000000E | 0x00000005 = 0x0000000F
assert c1(0x0D, 0xFE) == 255 // 0x0000000D | 0x000000FE = 0x000000FF
- def c2 = {x, y -> return x | y}
+ def c2 = { x, y -> return x | y }
assert c2(14, 5) == 15 // 0x0000000E | 0x00000005 = 0x0000000F
assert c2(0x0D, 0xFE) == 255 // 0x0000000D | 0x000000FE = 0x000000FF
}
void testAmbiguityOfBitwiseOr() {
- def c1 = {x, y -> return x | y}
+ def c1 = { x, y -> return x | y }
assert c1(14, 5) == 15 // 0x0000000E | 0x00000005 = 0x0000000F
assert c1(0x0D, 0xFE) == 255 // 0x0000000D | 0x000000FE = 0x000000FF
- def c2 = {x, y -> return x | y}
+ def c2 = { x, y -> return x | y }
assert c2(14, 5) == 15 // 0x0000000E | 0x00000005 = 0x0000000F
assert c2(0x0D, 0xFE) == 255 // 0x0000000D | 0x000000FE = 0x000000FF
def x = 3
def y = 5
- c1 = {xx -> return y} // -> is a closure delimiter
- c2 = {return x & y} // & is a bitAnd
- def c3 = {return x ^ y} // & is a bitXor
+ c1 = { xx -> return y } // -> is a closure delimiter
+ c2 = { return x & y } // & is a bitAnd
+ def c3 = { return x ^ y } // & is a bitXor
def c11 = {
xx -> return y // -> is a closure delimiter
}
def c12 = {
return (x | y) // | is a bitOr
}
- def c13 = {xx -> return y // -> is a closure delimiter
+ def c13 = { xx -> return y // -> is a closure delimiter
}
- def c14 = {-> return x | y // last | is a bitOr
+ def c14 = { -> return x | y // last | is a bitOr
}
assert c1(null) == 5
@@ -210,18 +208,18 @@ class BitwiseOperatorsTest extends GroovyTestCase {
x = 0x03
- def d1 = {xx -> return xx} // -> is a closure delimiter
- def d2 = {return x & x} // & is a bitAnd
- def d3 = {return x ^ x} // & is a bitXor
+ def d1 = { xx -> return xx } // -> is a closure delimiter
+ def d2 = { return x & x } // & is a bitAnd
+ def d3 = { return x ^ x } // & is a bitXor
def d11 = {
xx -> return xx // -> is a closure delimiter
}
def d12 = {
return (x | x) // | is a bitOr
}
- def d13 = {xx -> return xx // -> is a closure delimiter
+ def d13 = { xx -> return xx // -> is a closure delimiter
}
- def d14 = {-> return x | x // last | is a bitOr
+ def d14 = { -> return x | x // last | is a bitOr
}
assert d1(0xF0) == 0xF0
assert d2(0xF0) == 0x03
diff --git a/src/test/groovy/operator/NegateListsTest.groovy b/src/test/groovy/operator/NegateListsTest.groovy
index 13c768c..2132971 100644
--- a/src/test/groovy/operator/NegateListsTest.groovy
+++ b/src/test/groovy/operator/NegateListsTest.groovy
@@ -18,11 +18,9 @@
*/
package groovy.operator
-/**
+/**
* Test to negate lists in Classic Groovy.
* Test to check whether a given function is even/odd on a given domain.
- *
- * @author Pilho Kim
*/
class NegateListsTest extends GroovyTestCase {
@@ -64,7 +62,7 @@ class NegateListsTest extends GroovyTestCase {
def n = 1000 // the number of partitions for the interval 0..2/PI
def x = []
for (i in 0..n) {
- x << i*PI/n
+ x << i * PI / n
}
def cos = { Math.cos(it) }
diff --git a/src/test/groovy/operator/PowerOperatorsTest.groovy b/src/test/groovy/operator/PowerOperatorsTest.groovy
index 85e81e7..9c6a378 100644
--- a/src/test/groovy/operator/PowerOperatorsTest.groovy
+++ b/src/test/groovy/operator/PowerOperatorsTest.groovy
@@ -18,11 +18,8 @@
*/
package groovy.operator
-/**
+/**
* Test Math Power Operation in Classic/New Groovy
- *
- * @author Pilho Kim
- * @version $Revision: 4996 $
*/
class PowerOperatorsTest extends GroovyTestCase {
@@ -33,10 +30,10 @@ class PowerOperatorsTest extends GroovyTestCase {
assert -3**4 == -81
assert 3**-4 == 3.power(-4)
assert -3**-4 == -3.power(-4)
- assert 7**2 - 7*3 + 2 == 30 // 49 - 21 + 2 = 30
- assert -7**2 - 7*3 + 2 == -68 // -49 - 21 + 2 = -68
- assert -(7**2) - 7*3 + 2 == -68 // -49 - 21 + 2 = -68
- assert (-7)**2 - 7*3 + 2 == 30 // 49 - 21 + 2 = 30
+ assert 7**2 - 7 * 3 + 2 == 30 // 49 - 21 + 2 = 30
+ assert -7**2 - 7 * 3 + 2 == -68 // -49 - 21 + 2 = -68
+ assert -(7**2) - 7 * 3 + 2 == -68 // -49 - 21 + 2 = -68
+ assert (-7)**2 - 7 * 3 + 2 == 30 // 49 - 21 + 2 = 30
}
void testPowerOperation() {
@@ -64,9 +61,9 @@ class PowerOperatorsTest extends GroovyTestCase {
assert x == 7
println("${(--x)**2}")
assert x == 6
- assert (--x)**2 + x*2 - 1 == 34 // 5**2 + 5*2 - 1 = 34
+ assert (--x)**2 + x * 2 - 1 == 34 // 5**2 + 5*2 - 1 = 34
assert x == 5
- assert (x--)**2 + x*2 - 1 == 32 // 5**2 + 4*2 - 1 = 32
+ assert (x--)**2 + x * 2 - 1 == 32 // 5**2 + 4*2 - 1 = 32
assert x == 4
}
@@ -85,8 +82,8 @@ class PowerOperatorsTest extends GroovyTestCase {
x **= y
assert x == 25
assert x**y == 625
- assert x**-1 == 1/25
- assert x**-y == 1/625
+ assert x**-1 == 1 / 25
+ assert x**-y == 1 / 625
assert x**-y == x**(-y)
}
diff --git a/src/test/groovy/operator/SpreadListOperatorTest.groovy b/src/test/groovy/operator/SpreadListOperatorTest.groovy
index 62a1097..eaffe2e 100644
--- a/src/test/groovy/operator/SpreadListOperatorTest.groovy
+++ b/src/test/groovy/operator/SpreadListOperatorTest.groovy
@@ -24,11 +24,7 @@ package groovy.operator
* For an example, <pre>
* assert [1, *[2, 3], 4] == [1, 2, 3, 4]
* </pre>
- *
- * @author Pilho Kim
- * @author Jochen Theodorou
*/
-
class SpreadListOperatorTest extends GroovyTestCase {
void testSpreadingInList() {
@@ -36,7 +32,7 @@ class SpreadListOperatorTest extends GroovyTestCase {
assert [1, *[222, 333], 456] == [1, 222, 333, 456]
- def y = [1,2,3]
+ def y = [1, 2, 3]
assert [*y] == y
}
@@ -112,7 +108,7 @@ class SpreadListOperatorTest extends GroovyTestCase {
}
void testSpreadingInClosureParameters() {
- def twice = {it*2}
+ def twice = { it * 2 }
assert twice(3) == 6
assert twice("abcd") == 'abcdabcd'
diff --git a/src/test/groovy/operator/SpreadMapOperatorTest.groovy b/src/test/groovy/operator/SpreadMapOperatorTest.groovy
index f455879..3241161 100644
--- a/src/test/groovy/operator/SpreadMapOperatorTest.groovy
+++ b/src/test/groovy/operator/SpreadMapOperatorTest.groovy
@@ -27,14 +27,11 @@ package groovy.operator
*
* m = ['a':11, 'aa':22, 'aaa':33]
* w = ['c':100]
- * m.each {w[it.key] = it.value }
- *
+ * m.each {w[it.key] = it.value }*
* assert z == w
*
- * @author Pilho Kim
*/
-
-public class SpreadMapOperatorTest extends GroovyTestCase {
+class SpreadMapOperatorTest extends GroovyTestCase {
def f(m) {
println m.c
}
@@ -48,30 +45,30 @@ public class SpreadMapOperatorTest extends GroovyTestCase {
}
def fn() {
- return [ 1:'ein', 2:'zwei', 3:'drei' ]
+ return [1: 'ein', 2: 'zwei', 3: 'drei']
}
void testSpreadMap() {
try {
- def m = ["a":100, "b":200]
- def x = ['tt':55, *:m]
+ def m = ["a": 100, "b": 200]
+ def x = ['tt': 55, *: m]
println x.size()
println x
- x = ['tt':55, 'yy':77]
+ x = ['tt': 55, 'yy': 77]
println x
- x = [*:m, *:m]
+ x = [*: m, *: m]
println x
assert x == m
- x = [*:x, *:fn(), 100:'hundred']
+ x = [*: x, *: fn(), 100: 'hundred']
println x
println(x.getClass())
assert x instanceof Map
- def y = [1:1, 2:2, *:[3:3, 4:4, *:[5:5], 6:6], 7:7]
+ def y = [1: 1, 2: 2, *: [3: 3, 4: 4, *: [5: 5], 6: 6], 7: 7]
println y
println(y.getClass())
- assert y == [1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7]
+ assert y == [1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6, 7: 7]
}
catch (Exception e) {
e.printStackTrace()
@@ -79,21 +76,21 @@ public class SpreadMapOperatorTest extends GroovyTestCase {
}
void testSpreadMapVsWithClosure() {
- def m = ['a':11, 'aa':22, 'aaa':33]
- def z = ['c':100, *:m]
-
- def w = ['c':100]
+ def m = ['a': 11, 'aa': 22, 'aaa': 33]
+ def z = ['c': 100, *: m]
+
+ def w = ['c': 100]
m.each { w[it.key] = it.value }
- println z
- println w
+ println z
+ println w
assert z == w
- def z2 = [*:m, 'c':100]
+ def z2 = [*: m, 'c': 100]
def w2 = m
w2['c'] = 100
- println z2
- println w2
+ println z2
+ println w2
assert z2 == w2
assert z == z2
assert w == w2
@@ -117,16 +114,19 @@ public class SpreadMapOperatorTest extends GroovyTestCase {
}
void testSpreadMapFunctionCall() {
- def m = ['a':10, 'b':20, 'c':30]
- f(*:m) // Call with only one spread map argument
- f(*:m, 'e':50) // Call with one spread map argument and one named argument
- f('e':100, *:m) // Call with one named argument and one spread map argument
-
- func('e':100, 1, 2, 3, *:m) // Call with one named argument, three usual arguments, and one spread map argument
-
- def l = [4, 5]
- func('e':100, *l, *:m, 6) // Call with one named argument, one spread list argument, one spread map argument, and one usual argument
- func(7, 'e':100, *l, *:m) // Call with one usual argument, one named argument, one spread list argument, and one spread map argument
+ def m = ['a': 10, 'b': 20, 'c': 30]
+ f(*: m) // Call with only one spread map argument
+ f(*: m, 'e': 50) // Call with one spread map argument and one named argument
+ f('e': 100, *: m) // Call with one named argument and one spread map argument
+
+ func('e': 100, 1, 2, 3, *: m)
+ // Call with one named argument, three usual arguments, and one spread map argument
+
+ def l = [4, 5]
+ func('e': 100, *l, *: m, 6)
+ // Call with one named argument, one spread list argument, one spread map argument, and one usual argument
+ func(7, 'e': 100, *l, *: m)
+ // Call with one usual argument, one named argument, one spread list argument, and one spread map argument
}
}
diff --git a/src/test/groovy/time/TimeCategoryTest.groovy b/src/test/groovy/time/TimeCategoryTest.groovy
index dd23fdc..0ad5e96 100644
--- a/src/test/groovy/time/TimeCategoryTest.groovy
+++ b/src/test/groovy/time/TimeCategoryTest.groovy
@@ -18,12 +18,10 @@
*/
package groovy.time
-/**
+/**
* Tests the groovy.time.TimeCategory class.
* Most of these tests use January 1 as a start time to avoid
* leap years and daylight savings time issues.
- *
- * @author Hamlet D'Arcy
*/
class TimeCategoryTest extends GroovyTestCase {
@@ -210,8 +208,8 @@ class TimeCategoryTest extends GroovyTestCase {
def t3 = t1 + 4.seconds + 2.milliseconds
def t4 = t1 - 4.seconds - 2.milliseconds
def t5 = t1 + 4.seconds - 2.milliseconds
- def t6 = t1 - 2.milliseconds
- def t7 = t1 + 2.milliseconds
+ def t6 = t1 - 2.milliseconds
+ def t7 = t1 + 2.milliseconds
assert (t1 - t2).toString() == '3.998 seconds'
assert (t1 - t3).toString() == '-4.002 seconds'
assert (t1 - t4).toString() == '4.002 seconds'
@@ -229,7 +227,7 @@ class TimeCategoryTest extends GroovyTestCase {
}
void testDateEquality() {
- use (TimeCategory) {
+ use(TimeCategory) {
Date dt1 = 0.days.from.now
Date dt2 = new Date(0.days.from.now.time)
diff --git a/src/test/groovy/transform/LazyTest.groovy b/src/test/groovy/transform/LazyTest.groovy
index 91296f7..dd41ed8 100644
--- a/src/test/groovy/transform/LazyTest.groovy
+++ b/src/test/groovy/transform/LazyTest.groovy
@@ -23,12 +23,10 @@ import java.lang.reflect.Modifier
/**
* Unit tests for the Lazy annotation
- *
- * @author Tim Yates
*/
class LazyTest extends GroovyTestCase {
- public void testLazyPrimitiveWrapping() {
- def tester = new GroovyClassLoader().parseClass(
+ void testLazyPrimitiveWrapping() {
+ def tester = new GroovyClassLoader().parseClass(
'''class MyClass {
| @Lazy int index = { ->
| 1
@@ -42,8 +40,8 @@ class LazyTest extends GroovyTestCase {
assert field.type == Integer
}
- public void testLazyVolatilePrimitiveWrapping() {
- def tester = new GroovyClassLoader().parseClass(
+ void testLazyVolatilePrimitiveWrapping() {
+ def tester = new GroovyClassLoader().parseClass(
'''class MyClass {
| @Lazy volatile int index = { ->
| 1
@@ -57,8 +55,8 @@ class LazyTest extends GroovyTestCase {
assert field.type == Integer
}
- public void testLazySoftPrimitiveWrapping() {
- def tester = new GroovyClassLoader().parseClass(
+ void testLazySoftPrimitiveWrapping() {
+ def tester = new GroovyClassLoader().parseClass(
'''class MyClass {
| @Lazy(soft=true) int index = { ->
| 1
@@ -72,8 +70,8 @@ class LazyTest extends GroovyTestCase {
assert field.type == SoftReference
}
- public void testLazyVolatileSoftPrimitiveWrapping() {
- def tester = new GroovyClassLoader().parseClass(
+ void testLazyVolatileSoftPrimitiveWrapping() {
+ def tester = new GroovyClassLoader().parseClass(
'''class MyClass {
| @Lazy(soft=true) volatile int index = { ->
| 1
diff --git a/src/test/groovy/transform/ThreadInterruptTest.groovy b/src/test/groovy/transform/ThreadInterruptTest.groovy
index c742de1..46400c1 100644
--- a/src/test/groovy/transform/ThreadInterruptTest.groovy
+++ b/src/test/groovy/transform/ThreadInterruptTest.groovy
@@ -26,8 +26,6 @@ import java.lang.reflect.Modifier
/**
* Test for @ThreadInterrupt.
- *
- * @author Hamlet D'Arcy
*/
class ThreadInterruptTest extends GroovyTestCase {
private Map<String,MethodNode> oldValues = [:]
[groovy] 01/05: cleanup/remove @author tags as per Apache
recommended practices cont'd
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 1630fc11f6f52270911e799811902e65185dc0eb
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Jan 1 16:18:31 2019 +1000
cleanup/remove @author tags as per Apache recommended practices cont'd
---
gradle/pomconfigurer.gradle | 6 +
.../test/builder/ObjectGraphBuilderTest.groovy | 2 -
src/test/gls/enums/EnumTest.groovy | 3 -
src/test/gls/innerClass/InnerInterfaceTest.groovy | 2 -
src/test/gls/syntax/BinaryLiteralTest.groovy | 4 -
src/test/gls/syntax/Gep3OrderDslTest.groovy | 3 -
src/test/gls/syntax/UnderscoreInNumbersTest.groovy | 2 -
src/test/groovy/AmbiguousInvocationTest.groovy | 4 +-
src/test/groovy/BinaryStreamsTest.groovy | 2 -
src/test/groovy/BreakContinueLabelTest.groovy | 2 -
src/test/groovy/CallInnerClassCtorTest.groovy | 1 -
src/test/groovy/ClassExpressionTest.groovy | 2 -
src/test/groovy/ClosureAsParamTest.groovy | 3 -
src/test/groovy/ClosureCloneTest.groovy | 3 -
src/test/groovy/ClosureComparatorTest.groovy | 8 +-
src/test/groovy/ClosureComposeTest.groovy | 2 +-
src/test/groovy/ClosureDefaultParameterTest.groovy | 3 -
src/test/groovy/ClosureInStaticMethodTest.groovy | 35 +++---
src/test/groovy/ClosureMethodCallTest.groovy | 41 +++---
src/test/groovy/ClosureMethodTest.groovy | 140 ++++++++++-----------
src/test/groovy/ClosureMethodsOnFileTest.groovy | 8 +-
src/test/groovy/ClosureMissingMethodTest.groovy | 93 +++++++-------
src/test/groovy/ClosureReturnTest.groovy | 12 +-
src/test/groovy/ClosureTest.groovy | 54 ++++----
.../groovy/ClosureUsingOuterVariablesTest.groovy | 47 ++++---
src/test/groovy/ClosureWithDefaultParamTest.groovy | 72 ++++++-----
.../groovy/ClosureWithEmptyParametersTest.groovy | 5 +-
src/test/groovy/DummyMethodsGroovy.groovy | 3 -
src/test/groovy/ExceptionInClosureTest.groovy | 11 +-
29 files changed, 256 insertions(+), 317 deletions(-)
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 828d408..6a5ce05 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -699,6 +699,12 @@ project.ext.pomConfigureClosureWithoutTweaks = {
name 'Martin Stockhammer'
}
contributor {
+ name 'Martin C. Martin'
+ }
+ contributor {
+ name 'Alexey Verkhovsky'
+ }
+ contributor {
name 'Alberto Mijares'
}
contributor {
diff --git a/src/spec/test/builder/ObjectGraphBuilderTest.groovy b/src/spec/test/builder/ObjectGraphBuilderTest.groovy
index f3e487f..3f3d987 100644
--- a/src/spec/test/builder/ObjectGraphBuilderTest.groovy
+++ b/src/spec/test/builder/ObjectGraphBuilderTest.groovy
@@ -24,8 +24,6 @@ import asciidoctor.Utils
* Tests for ObjectGraphBuilder. The tests directly in this file are specific
* to ObjectGraphBuilder. Functionality in common with other Builders
* is tested in the parent class.
-*
-* @author Groovy Documentation Community
*/
class ObjectGraphBuilderTest extends GroovyTestCase {
diff --git a/src/test/gls/enums/EnumTest.groovy b/src/test/gls/enums/EnumTest.groovy
index e883ed1..684f55e 100644
--- a/src/test/gls/enums/EnumTest.groovy
+++ b/src/test/gls/enums/EnumTest.groovy
@@ -22,9 +22,6 @@ import gls.CompilableTestSupport
/**
* Tests various properties of enums.
- *
- * @author Paul King
- * @author Roshan Dawrani
*/
class EnumTest extends CompilableTestSupport {
diff --git a/src/test/gls/innerClass/InnerInterfaceTest.groovy b/src/test/gls/innerClass/InnerInterfaceTest.groovy
index 8f66866..41d407a 100644
--- a/src/test/gls/innerClass/InnerInterfaceTest.groovy
+++ b/src/test/gls/innerClass/InnerInterfaceTest.groovy
@@ -20,8 +20,6 @@ package gls.innerClass
/**
* Tests on inner interface usage
- *
- * @author Roshan Dawrani
*/
class InnerInterfaceTest extends GroovyTestCase {
diff --git a/src/test/gls/syntax/BinaryLiteralTest.groovy b/src/test/gls/syntax/BinaryLiteralTest.groovy
index c9b16a9..8cdea34 100644
--- a/src/test/gls/syntax/BinaryLiteralTest.groovy
+++ b/src/test/gls/syntax/BinaryLiteralTest.groovy
@@ -20,10 +20,6 @@ package gls.syntax
import gls.CompilableTestSupport
-/**
- *
- * @author Guillaume Laforge
- */
class BinaryLiteralTest extends CompilableTestSupport {
void testSomeBinaryLiteralNumbers() {
diff --git a/src/test/gls/syntax/Gep3OrderDslTest.groovy b/src/test/gls/syntax/Gep3OrderDslTest.groovy
index f906b5c..640beaa 100644
--- a/src/test/gls/syntax/Gep3OrderDslTest.groovy
+++ b/src/test/gls/syntax/Gep3OrderDslTest.groovy
@@ -20,9 +20,6 @@ package gls.syntax
import org.codehaus.groovy.control.CompilerConfiguration
-/**
- * @author Guillaume Laforge
- */
class Gep3OrderDslTest extends GroovyTestCase {
@Override
protected void setUp() {
diff --git a/src/test/gls/syntax/UnderscoreInNumbersTest.groovy b/src/test/gls/syntax/UnderscoreInNumbersTest.groovy
index 89bd2ac..084d23d 100644
--- a/src/test/gls/syntax/UnderscoreInNumbersTest.groovy
+++ b/src/test/gls/syntax/UnderscoreInNumbersTest.groovy
@@ -23,8 +23,6 @@ import gls.CompilableTestSupport
/**
* Most of the below examples were taken from the Project Coin proposal here:
* http://mail.openjdk.java.net/pipermail/coin-dev/2009-April/001628.html
- *
- * @author Guillaume Laforge
*/
class UnderscoreInNumbersTest extends CompilableTestSupport {
diff --git a/src/test/groovy/AmbiguousInvocationTest.groovy b/src/test/groovy/AmbiguousInvocationTest.groovy
index 317812f..2172dc8 100644
--- a/src/test/groovy/AmbiguousInvocationTest.groovy
+++ b/src/test/groovy/AmbiguousInvocationTest.groovy
@@ -17,12 +17,10 @@
* under the License.
*/
package groovy
+
/**
* to prove GROOVY-467 is no longer an issue
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
*/
-
class AmbiguousInvocationTest extends GroovyTestCase {
def dummy1, dummy2
diff --git a/src/test/groovy/BinaryStreamsTest.groovy b/src/test/groovy/BinaryStreamsTest.groovy
index 5c28d5c..de29ec1 100755
--- a/src/test/groovy/BinaryStreamsTest.groovy
+++ b/src/test/groovy/BinaryStreamsTest.groovy
@@ -18,8 +18,6 @@
*/
/**
* Test case for DefaultGroovyMethods involving Object streams and data streams.
- *
- * @author Martin C. Martin
*/
class BinaryStreamsTest extends GroovyTestCase {
diff --git a/src/test/groovy/BreakContinueLabelTest.groovy b/src/test/groovy/BreakContinueLabelTest.groovy
index 3a37848..a993f20 100644
--- a/src/test/groovy/BreakContinueLabelTest.groovy
+++ b/src/test/groovy/BreakContinueLabelTest.groovy
@@ -22,8 +22,6 @@ import gls.CompilableTestSupport
/**
* todo: add BreakContinueLabelWithClosureTest (when break is used to return from a Closure)
-
- * @author Dierk Koenig
*/
class BreakContinueLabelTest extends CompilableTestSupport {
diff --git a/src/test/groovy/CallInnerClassCtorTest.groovy b/src/test/groovy/CallInnerClassCtorTest.groovy
index 2c607c1..e422d5c 100644
--- a/src/test/groovy/CallInnerClassCtorTest.groovy
+++ b/src/test/groovy/CallInnerClassCtorTest.groovy
@@ -20,7 +20,6 @@ package groovy
/**
* Checks that it's possible to call inner classes constructor from groovy
- * @author Guillaume Laforge
*/
class CallInnerClassCtorTest extends GroovyTestCase {
diff --git a/src/test/groovy/ClassExpressionTest.groovy b/src/test/groovy/ClassExpressionTest.groovy
index eccec72..69bcf05 100644
--- a/src/test/groovy/ClassExpressionTest.groovy
+++ b/src/test/groovy/ClassExpressionTest.groovy
@@ -20,8 +20,6 @@ package groovy
/**
* Tests the use of classes as variable expressions
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ClassExpressionTest extends GroovyTestCase {
diff --git a/src/test/groovy/ClosureAsParamTest.groovy b/src/test/groovy/ClosureAsParamTest.groovy
index 2196e21..03a0071 100644
--- a/src/test/groovy/ClosureAsParamTest.groovy
+++ b/src/test/groovy/ClosureAsParamTest.groovy
@@ -22,9 +22,6 @@ import java.util.concurrent.Callable
/**
* Tests calling methods with Closures as parameters.
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- * @author Paul King
*/
class ClosureAsParamTest extends GroovyTestCase {
diff --git a/src/test/groovy/ClosureCloneTest.groovy b/src/test/groovy/ClosureCloneTest.groovy
index 5802dc9..adbe57b 100644
--- a/src/test/groovy/ClosureCloneTest.groovy
+++ b/src/test/groovy/ClosureCloneTest.groovy
@@ -18,9 +18,6 @@
*/
package groovy
-/**
- * @author <a href="mailto:jstrachan@protique.com">James Strachan</a>
- */
class ClosureCloneTest extends GroovyTestCase {
void testCloneOfClosure() {
diff --git a/src/test/groovy/ClosureComparatorTest.groovy b/src/test/groovy/ClosureComparatorTest.groovy
index 7ba887b..e0f7c3d 100644
--- a/src/test/groovy/ClosureComparatorTest.groovy
+++ b/src/test/groovy/ClosureComparatorTest.groovy
@@ -20,12 +20,10 @@ package groovy
/**
* Tests for ClosureComparator
- *
- * @author Alexey Verkhovsky
*/
class ClosureComparatorTest extends GroovyTestCase {
- public void testClosureComparatorForGroovyObjects() {
+ void testClosureComparatorForGroovyObjects() {
def comparator = new ClosureComparator({ one, another ->
one.greaterThan(another)
@@ -40,7 +38,7 @@ class ClosureComparatorTest extends GroovyTestCase {
}
- public void testClosureComparatorForNumericTypes() {
+ void testClosureComparatorForNumericTypes() {
def comparator = new ClosureComparator({ one, another ->
one - another
@@ -56,7 +54,7 @@ class ClosureComparatorTest extends GroovyTestCase {
class ComparableFoo {
long value
- public ComparableFoo(long theValue) {
+ ComparableFoo(long theValue) {
this.value = theValue
}
diff --git a/src/test/groovy/ClosureComposeTest.groovy b/src/test/groovy/ClosureComposeTest.groovy
index 1c4e634..2f759a5 100644
--- a/src/test/groovy/ClosureComposeTest.groovy
+++ b/src/test/groovy/ClosureComposeTest.groovy
@@ -19,7 +19,7 @@
package groovy
/**
- * @author Paul King
+ * Tests for Closure composition
*/
class ClosureComposeTest extends GroovyTestCase {
diff --git a/src/test/groovy/ClosureDefaultParameterTest.groovy b/src/test/groovy/ClosureDefaultParameterTest.groovy
index 71fc418..e9f8255 100644
--- a/src/test/groovy/ClosureDefaultParameterTest.groovy
+++ b/src/test/groovy/ClosureDefaultParameterTest.groovy
@@ -18,9 +18,6 @@
*/
package groovy
-/**
- * @author <a href="mailto:jstrachan@protique.com">James Strachan</a>
- */
class ClosureDefaultParameterTest extends GroovyTestCase {
void testClosureWithDefaultParams() {
diff --git a/src/test/groovy/ClosureInStaticMethodTest.groovy b/src/test/groovy/ClosureInStaticMethodTest.groovy
index 10cf86d..4b3766a 100644
--- a/src/test/groovy/ClosureInStaticMethodTest.groovy
+++ b/src/test/groovy/ClosureInStaticMethodTest.groovy
@@ -18,21 +18,18 @@
*/
package groovy
-/**
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- */
class ClosureInStaticMethodTest extends GroovyTestCase {
void testClosureInStaticMethod() {
def closure = closureInStaticMethod()
- assertClosure(closure)
+ assertClosure(closure)
}
void testMethodClosureInStaticMethod() {
def closure = methodClosureInStaticMethod()
- assertClosure(closure)
+ assertClosure(closure)
}
-
+
static def closureInStaticMethod() {
return { println(it) }
}
@@ -40,25 +37,25 @@ class ClosureInStaticMethodTest extends GroovyTestCase {
static def methodClosureInStaticMethod() {
System.out.&println
}
-
+
static def assertClosure(Closure block) {
assert block != null
block.call("hello!")
}
-
+
void testClosureInStaticMethodCallingStaticMethod() {
- assert doThing(1) == 10
- assert this.doThing(1) == 10
- assert ClosureInStaticMethodTest.doThing(1) == 10
+ assert doThing(1) == 10
+ assert this.doThing(1) == 10
+ assert ClosureInStaticMethodTest.doThing(1) == 10
}
-
-
+
+
static doThing(count) {
- def ret = count
- if (count > 2) return ret
- count.times {
- ret += doThing(count+it+1)
- }
- return ret
+ def ret = count
+ if (count > 2) return ret
+ count.times {
+ ret += doThing(count + it + 1)
+ }
+ return ret
}
}
diff --git a/src/test/groovy/ClosureMethodCallTest.groovy b/src/test/groovy/ClosureMethodCallTest.groovy
index d22bd0a..046aebf 100644
--- a/src/test/groovy/ClosureMethodCallTest.groovy
+++ b/src/test/groovy/ClosureMethodCallTest.groovy
@@ -18,15 +18,12 @@
*/
package groovy
-/**
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- */
class ClosureMethodCallTest extends GroovyTestCase {
void testCallingClosureWithMultipleArguments() {
def foo
def closure = { a, b -> foo = "hello ${a} and ${b}".toString() }
-
+
closure("james", "bob")
assert foo == "hello james and bob"
@@ -35,45 +32,45 @@ class ClosureMethodCallTest extends GroovyTestCase {
assert foo == "hello sam and james"
}
-
+
void testClosureCallMethodWithObjectArray() {
// GROOVY-2266
def args = [1] as Object[]
- def closure = {x -> x[0]}
+ def closure = { x -> x[0] }
assert closure.call(args) == 1
}
-
+
void testClosureWithStringArrayCastet() {
- def doSomething={ list -> list }
+ def doSomething = { list -> list }
- String[] x=["hello", "world"]
- String[] y=["hello", "world"]
+ String[] x = ["hello", "world"]
+ String[] y = ["hello", "world"]
assert doSomething(x as String[]) == x
- assert doSomething( y ) == y
+ assert doSomething(y) == y
}
-
+
void testClosureAsLocalVar() {
- def local = { Map params -> params.x * params.y }
- assert local(x : 2, y : 3) == 6
+ def local = { Map params -> params.x * params.y }
+ assert local(x: 2, y: 3) == 6
}
-
+
void testClosureDirectly() {
- assert { Map params -> params.x * params.y }(x : 2, y : 3) == 6
+ assert { Map params -> params.x * params.y }(x: 2, y: 3) == 6
}
-
+
def attribute
-
+
void testClosureAsAttribute() {
- attribute = { Map params -> params.x * params.y }
- assert attribute(x : 2, y : 3) == 6
+ attribute = { Map params -> params.x * params.y }
+ assert attribute(x: 2, y: 3) == 6
}
-
+
void testSystemOutPrintlnAsAClosure() {
def closure = System.out.&println
closure("Hello world")
}
-
+
//GROOVY-6819
void test() {
assertScript '''
diff --git a/src/test/groovy/ClosureMethodTest.groovy b/src/test/groovy/ClosureMethodTest.groovy
index 3b5de12..65a8438 100644
--- a/src/test/groovy/ClosureMethodTest.groovy
+++ b/src/test/groovy/ClosureMethodTest.groovy
@@ -22,22 +22,20 @@ import org.codehaus.groovy.runtime.DefaultGroovyMethods as DGM
/**
* Tests the various Closure methods in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ClosureMethodTest extends GroovyTestCase {
void testListCollect() {
def list = [1, 2, 3, 4]
- def answer = list.collect{item -> return item * 2 }
+ def answer = list.collect { item -> return item * 2 }
assert answer.size() == 4
def expected = [2, 4, 6, 8]
assert answer == expected
}
void testMapCollect() {
- def map = [1:2, 2:4, 3:6, 4:8]
- def answer = map.collect{e-> return e.key + e.value }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ def answer = map.collect { e -> return e.key + e.value }
// lest sort the results since maps are in hash code order
answer = answer.sort()
assert answer.size() == 4
@@ -51,7 +49,7 @@ class ClosureMethodTest extends GroovyTestCase {
void testObjectFindResult() {
def oneToTenObjectIterator = {
def i = 1
- [ hasNext: { i <= 10 }, next: { i++ } ] as Iterator
+ [hasNext: { i <= 10 }, next: { i++ }] as Iterator
}
assert "Found 3" == oneToTenObjectIterator().findResult {
@@ -74,23 +72,23 @@ class ClosureMethodTest extends GroovyTestCase {
if (false) return "won't get here, should return null"
}
}
-
+
void testListFind() {
def list = ["a", "b", "c"]
- def answer = list.find{item-> item == "b" }
+ def answer = list.find { item -> item == "b" }
assert answer == "b"
- answer = list.find{item-> item == "z" }
+ answer = list.find { item -> item == "z" }
assert answer == null
}
void testListFindResult() {
Collection<Integer> oneThroughFive = [1, 2, 3, 4, 5]
-
- assert "I found 4" == oneThroughFive.findResult {
+
+ assert "I found 4" == oneThroughFive.findResult {
if (it > 3) return "I found $it"
}
- assert null == oneThroughFive.findResult {
+ assert null == oneThroughFive.findResult {
if (it > 8) return "I found $it"
}
@@ -100,38 +98,38 @@ class ClosureMethodTest extends GroovyTestCase {
assert false == oneThroughFive.findResult {
if (it > 3) return false // a result of false is a valid result
- }
+ }
- assert "I found 3" == oneThroughFive.findResult("default") {
+ assert "I found 3" == oneThroughFive.findResult("default") {
if (it > 2) return "I found $it"
}
- assert "default" == oneThroughFive.findResult("default") {
+ assert "default" == oneThroughFive.findResult("default") {
if (it > 8) return "I found $it"
}
}
void testMapFind() {
- def map = [1:2, 2:4, 3:6, 4:8]
- def answer = map.find{entry -> entry.value == 6 }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ def answer = map.find { entry -> entry.value == 6 }
assert answer != null
assert answer.key == 3
assert answer.value == 6
- answer = map.find{entry -> entry.value == 0 }
+ answer = map.find { entry -> entry.value == 0 }
assert answer == null
- answer = map.find{ k, v -> v > 5 }
+ answer = map.find { k, v -> v > 5 }
assert answer instanceof Map.Entry
assert answer.key == 3
assert answer.value == 6
- answer = map.find{ k, v -> k == 2 }
+ answer = map.find { k, v -> k == 2 }
assert answer instanceof Map.Entry
assert answer.key == 2
assert answer.value == 4
}
void testMapFindResult() {
- def oneThroughFourMap = [a: 1, b: 2, c: 3, d: 4]
+ def oneThroughFourMap = [a: 1, b: 2, c: 3, d: 4]
assert "I found c:3" == oneThroughFourMap.findResult { entry ->
if (entry.value > 2) return "I found ${entry.key}:${entry.value}"
@@ -141,7 +139,7 @@ class ClosureMethodTest extends GroovyTestCase {
if (value > 2) return "I found ${key}:${value}"
}
- assert false == oneThroughFourMap.findResult {
+ assert false == oneThroughFourMap.findResult {
if (it.value > 2) return false // a result of false is a valid result
}
@@ -156,14 +154,14 @@ class ClosureMethodTest extends GroovyTestCase {
void testListFindAll() {
def list = [20, 5, 40, 2]
- def answer = list.findAll{item -> item < 10 }
+ def answer = list.findAll { item -> item < 10 }
assert answer.size() == 2
assert answer == [5, 2]
}
void testMapFindAll() {
- def map = [1:2, 2:4, 3:6, 4:8]
- def answer = map.findAll{ entry -> entry.value > 5 }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ def answer = map.findAll { entry -> entry.value > 5 }
assert answer.size() == 2
def keys = answer.collect { entry -> entry.key }
def values = answer.collect { entry -> entry.value }
@@ -176,44 +174,44 @@ class ClosureMethodTest extends GroovyTestCase {
void testMapEach() {
def count = 0
- def map = [1:2, 2:4, 3:6, 4:8]
- map.each{e-> count = count + e.value }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ map.each { e -> count = count + e.value }
assert count == 20
- map.each{e-> count = count + e.value + e.key }
+ map.each { e -> count = count + e.value + e.key }
assert count == 50
}
void testMapEachWith2Params() {
def count = 0
- def map = [1:2, 2:4, 3:6, 4:8]
- map.each {key, value -> count = count + value }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ map.each { key, value -> count = count + value }
assert count == 20
- map.each {key, value -> count = count + value + key }
+ map.each { key, value -> count = count + value + key }
assert count == 50
}
void testListEach() {
def count = 0
def list = [1, 2, 3, 4]
- list.each({item-> count = count + item })
+ list.each({ item -> count = count + item })
assert count == 10
- list.each{item-> count = count + item }
+ list.each { item -> count = count + item }
assert count == 20
}
void testListEvery() {
- assert [1, 2, 3, 4].every {i-> return i < 5 }
- assert [1, 2, 7, 4].every {i-> i < 5 } == false
- assert [a:1, b:2, c:3].every {k,v -> k < 'd' && v < 4 }
- assert ![a:1, b:2, c:3].every {k,v -> k < 'd' && v < 3 }
+ assert [1, 2, 3, 4].every { i -> return i < 5 }
+ assert [1, 2, 7, 4].every { i -> i < 5 } == false
+ assert [a: 1, b: 2, c: 3].every { k, v -> k < 'd' && v < 4 }
+ assert ![a: 1, b: 2, c: 3].every { k, v -> k < 'd' && v < 3 }
}
void testListAny() {
- assert [1, 2, 3, 4].any {i-> return i < 5 }
- assert [1, 2, 3, 4].any {i-> i > 3 }
- assert [1, 2, 3, 4].any {i-> i > 5 } == false
- assert [a:1, b:2, c:3].any { k,v -> k == 'c' }
- def isThereAFourValue = [a:1, b:2, c:3].any{ k,v -> v == 4 }
+ assert [1, 2, 3, 4].any { i -> return i < 5 }
+ assert [1, 2, 3, 4].any { i -> i > 3 }
+ assert [1, 2, 3, 4].any { i -> i > 5 } == false
+ assert [a: 1, b: 2, c: 3].any { k, v -> k == 'c' }
+ def isThereAFourValue = [a: 1, b: 2, c: 3].any { k, v -> v == 4 }
assert !isThereAFourValue
}
@@ -238,24 +236,24 @@ class ClosureMethodTest extends GroovyTestCase {
void testOneArgListInject() {
// Check basic functionality
- def value = [ 1, 2, 3 ].inject { c, item -> c + item }
+ def value = [1, 2, 3].inject { c, item -> c + item }
assert value == 6
// Check a use-case
- value = [ [ 'tim', 'dave', 'chris' ],
- [ 'stuart', 'harry', 'tim' ],
- [ 'bert', 'tim', 'ernie' ] ]
- assert value.inject { a, b -> a.intersect( b ) } == ['tim']
+ value = [['tim', 'dave', 'chris'],
+ ['stuart', 'harry', 'tim'],
+ ['bert', 'tim', 'ernie']]
+ assert value.inject { a, b -> a.intersect(b) } == ['tim']
// Check edges
try {
[].inject { a, b -> a + b } == null
- fail( "inject(Closure) on an emtpy list should throw a NoSuchElementException" )
+ fail("inject(Closure) on an emtpy list should throw a NoSuchElementException")
}
- catch ( NoSuchElementException e ) {
+ catch (NoSuchElementException e) {
}
- assert [ 1 ].inject { a, b -> a + b } == 1
- assert [ 1, 2 ].inject { a, b -> a + b } == 3
+ assert [1].inject { a, b -> a + b } == 1
+ assert [1, 2].inject { a, b -> a + b } == 3
}
void testOneArgObjectInject() {
@@ -264,28 +262,28 @@ class ClosureMethodTest extends GroovyTestCase {
try {
([] as Object[]).inject { c, item -> c + item }
- fail( "inject(Closure) on an emtpy Object[] should throw a NoSuchElementException" )
+ fail("inject(Closure) on an emtpy Object[] should throw a NoSuchElementException")
}
- catch ( NoSuchElementException e ) {
+ catch (NoSuchElementException e) {
}
- value = ([ 1 ] as Object[]).inject { c, item -> c + item }
+ value = ([1] as Object[]).inject { c, item -> c + item }
assert value == 1
def i = 1
- def iter = [ hasNext:{ -> i < 5 }, next:{ -> i++ } ] as Iterator
+ def iter = [hasNext: { -> i < 5 }, next: { -> i++ }] as Iterator
assert iter.inject { a, b -> a * b } == 24
try {
- iter = [ hasNext:{ -> false }, next:{ -> null } ] as Iterator
+ iter = [hasNext: { -> false }, next: { -> null }] as Iterator
iter.inject { a, b -> a * b }
- fail( "inject(Closure) on an exhaused iterator should throw a NoSuchElementException" )
+ fail("inject(Closure) on an exhaused iterator should throw a NoSuchElementException")
}
- catch ( NoSuchElementException e ) {
+ catch (NoSuchElementException e) {
}
i = 1
- iter = [ hasNext:{ -> i <= 1 }, next:{ -> i++ } ] as Iterator
+ iter = [hasNext: { -> i <= 1 }, next: { -> i++ }] as Iterator
assert iter.inject { a, b -> a * b } == 1
}
@@ -295,34 +293,34 @@ class ClosureMethodTest extends GroovyTestCase {
def checkEqual = { int a, b -> assert a == b; a }
def sum = DGM.&sum
def addThreeWays = [
- items.sum(),
- items.inject(0, sum),
- items.inject(sum)
+ items.sum(),
+ items.inject(0, sum),
+ items.inject(sum)
]
assert addThreeWays == [1234] * 3
addThreeWays.inject(checkEqual)
def addTwiceFourWays = [
- items.inject(0){ int acc, next -> acc + twice(next) },
- items.collect(twice).sum(),
- items.collect(twice).inject(0, sum),
- items.collect(twice).inject(sum)
+ items.inject(0) { int acc, next -> acc + twice(next) },
+ items.collect(twice).sum(),
+ items.collect(twice).inject(0, sum),
+ items.collect(twice).inject(sum)
]
assert addTwiceFourWays == [2468] * 4
addTwiceFourWays.inject(checkEqual)
}
void testObjectInject() {
- def value = [1:1, 2:2, 3:3].inject('counting: ') { str, item -> str + item.value }
+ def value = [1: 1, 2: 2, 3: 3].inject('counting: ') { str, item -> str + item.value }
assert value == "counting: 123"
- value = [1:1, 2:2, 3:3].inject(0) { c, item -> c + item.value }
+ value = [1: 1, 2: 2, 3: 3].inject(0) { c, item -> c + item.value }
assert value == 6
}
void testIteratorInject() {
- def value = [1:1, 2:2, 3:3].iterator().inject('counting: ') { str, item -> str + item.value }
+ def value = [1: 1, 2: 2, 3: 3].iterator().inject('counting: ') { str, item -> str + item.value }
assert value == "counting: 123"
- value = [1:1, 2:2, 3:3].iterator().inject(0) { c, item -> c + item.value }
+ value = [1: 1, 2: 2, 3: 3].iterator().inject(0) { c, item -> c + item.value }
assert value == 6
}
@@ -344,7 +342,7 @@ class ClosureMethodTest extends GroovyTestCase {
}
assert answer == ['hello', 'there', 'how', 'are', 'you']
}
-
+
void testUpto() {
def answer = []
1.upto(5) { answer.add(it) }
diff --git a/src/test/groovy/ClosureMethodsOnFileTest.groovy b/src/test/groovy/ClosureMethodsOnFileTest.groovy
index ca54a11..0d6f90f 100644
--- a/src/test/groovy/ClosureMethodsOnFileTest.groovy
+++ b/src/test/groovy/ClosureMethodsOnFileTest.groovy
@@ -18,20 +18,18 @@
*/
package groovy
-/**
+/**
* Tests various Closure methods in Groovy on file
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ClosureMethodsOnFileTest extends GroovyTestCase {
private File file = new File("src/test/groovy/Bar.groovy")
private File dir = new File("src/test/groovy")
protected void setUp() {
- if(!file.exists()) {
+ if (!file.exists()) {
file = new File("Bar.groovy")
}
- if(!dir.exists()) {
+ if (!dir.exists()) {
dir = new File(".")
}
}
diff --git a/src/test/groovy/ClosureMissingMethodTest.groovy b/src/test/groovy/ClosureMissingMethodTest.groovy
index f058b94..bb97eed 100644
--- a/src/test/groovy/ClosureMissingMethodTest.groovy
+++ b/src/test/groovy/ClosureMissingMethodTest.groovy
@@ -18,14 +18,11 @@
*/
package groovy
-/**
- * @author Danno Ferrin
- */
class ClosureMissingMethodTest extends GroovyTestCase {
- void testInScript() {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
+ void testInScript() {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
int count = 0
foo = {
@@ -47,31 +44,31 @@ class ClosureMissingMethodTest extends GroovyTestCase {
assert count == 1
}
""");
- }
+ }
- void testInMethod() {
- int count = 0
+ void testInMethod() {
+ int count = 0
- def foo = {
- count++
- bar()
- }
- def baz = {
- foo()
- }
+ def foo = {
+ count++
+ bar()
+ }
+ def baz = {
+ foo()
+ }
- try {
- baz()
- fail()
- } catch (MissingMethodException mme) {
- assert mme.method == 'bar'
- assert count == 1
- }
- }
+ try {
+ baz()
+ fail()
+ } catch (MissingMethodException mme) {
+ assert mme.method == 'bar'
+ assert count == 1
+ }
+ }
- void testWithMetaClassInScript() {
- GroovyShell shell = new GroovyShell()
- shell.evaluate("""
+ void testWithMetaClassInScript() {
+ GroovyShell shell = new GroovyShell()
+ shell.evaluate("""
int count = 0
foo = {
@@ -96,28 +93,28 @@ class ClosureMissingMethodTest extends GroovyTestCase {
assert count == 1
}
""");
- }
+ }
- void testWithMetaClassInMethod() {
- int count = 0
+ void testWithMetaClassInMethod() {
+ int count = 0
- def foo = {
- count++
- bar()
- }
- def baz = {
- foo()
- }
- MetaClass mc = new ExpandoMetaClass(baz.getClass())
- mc.initialize()
- baz.metaClass = mc
+ def foo = {
+ count++
+ bar()
+ }
+ def baz = {
+ foo()
+ }
+ MetaClass mc = new ExpandoMetaClass(baz.getClass())
+ mc.initialize()
+ baz.metaClass = mc
- try {
- baz()
- fail()
- } catch (MissingMethodException mme) {
- assert mme.method == 'bar'
- assert count == 1
- }
- }
+ try {
+ baz()
+ fail()
+ } catch (MissingMethodException mme) {
+ assert mme.method == 'bar'
+ assert count == 1
+ }
+ }
}
diff --git a/src/test/groovy/ClosureReturnTest.groovy b/src/test/groovy/ClosureReturnTest.groovy
index b07ee17..3842e56 100644
--- a/src/test/groovy/ClosureReturnTest.groovy
+++ b/src/test/groovy/ClosureReturnTest.groovy
@@ -18,15 +18,13 @@
*/
package groovy
-/**
+/**
* Tests Closures in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ClosureReturnTest extends GroovyTestCase {
void testReturnValues() {
- def block = {x-> return x > 5}
+ def block = { x -> return x > 5 }
def value = block.call(10)
assert value
@@ -36,15 +34,15 @@ class ClosureReturnTest extends GroovyTestCase {
}
void testReturnValueUsingFunction() {
- def block = {x-> return someFunction(x) }
-
+ def block = { x -> return someFunction(x) }
+
def value = block.call(10)
assert value
value = block.call(3)
assert value == false
}
-
+
def someFunction(x) {
return x > 5
}
diff --git a/src/test/groovy/ClosureTest.groovy b/src/test/groovy/ClosureTest.groovy
index c36d10a..b4d9607 100644
--- a/src/test/groovy/ClosureTest.groovy
+++ b/src/test/groovy/ClosureTest.groovy
@@ -22,10 +22,8 @@ import org.codehaus.groovy.control.MultipleCompilationErrorsException
import static groovy.lang.Closure.IDENTITY
-/**
+/**
* Tests Closures in Groovy
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ClosureTest extends GroovyTestCase {
@@ -34,18 +32,18 @@ class ClosureTest extends GroovyTestCase {
void testSimpleBlockCall() {
count = 0
- def block = {owner-> owner.incrementCallCount() }
+ def block = { owner -> owner.incrementCallCount() }
assertClosure(block)
assert count == 1
- assertClosure({owner-> owner.incrementCallCount() })
+ assertClosure({ owner -> owner.incrementCallCount() })
assert count == 2
}
void testVariableLengthParameterList() {
- def c1 = {Object[] args -> args.each{count += it}}
+ def c1 = { Object[] args -> args.each { count += it } }
count = 0
c1(1, 2, 3)
@@ -59,7 +57,7 @@ class ClosureTest extends GroovyTestCase {
c1([1, 2, 3] as Object[])
assert count == 6
- def c2 = {a, Object[] args -> count += a; args.each{count += it}}
+ def c2 = { a, Object[] args -> count += a; args.each { count += it } }
count = 0
c2(1, 2, 3)
@@ -77,13 +75,13 @@ class ClosureTest extends GroovyTestCase {
void testBlockAsParameter() {
count = 0
- callBlock(5, {owner-> owner.incrementCallCount() })
+ callBlock(5, { owner -> owner.incrementCallCount() })
assert count == 6
- callBlock2(5, {owner-> owner.incrementCallCount() })
+ callBlock2(5, { owner -> owner.incrementCallCount() })
assert count == 12
}
-
+
void testMethodClosure() {
def block = this.&incrementCallCount
@@ -97,7 +95,7 @@ class ClosureTest extends GroovyTestCase {
assert block.call(3, 7) == 3
}
-
+
def incrementCallCount() {
//System.out.println("invoked increment method!")
count = count + 1
@@ -109,13 +107,13 @@ class ClosureTest extends GroovyTestCase {
}
protected void callBlock(Integer num, Closure block) {
- for ( i in 0..num ) {
+ for (i in 0..num) {
block.call(this)
}
}
protected void callBlock2(num, block) {
- for ( i in 0..num ) {
+ for (i in 0..num) {
block.call(this)
}
}
@@ -138,7 +136,7 @@ class ClosureTest extends GroovyTestCase {
void testWithIndex() {
def str = ''
def sum = 0
- ['a','b','c','d'].eachWithIndex { item, index -> str += item; sum += index }
+ ['a', 'b', 'c', 'd'].eachWithIndex { item, index -> str += item; sum += index }
assert str == 'abcd' && sum == 6
}
@@ -146,7 +144,7 @@ class ClosureTest extends GroovyTestCase {
def keyStr = ''
def valStr = ''
def sum = 0
- ['a':'z','b':'y','c':'x','d':'w'].eachWithIndex { entry, index ->
+ ['a': 'z', 'b': 'y', 'c': 'x', 'd': 'w'].eachWithIndex { entry, index ->
keyStr += entry.key
valStr += entry.value
sum += index
@@ -158,7 +156,7 @@ class ClosureTest extends GroovyTestCase {
def keyStr = ''
def valStr = ''
def sum = 0
- ['a':'z','b':'y','c':'x','d':'w'].eachWithIndex { k, v, index ->
+ ['a': 'z', 'b': 'y', 'c': 'x', 'd': 'w'].eachWithIndex { k, v, index ->
keyStr += k
valStr += v
sum += index
@@ -167,9 +165,9 @@ class ClosureTest extends GroovyTestCase {
}
/**
- * Test access to Closure's properties
- * cf GROOVY-2089
- */
+ * Test access to Closure's properties
+ * cf GROOVY-2089
+ */
void testGetProperties() {
def c = { println it }
@@ -211,14 +209,14 @@ class ClosureTest extends GroovyTestCase {
// like in testGetProperties(), don't know how to test metaClass property
}
-
+
/**
* GROOVY-2150 ensure list call is available on closure
*/
void testCallClosureWithlist() {
- def list = [1,2]
- def cl = {a,b->a+b }
- assert cl(list)==3
+ def list = [1, 2]
+ def cl = { a, b -> a + b }
+ assert cl(list) == 3
}
/**
@@ -245,7 +243,7 @@ class ClosureTest extends GroovyTestCase {
def items = [0, 1, 2, '', 'foo', [], ['bar'], true, false]
assert items.grep(IDENTITY) == [1, 2, 'foo', ['bar'], true]
assert items.findAll(IDENTITY) == [1, 2, 'foo', ['bar'], true]
- assert items.grep(IDENTITY).groupBy(IDENTITY) == [1:[1], 2:[2], 'foo':['foo'], ['bar']:[['bar']], (true):[true]]
+ assert items.grep(IDENTITY).groupBy(IDENTITY) == [1: [1], 2: [2], 'foo': ['foo'], ['bar']: [['bar']], (true): [true]]
assert items.collect(IDENTITY) == items
def twice = { it + it }
@@ -259,21 +257,21 @@ class ClosureTest extends GroovyTestCase {
def foo = IDENTITY.rcurry('foo')
assert foo() == 'foo'
- def map = [a:1, b:2]
+ def map = [a: 1, b: 2]
assert map.collectEntries(IDENTITY) == map
}
-
+
void testEachWithArray() {
def l = []
l << ([1, 2] as Object[])
l.each {
- assert it == [1,2] as Object[]
+ assert it == [1, 2] as Object[]
}
}
void testClosureDehydrateAndRehydrate() {
def closure = { 'Hello' }
- assert closure.delegate !=null
+ assert closure.delegate != null
assert closure.owner != null
assert closure.thisObject != null
assert closure() == 'Hello'
diff --git a/src/test/groovy/ClosureUsingOuterVariablesTest.groovy b/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
index b1c4108..3aa87a5 100644
--- a/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
+++ b/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
@@ -18,16 +18,13 @@
*/
package groovy
-/**
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- */
class ClosureUsingOuterVariablesTest extends GroovyTestCase {
-
+
void testUseOfOuterVariable() {
-
+
def x = 123
def y = "hello"
-
+
def closure = { i ->
assert x == 123
assert y == 'hello'
@@ -36,27 +33,27 @@ class ClosureUsingOuterVariablesTest extends GroovyTestCase {
closure.call(321)
}
- /*
- TODO: is this a valid test case?
- void testInnerVariablesVisibleInOuterScope() {
-
- closure = { z = 456 }
- closure.call(321)
-
- assert z == 456
- }
- */
-
+ /*
+ TODO: is this a valid test case?
+ void testInnerVariablesVisibleInOuterScope() {
+
+ closure = { z = 456 }
+ closure.call(321)
+
+ assert z == 456
+ }
+ */
+
void testModifyingOuterVariable() {
-
+
def m = 123
-
- def closure = { m = 456 }
+
+ def closure = { m = 456 }
closure.call(321)
-
+
assert m == 456
}
-
+
void testCounting() {
def sum = 0
@@ -64,15 +61,15 @@ class ClosureUsingOuterVariablesTest extends GroovyTestCase {
assert sum == 10
}
-
+
void testExampleUseOfClosureScopes() {
def a = 123
def b
def c = { b = a + it }
c(5)
-
+
assert b == a + 5
- }
+ }
void testExampleUseOfClosureScopesUsingEach() {
def a = 123
diff --git a/src/test/groovy/ClosureWithDefaultParamTest.groovy b/src/test/groovy/ClosureWithDefaultParamTest.groovy
index dd293d6..567e5c3 100644
--- a/src/test/groovy/ClosureWithDefaultParamTest.groovy
+++ b/src/test/groovy/ClosureWithDefaultParamTest.groovy
@@ -18,14 +18,12 @@
*/
package groovy
-/**
+/**
* Demonstrates the use of the default named parameter in a closure
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ClosureWithDefaultParamTest extends GroovyTestCase {
- void methodWithDefaultParam(example='default'){
+ void methodWithDefaultParam(example = 'default') {
assert 'default' == example
}
@@ -34,18 +32,18 @@ class ClosureWithDefaultParamTest extends GroovyTestCase {
def answer = list.collect { it * 2 }
assert answer.size() == 4
-
+
def expected = [2, 4, 6, 8]
assert answer == expected
}
void testMapCollect() {
- def map = [1:2, 2:4, 3:6, 4:8]
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
def answer = map.collect { it.key + it.value }
-
+
// lest sort the results since maps are in hash code order
answer = answer.sort()
-
+
assert answer.size() == 4
assert answer == [3, 6, 9, 12]
assert answer.get(0) == 3
@@ -56,45 +54,45 @@ class ClosureWithDefaultParamTest extends GroovyTestCase {
void testListFind() {
def list = ["a", "b", "c"]
- def answer = list.find {it == "b" }
+ def answer = list.find { it == "b" }
assert answer == "b"
-
- answer = list.find {it == "z" }
+
+ answer = list.find { it == "z" }
assert answer == null
}
-
+
void testMapFind() {
- def map = [1:2, 2:4, 3:6, 4:8]
- def answer = map.find {it.value == 6 }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ def answer = map.find { it.value == 6 }
assert answer != null
assert answer.key == 3
assert answer.value == 6
-
- answer = map.find {it.value == 0 }
+
+ answer = map.find { it.value == 0 }
assert answer == null
}
void testListFindAll() {
def list = [20, 5, 40, 2]
- def answer = list.findAll {it < 10 }
+ def answer = list.findAll { it < 10 }
assert answer.size() == 2
assert answer == [5, 2]
}
-
+
void testMapFindAll() {
- def map = [1:2, 2:4, 3:6, 4:8]
- def answer = map.findAll {it.value > 5 }
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
+ def answer = map.findAll { it.value > 5 }
assert answer.size() == 2
-
- def keys = answer.collect {it.key }
- def values = answer.collect {it.value }
+
+ def keys = answer.collect { it.key }
+ def values = answer.collect { it.value }
// maps are in hash order so lets sort the results
- keys.sort()
- values.sort()
-
+ keys.sort()
+ values.sort()
+
assert keys == [3, 4]
assert values == [6, 8]
}
@@ -104,23 +102,23 @@ class ClosureWithDefaultParamTest extends GroovyTestCase {
def list = [1, 2, 3, 4]
list.each { count = count + it }
-
+
assert count == 10
list.each { count = count + it }
-
+
assert count == 20
}
void testMapEach() {
def count = 0
- def map = [1:2, 2:4, 3:6, 4:8]
+ def map = [1: 2, 2: 4, 3: 6, 4: 8]
map.each { count = count + it.value }
assert count == 20
}
-
+
void testListEvery() {
assert [1, 2, 3, 4].every { it < 5 }
assert [1, 2, 7, 4].every { it < 5 } == false
@@ -131,32 +129,32 @@ class ClosureWithDefaultParamTest extends GroovyTestCase {
assert [1, 2, 3, 4].any { it > 3 }
assert [1, 2, 3, 4].any { it > 5 } == false
}
-
+
void testJoin() {
def value = [1, 2, 3].join('-')
assert value == "1-2-3"
}
-
+
void testListReverse() {
def value = [1, 2, 3, 4].reverse()
assert value == [4, 3, 2, 1]
}
-
+
void testEachLine() {
def file = new File("src/test/groovy/Bar.groovy")
-
+
file.eachLine { assert it != null }
}
-
+
void testReadLines() {
def file = new File("src/test/groovy/Bar.groovy")
def lines = file.readLines()
-
+
assert lines != null
assert lines.size() > 0
}
-
+
void testEachFile() {
def file = new File("src/test/groovy")
diff --git a/src/test/groovy/ClosureWithEmptyParametersTest.groovy b/src/test/groovy/ClosureWithEmptyParametersTest.groovy
index c65a677..ab14a84 100644
--- a/src/test/groovy/ClosureWithEmptyParametersTest.groovy
+++ b/src/test/groovy/ClosureWithEmptyParametersTest.groovy
@@ -18,14 +18,11 @@
*/
package groovy
-/**
- * @author <a href="mailto:jstrachan@protique.com">James Strachan</a>
- */
class ClosureWithEmptyParametersTest extends GroovyTestCase {
void testNoParams() {
- def block = {-> }
+ def block = { -> }
block.call()
}
diff --git a/src/test/groovy/DummyMethodsGroovy.groovy b/src/test/groovy/DummyMethodsGroovy.groovy
index 49698a2..040e281 100644
--- a/src/test/groovy/DummyMethodsGroovy.groovy
+++ b/src/test/groovy/DummyMethodsGroovy.groovy
@@ -21,9 +21,6 @@ package groovy
/**
* Methods with specific parameters (e.g. primitives)
* for use with groovy tests.
- *
- * @author <a href="mailto:jeremy.rayner@bigfoot.com">Jeremy Rayner</a>
- *
*/
class DummyMethodsGroovy {
static void main(String[] args) {
diff --git a/src/test/groovy/ExceptionInClosureTest.groovy b/src/test/groovy/ExceptionInClosureTest.groovy
index 56caef0..42c2690 100644
--- a/src/test/groovy/ExceptionInClosureTest.groovy
+++ b/src/test/groovy/ExceptionInClosureTest.groovy
@@ -18,24 +18,21 @@
*/
package groovy
-/**
+/**
* Tests exception handling inside of a closure
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
class ExceptionInClosureTest extends GroovyTestCase {
void testCallingOfFailedClosure() {
def closure = { it -> it.foo() }
-
+
try {
closure.call("cheese")
-
fail("Should have thrown an exception by now")
}
catch (MissingMethodException e) {
- assert e.method == "foo"
- assert e.type == String
+ assert e.method == "foo"
+ assert e.type == String
}
}
}