[groovy] branch master updated (0cc2bd6 -> f034f99)

classic Classic list List threaded Threaded
34 messages Options
1234
Reply | Threaded
Open this post in threaded view
|

[groovy] branch master updated (0cc2bd6 -> f034f99)

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    from 0cc2bd6  GROOVY-9100: add missing methods
     new b375fa2  Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - rename source-file to temp
     new a168aa5  Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - rename file to target-name
     new fb59f5e  Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - resolve conflict and keep both files
     new dbe4b07  Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - restore name of source-file
     new 2a03697  Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - rename source-file to temp
     new 37b62b2  Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - rename file to target-name
     new 9974fcb  Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - resolve conflict and keep both files
     new e7acc34  Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - restore name of source-file
     new 1bda1f3  Split history main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy to main/groovy/groovy/test - rename source-file to temp
     new 59ebcf1  Split history main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy to main/groovy/groovy/test - rename file to target-name
     new 523e850  Split history main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy to main/groovy/groovy/test - resolve conflict and keep both files
     new a389643  Split history main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy to main/groovy/groovy/test - restore name of source-file
     new 3c035b3  Split history main/groovy/groovy/util/JavadocAssertionTestSuite.groovy to main/groovy/groovy/test - rename source-file to temp
     new 99150bb  Split history main/groovy/groovy/util/JavadocAssertionTestSuite.groovy to main/groovy/groovy/test - rename file to target-name
     new c9221c3  Split history main/groovy/groovy/util/JavadocAssertionTestSuite.groovy to main/groovy/groovy/test - resolve conflict and keep both files
     new 84d8707  Split history main/groovy/groovy/util/JavadocAssertionTestSuite.groovy to main/groovy/groovy/test - restore name of source-file
     new be7af7c  Split history main/groovy/groovy/util/StringTestUtil.groovy to main/groovy/groovy/test - rename source-file to temp
     new 92d1e16  Split history main/groovy/groovy/util/StringTestUtil.groovy to main/groovy/groovy/test - rename file to target-name
     new e79b0d7  Split history main/groovy/groovy/util/StringTestUtil.groovy to main/groovy/groovy/test - resolve conflict and keep both files
     new 6c6436f  Split history main/groovy/groovy/util/StringTestUtil.groovy to main/groovy/groovy/test - restore name of source-file
     new a92b791  Split history main/java/groovy/util/AllTestSuite.java to main/java/groovy/test - rename source-file to temp
     new 085060b  Split history main/java/groovy/util/AllTestSuite.java to main/java/groovy/test - rename file to target-name
     new 93fba7e  Split history main/java/groovy/util/AllTestSuite.java to main/java/groovy/test - resolve conflict and keep both files
     new 2e279e5  Split history main/java/groovy/util/AllTestSuite.java to main/java/groovy/test - restore name of source-file
     new 75d8e36  Split history main/java/groovy/util/GroovyTestSuite.java to main/java/groovy/test - rename source-file to temp
     new c5d2afd  Split history main/java/groovy/util/GroovyTestSuite.java to main/java/groovy/test - rename file to target-name
     new 139c741  Split history main/java/groovy/util/GroovyTestSuite.java to main/java/groovy/test - resolve conflict and keep both files
     new 3923da8  Split history main/java/groovy/util/GroovyTestSuite.java to main/java/groovy/test - restore name of source-file
     new ee82c23  Split history main/java/groovy/util/GroovyTestCase.java to main/java/groovy/test - rename source-file to temp
     new ff053aa  Split history main/java/groovy/util/GroovyTestCase.java to main/java/groovy/test - rename file to target-name
     new b8627e0  Split history main/java/groovy/util/GroovyTestCase.java to main/java/groovy/test - resolve conflict and keep both files
     new 5d4db0c  Split history main/java/groovy/util/GroovyTestCase.java to main/java/groovy/test - restore name of source-file
     new f034f99  GROOVY-8647: Split package renaming (groovy-test GroovyTestCase and friends)

The 33 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:
 .../groovy-json/src/spec/test/json/JsonBuilderTest.groovy |  2 ++
 .../groovy-json/src/spec/test/json/JsonTest.groovy        |  1 +
 .../src/spec/test/json/StreamingJsonBuilderTest.groovy    |  2 ++
 .../src/test/groovy/groovy/json/CharBufTest.groovy        |  1 +
 .../groovy/groovy/json/CustomJsonGeneratorTest.groovy     |  1 +
 .../groovy/groovy/json/DefaultJsonGeneratorTest.groovy    |  2 ++
 .../groovy-json/src/test/groovy/groovy/json/IOTest.groovy |  1 +
 .../src/test/groovy/groovy/json/JsonBuilderTest.groovy    |  2 ++
 .../src/test/groovy/groovy/json/JsonLexerTest.groovy      | 14 ++++++++++++--
 .../src/test/groovy/groovy/json/JsonOutputTest.groovy     |  5 +++--
 .../src/test/groovy/groovy/json/JsonSlurperTest.groovy    |  1 +
 .../src/test/groovy/groovy/json/JsonTokenTypeTest.groovy  | 15 ++++++++++++++-
 .../src/test/groovy/groovy/json/JsonTokenValueTest.groovy |  9 ++++++++-
 .../test/groovy/groovy/json/RealJsonPayloadsTest.groovy   |  2 ++
 .../groovy/groovy/json/StreamingJsonBuilderTest.groovy    |  1 +
 .../groovy/json/DefaultFastStringServiceTest.groovy       |  2 ++
 .../org/apache/groovy/json/internal/ArrayUtilsTest.groovy |  2 ++
 .../apache/groovy/json/internal/CharScannerTest.groovy    |  2 ++
 .../groovy/org/apache/groovy/json/internal/ChrTest.groovy |  2 ++
 .../org/apache/groovy/json/internal/DatesTest.groovy      |  2 ++
 .../org/apache/groovy/json/internal/LazyMapTest.groovy    |  2 ++
 .../groovy/json/internal/ReaderCharacterSourceTest.groovy |  1 +
 .../src/main/groovy/groovy/lang/GroovyLogTestCase.groovy  |  1 +
 .../groovy/groovy/{lang => test}/GroovyLogTestCase.groovy | 12 +++++-------
 .../groovy/{util => test}/GroovyShellTestCase.groovy      |  2 +-
 .../{util => test}/JavadocAssertionTestBuilder.groovy     |  2 +-
 .../{util => test}/JavadocAssertionTestSuite.groovy       |  2 +-
 .../groovy/groovy/{util => test}/StringTestUtil.groovy    |  2 +-
 .../main/groovy/groovy/util/GroovyShellTestCase.groovy    |  2 ++
 .../groovy/groovy/util/JavadocAssertionTestBuilder.groovy |  1 +
 .../groovy/groovy/util/JavadocAssertionTestSuite.groovy   |  1 +
 .../src/main/groovy/groovy/util/StringTestUtil.groovy     |  1 +
 .../src/main/java/groovy/{util => test}/AllTestSuite.java |  3 ++-
 .../main/java/groovy/{util => test}/GroovyTestCase.java   |  2 +-
 .../main/java/groovy/{util => test}/GroovyTestSuite.java  |  2 +-
 .../src/main/java/groovy/util/AllTestSuite.java           |  1 +
 .../src/main/java/groovy/util/GroovyTestCase.java         |  1 +
 .../src/main/java/groovy/util/GroovyTestSuite.java        |  2 +-
 .../groovy/groovy/{util => test}/AllTestSuiteTest.groovy  |  8 ++++----
 .../groovy/{lang => test}/GroovyLogTestCaseTest.groovy    |  2 +-
 .../groovy/{ => groovy/test}/GroovyTestCaseTest.groovy    |  2 ++
 .../suite/ATestScriptThatsNoTestCase.groovy               |  0
 42 files changed, 95 insertions(+), 26 deletions(-)
 copy subprojects/groovy-test/src/main/groovy/groovy/{lang => test}/GroovyLogTestCase.groovy (89%)
 copy subprojects/groovy-test/src/main/groovy/groovy/{util => test}/GroovyShellTestCase.groovy (99%)
 copy subprojects/groovy-test/src/main/groovy/groovy/{util => test}/JavadocAssertionTestBuilder.groovy (99%)
 copy subprojects/groovy-test/src/main/groovy/groovy/{util => test}/JavadocAssertionTestSuite.groovy (99%)
 copy subprojects/groovy-test/src/main/groovy/groovy/{util => test}/StringTestUtil.groovy (98%)
 copy subprojects/groovy-test/src/main/java/groovy/{util => test}/AllTestSuite.java (99%)
 copy subprojects/groovy-test/src/main/java/groovy/{util => test}/GroovyTestCase.java (99%)
 copy subprojects/groovy-test/src/main/java/groovy/{util => test}/GroovyTestSuite.java (99%)
 rename subprojects/groovy-test/src/test/groovy/groovy/{util => test}/AllTestSuiteTest.groovy (91%)
 rename subprojects/groovy-test/src/test/groovy/groovy/{lang => test}/GroovyLogTestCaseTest.groovy (98%)
 rename subprojects/groovy-test/src/test/groovy/{ => groovy/test}/GroovyTestCaseTest.groovy (99%)
 rename subprojects/groovy-test/src/test/groovy/groovy/{util => test}/suite/ATestScriptThatsNoTestCase.groovy (100%)

Reply | Threaded
Open this post in threaded view
|

[groovy] 01/33: Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - rename file to target-name

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit a168aa5977f620581b75be2d6fa65fade7651eee
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:14 2019 +1000

    Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - rename file to target-name
---
 .../src/main/groovy/groovy/{lang => test}/GroovyLogTestCase.groovy        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyLogTestCase.groovy
similarity index 100%
rename from subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/test/GroovyLogTestCase.groovy

Reply | Threaded
Open this post in threaded view
|

[groovy] 02/33: Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - rename source-file to temp

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit b375fa28a5211b528c625f0ab31c690ea55d52a6
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:14 2019 +1000

    Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - rename source-file to temp
---
 .../src/{main/groovy/groovy/lang/GroovyLogTestCase.groovy => temp}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy b/subprojects/groovy-test/src/temp
similarity index 100%
rename from subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
rename to subprojects/groovy-test/src/temp

Reply | Threaded
Open this post in threaded view
|

[groovy] 03/33: Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - resolve conflict and keep both files

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit fb59f5e57144fb12705b95504f2bbd62bb4f46d8
Merge: b375fa2 a168aa5
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:15 2019 +1000

    Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - resolve conflict and keep both files

 .../groovy/groovy/test/GroovyLogTestCase.groovy    | 85 ++++++++++++++++++++++
 1 file changed, 85 insertions(+)

Reply | Threaded
Open this post in threaded view
|

[groovy] 04/33: Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - restore name of source-file

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit dbe4b07d6ae4532633c9c6721eb78550bfcd83b9
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:15 2019 +1000

    Split history main/groovy/groovy/lang/GroovyLogTestCase.groovy to main/groovy/groovy/test - restore name of source-file
---
 .../src/{temp => main/groovy/groovy/lang/GroovyLogTestCase.groovy}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/temp b/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
similarity index 100%
rename from subprojects/groovy-test/src/temp
rename to subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy

Reply | Threaded
Open this post in threaded view
|

[groovy] 05/33: Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - rename file to target-name

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 37b62b2c4c9c8a278dd59296390f164184c542e6
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:42 2019 +1000

    Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - rename file to target-name
---
 .../src/main/groovy/groovy/{util => test}/GroovyShellTestCase.groovy      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/GroovyShellTestCase.groovy
similarity index 100%
rename from subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/test/GroovyShellTestCase.groovy

Reply | Threaded
Open this post in threaded view
|

[groovy] 06/33: Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - rename source-file to temp

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 2a03697ff7b1e02e1d2e62d99f2accc4d6cd60e3
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:43 2019 +1000

    Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - rename source-file to temp
---
 .../src/{main/groovy/groovy/util/GroovyShellTestCase.groovy => temp}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy b/subprojects/groovy-test/src/temp
similarity index 100%
rename from subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy
rename to subprojects/groovy-test/src/temp

Reply | Threaded
Open this post in threaded view
|

[groovy] 07/33: Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - resolve conflict and keep both files

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 9974fcb16c8b840835931f9eb0997984f7fda888
Merge: 2a03697 37b62b2
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:43 2019 +1000

    Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - resolve conflict and keep both files

 .../groovy/groovy/test/GroovyShellTestCase.groovy  | 81 ++++++++++++++++++++++
 1 file changed, 81 insertions(+)

Reply | Threaded
Open this post in threaded view
|

[groovy] 08/33: Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - restore name of source-file

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit e7acc34d163447bc91a0de796fa014255a7a35f0
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:39:43 2019 +1000

    Split history main/groovy/groovy/util/GroovyShellTestCase.groovy to main/groovy/groovy/test - restore name of source-file
---
 .../src/{temp => main/groovy/groovy/util/GroovyShellTestCase.groovy}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/temp b/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy
similarity index 100%
rename from subprojects/groovy-test/src/temp
rename to subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy

Reply | Threaded
Open this post in threaded view
|

[groovy] 09/33: Split history main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy to main/groovy/groovy/test - rename file to target-name

paulk
In reply to this post by paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 59ebcf108273b5caaa9d24f646579530b132fc6a
Author: Paul King <[hidden email]>
AuthorDate: Thu May 16 14:40:08 2019 +1000

    Split history main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy to main/groovy/groovy/test - rename file to target-name
---
 .../main/groovy/groovy/{util => test}/JavadocAssertionTestBuilder.groovy  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy b/subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy
similarity index 100%
rename from subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/test/JavadocAssertionTestBuilder.groovy

1234