Repository: groovy Updated Branches: refs/heads/master 67f2d4cb9 -> 858a6fd2e
http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy b/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy index 1724073..8cfc987 100644 --- a/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy +++ b/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy @@ -28,8 +28,6 @@ class SubscriptOnStringArrayBug extends TestSupport { array[0] = "d" assert array[0] == "d" - - println("Contents of array are ${array.inspect()}") } void testRobsTestCase() { http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy b/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy index 803d389c..aef4531 100644 --- a/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy +++ b/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy @@ -31,21 +31,14 @@ class SynchronizedBytecodeBug extends GroovyTestCase { Integer foo = 0 Thread.start{ - println "sleeping for a moment" sleep 100 - println "slept and synchronizing from thread" synchronized(foo) { - println "notifying" foo.notify() - println "notified" } } - println "synchronizing" synchronized(foo) { - println "starting to wait" foo.wait() - println "waited" } // if this point is reached, the test worked :-) http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/bugs/TestSupport.java ---------------------------------------------------------------------- diff --git a/src/test/groovy/bugs/TestSupport.java b/src/test/groovy/bugs/TestSupport.java index 401ac28..b2d2cfa 100644 --- a/src/test/groovy/bugs/TestSupport.java +++ b/src/test/groovy/bugs/TestSupport.java @@ -49,8 +49,6 @@ public abstract class TestSupport extends GroovyTestCase { } public Iterator iterator() { - System.out.println("Calling custom iterator() method for " + this); - return Arrays.asList(getMockArguments()).iterator(); } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/bugs/ToStringBug.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/bugs/ToStringBug.groovy b/src/test/groovy/bugs/ToStringBug.groovy index 096834d..3330f7b 100644 --- a/src/test/groovy/bugs/ToStringBug.groovy +++ b/src/test/groovy/bugs/ToStringBug.groovy @@ -23,13 +23,8 @@ package groovy.bugs class ToStringBug extends GroovyTestCase { void testBug() { - println "Starting test" - def value = toString() assert value != null - - println value - println "Found value ${value}" } String toString() { http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/execute/ExecuteTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/execute/ExecuteTest.groovy b/src/test/groovy/execute/ExecuteTest.groovy index 5cb3abb..8d29f15 100644 --- a/src/test/groovy/execute/ExecuteTest.groovy +++ b/src/test/groovy/execute/ExecuteTest.groovy @@ -33,42 +33,36 @@ class ExecuteTest extends GroovyTestCase { } void testExecuteCommandLineProcessUsingAString() { - println "Executing String command: $cmd" StringBuffer sbout = new StringBuffer() StringBuffer sberr = new StringBuffer() def process = cmd.execute() process.waitForProcessOutput sbout, sberr def value = process.exitValue() int count = sbout.toString().readLines().size() - println "Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" assert count > 1 assert value == 0 } void testExecuteCommandLineProcessUsingAStringArray() { def cmdArray = cmd.split(' ') - println "Executing String[] command: $cmdArray" StringBuffer sbout = new StringBuffer() StringBuffer sberr = new StringBuffer() def process = cmdArray.execute() process.waitForProcessOutput sbout, sberr def value = process.exitValue() int count = sbout.toString().readLines().size() - println "Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" assert count > 1 assert value == 0 } void testExecuteCommandLineProcessUsingAList() { List<String> cmdList = Arrays.asList(cmd.split(' ')) - println "Executing List<String> command: $cmdList" StringBuffer sbout = new StringBuffer() StringBuffer sberr = new StringBuffer() def process = cmdList.execute() process.waitForProcessOutput sbout, sberr def value = process.exitValue() int count = sbout.toString().readLines().size() - println "Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" assert count > 1 assert value == 0 } @@ -91,9 +85,6 @@ class ExecuteTest extends GroovyTestCase { terr.join() def value = process.exitValue() int count = sbout.toString().readLines().size() - println "Heaps of time case: Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" - System.err.println 'std err: ' + sberr.toString() - System.err.println 'std out: ' + sbout.toString() // assert sbout.toString().contains('Done'), "Expected 'Done' but found: " + sbout.toString() + " with error: " + sberr.toString() assert value == 0 @@ -108,20 +99,17 @@ class ExecuteTest extends GroovyTestCase { terr.join() value = process.exitValue() count = sbout.toString().readLines().size() - println "Insufficient time case: Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" assert !sbout.toString().contains('Done') assert value != 0 // should have been killed } void testExecuteCommandLineUnderWorkingDirectory() { - println "Executing command in dir '..': $cmd" StringBuffer sbout = new StringBuffer() StringBuffer sberr = new StringBuffer() def process = cmd.execute(null, new File('..')) process.waitForProcessOutput sbout, sberr def value = process.exitValue() int count = sbout.toString().readLines().size() - println "Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" assert count > 1 assert value == 0 } @@ -135,14 +123,12 @@ class ExecuteTest extends GroovyTestCase { "println(System.getenv('foo'))"] println "Executing this command:\n${java.join(' ')}" def props = ["foo=bar"] - println "With these props: $props" StringBuffer sbout = new StringBuffer() StringBuffer sberr = new StringBuffer() def process = java.execute(props, null) process.waitForProcessOutput sbout, sberr def value = process.exitValue() int count = sbout.toString().readLines().size() - println "Exit value: $value, Err lines: ${sberr.toString().readLines().size()}, Out lines: $count" assert sbout.toString().contains('bar') assert value == 0 } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/lang/ClassReloadingTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/lang/ClassReloadingTest.groovy b/src/test/groovy/lang/ClassReloadingTest.groovy index 488ef46..197d637 100644 --- a/src/test/groovy/lang/ClassReloadingTest.groovy +++ b/src/test/groovy/lang/ClassReloadingTest.groovy @@ -125,7 +125,6 @@ class ClassReloadingTest extends GroovyTestCase { } """ def groovyClass = cl.loadClass(className, true, false) - println System.identityHashCode(groovyClass) assert !groovyClass.declaredFields.any { it.name.contains('__timeStamp') } def message = groovyClass.newInstance().greeting assert "hello" == message @@ -148,7 +147,6 @@ class ClassReloadingTest extends GroovyTestCase { // reload groovyClass = cl.loadClass(className, true, false) - println System.identityHashCode(groovyClass) assert groovyClass.declaredFields.any { it.name.contains('__timeStamp') } message = groovyClass.newInstance().greeting assert "goodbye" == message http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/groovy/lang/ExpandoMetaClassTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/groovy/lang/ExpandoMetaClassTest.groovy b/src/test/groovy/lang/ExpandoMetaClassTest.groovy index 8d22593..7451127 100644 --- a/src/test/groovy/lang/ExpandoMetaClassTest.groovy +++ b/src/test/groovy/lang/ExpandoMetaClassTest.groovy @@ -566,7 +566,6 @@ class ExpandoMetaClassTest extends GroovyTestCase { } void testBorrowByName() { - println 'testBorrowByName' def metaClass = new ExpandoMetaClass(EMCT_Class.class) def a = new EMCT_Another() http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java b/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java index ffa8b79..b634eb1 100644 --- a/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java +++ b/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java @@ -38,7 +38,7 @@ public class MethodFailureTest extends GroovyTestCase { fail("Should have thrown an exception"); } catch (GroovyRuntimeException e) { - System.out.println(e); + // expected } } @@ -50,8 +50,7 @@ public class MethodFailureTest extends GroovyTestCase { fail("Should have thrown an exception"); } catch (GroovyRuntimeException e) { - System.out.println(e); - //e.printStackTrace(); + // expected } } @@ -67,8 +66,7 @@ public class MethodFailureTest extends GroovyTestCase { fail("Should have thrown an exception"); } catch (GroovyRuntimeException e) { - System.out.println(e); - //e.printStackTrace(); + // expected } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java b/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java index 6d2e3e1..a68c965 100644 --- a/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java +++ b/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java @@ -49,15 +49,11 @@ public class NewStaticMetaMethodTest extends TestCase { Object answer = metaMethod.invoke("abc", new Object[]{"123"}); assertEquals("abc123", answer); - - System.out.println("Found: " + answer); } public void testInvokeDefaultGroovyMethodUsingMetaClass() { Object answer = InvokerHelper.invokeMethod("abc", "plus", new Object[]{"123"}); assertEquals("abc123", answer); - - System.out.println("Found: " + answer); } public static String dummyMethod(String foo, String bar) throws Exception { http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/runtime/PropertyTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/PropertyTest.java b/src/test/org/codehaus/groovy/runtime/PropertyTest.java index c36748a..f5c0127 100644 --- a/src/test/org/codehaus/groovy/runtime/PropertyTest.java +++ b/src/test/org/codehaus/groovy/runtime/PropertyTest.java @@ -161,7 +161,6 @@ public class PropertyTest extends GroovyTestCase { Process process = ProcessGroovyMethods.execute(java); Object value = InvokerHelper.getProperty(process, "in"); assertNotNull(value); - System.out.println("Found in: " + value); process.destroy(); } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/runtime/StaticInitTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/StaticInitTest.java b/src/test/org/codehaus/groovy/runtime/StaticInitTest.java index 88d6216..0fb7ee9 100644 --- a/src/test/org/codehaus/groovy/runtime/StaticInitTest.java +++ b/src/test/org/codehaus/groovy/runtime/StaticInitTest.java @@ -29,7 +29,6 @@ class X { static { StaticInitTest.failed = true; - System.out.println("INIT"); } } @@ -38,12 +37,9 @@ public class StaticInitTest extends TestCase { static boolean failed; public void testInitOrder () throws NoSuchFieldException, IllegalAccessException, ClassNotFoundException { - System.out.println("GET FIELD"); final Field f = new GroovyClassLoader().loadClass("org.codehaus.groovy.runtime.X", false, false, false).getField("field"); - System.out.println(failed); assertTrue(!failed); f.getInt(null); - System.out.println(failed); assertTrue(failed); } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/TestDgmConverter.java ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/TestDgmConverter.java b/src/test/org/codehaus/groovy/tools/TestDgmConverter.java index 659a72b..575ed03 100644 --- a/src/test/org/codehaus/groovy/tools/TestDgmConverter.java +++ b/src/test/org/codehaus/groovy/tools/TestDgmConverter.java @@ -47,8 +47,6 @@ public class TestDgmConverter extends TestCase { File file = files[i]; final String name = file.getName(); if (name.startsWith("dgm$")) { - System.out.println(name); - final String className = "org.codehaus.groovy.runtime." + name.substring(0, name.length() - ".class".length()); try { Class cls = Class.forName(className, false, DefaultGroovyMethods.class.getClassLoader()); @@ -72,9 +70,6 @@ public class TestDgmConverter extends TestCase { public void testRegistry () { final MetaClassRegistryImpl metaClassRegistry = new MetaClassRegistryImpl(); final Object [] instanceMethods = metaClassRegistry.getInstanceMethods().getArray(); - for (int i = 0; i < instanceMethods.length; i++) { - System.out.println(instanceMethods[i]); - - } + assertTrue(instanceMethods.length > 0); } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy index 9e0cbd2..34be79d 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy @@ -27,7 +27,6 @@ package org.codehaus.groovy.tools.stubgenerator class AnnotationMemberValuesResolutionV1StubsTest extends StringSourcesStubTestCase { Map<String, String> provideSources() { - println 'AnnotationMemberValuesResolutionStubsTestV1' [ 'foo/Foo4434V1.java': ''' package foo; http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy index 3726c93..2eb26a2 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy @@ -26,7 +26,6 @@ package org.codehaus.groovy.tools.stubgenerator class AnnotationMemberValuesResolutionV2StubsTest extends StringSourcesStubTestCase { Map<String, String> provideSources() { - println 'AnnotationMemberValuesResolutionStubsTestV2' [ 'foo/Foo4434V2.java': ''' package foo; http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy index c27f9f7..e823fc9 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy @@ -26,7 +26,6 @@ package org.codehaus.groovy.tools.stubgenerator class AnnotationMemberValuesResolutionV3StubsTest extends StringSourcesStubTestCase { Map<String, String> provideSources() { - println 'AnnotationMemberValuesResolutionStubsTestV3' [ 'foo/Foo4434V3.java': ''' package foo; http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy index 2497790..c5e171f 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy @@ -55,6 +55,5 @@ class DuplicateMethodAdditionInStubsTest extends StringSourcesStubTestCase { void verifyStubs() { assert classes.size() == 2 assert classes['de.app.User4453'].methods['setName'].size() == 2 - println 'DuplicateMethodAdditionInStubsTest - verified' } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy index 29cb0a1..9d49391 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy @@ -36,7 +36,6 @@ class TaggedsMap extends Groovy5859Support { @Override void verifyStubs() { def stubSource = stubJavaSourceFor('TaggedsMap') - println stubSource assert stubSource.contains('super ((java.util.SortedMap)null);') } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy index ec751ef..f5d3a88 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy @@ -47,7 +47,5 @@ class StubGenerationForAnAnnotationStubsTest extends StringSourcesStubTestCase { String annotationClassSource = stubJavaSourceFor('Foo4451') assert annotationClassSource.contains('public @interface Foo4451') assert !annotationClassSource.contains('java.lang.annotation.Annotation') - - println 'StubGenerationForAnAnnotationStubsTest - verified' } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy index b5cf57f..90ec613 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy @@ -26,7 +26,6 @@ package org.codehaus.groovy.tools.stubgenerator class StubGenerationForConstructorWithOptionalArgsStubsTest extends StringSourcesStubTestCase { Map<String, String> provideSources() { - println 'StubGenerationForConstructorWithOptionalArgsStubsTest' [ 'Base4508.java': ''' class Base4508 { http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy index 372362d..42ae1c1 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy @@ -50,6 +50,5 @@ class UnAmbigousSuperConstructorCallStubsTest extends StringSourcesStubTestCase assert classes['UserAuthException'] != null String stubSource = stubJavaSourceFor('UserAuthException') assert !stubSource.contains('super (null)') - println 'UnAmbigousSuperConstructorCallStubsTest - verified' } } http://git-wip-us.apache.org/repos/asf/groovy/blob/858a6fd2/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy index 0710bc1..073559a 100644 --- a/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy +++ b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy @@ -28,8 +28,6 @@ class Groovy249_Bug extends GroovyTestCase { void testBug() { def t = new Bean249() t.b = "hello" - println t.b - println "test: ${t.b}" def xml = new MarkupBuilder() def root = xml.foo {
