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

matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 669e03973f1c2e91591a2f9fcc2bddd120568716
Merge: e8dcd40 6ffe4da
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Thu Nov 15 13:56:54 2018 +0100

    Merge pull request #948 from svenreimers/NETBEANS-1294
    
    [NETBEANS-1294] Fix failing unit tests in groovy.editor.

 ...evels1.groovy.testBasicAccessLevels1.completion |  2 +
 ...Closure1.groovy.testInsideClosure1_1.completion | 29 ++++++--------
 ...Closure1.groovy.testInsideClosure1_3.completion |  2 -
 ...Closure1.groovy.testInsideClosure1_7.completion |  2 +-
 ...llections1.groovy.testCollections1_3.completion |  1 +
 ...llections1.groovy.testCollections1_5.completion | 34 ++++++++++------
 ...nstructors4.groovy.testConstructors4.completion |  1 -
 ...nstructors5.groovy.testConstructors5.completion |  1 -
 ...nstructors7.groovy.testConstructors7.completion |  1 -
 ...nstructors8.groovy.testConstructors8.completion |  1 -
 .../b/B.groovy.testDuplicates1.completion          |  2 -
 ...osure1.groovy.testDataSourceClosure1.completion |  3 ++
 .../Inference1.groovy.testInference1.completion    |  1 +
 ...n1.groovy.testInterfaceCompletion1_1.completion |  2 +
 ....groovy.testCompletionGroovyClass1_1.completion |  2 +
 ....groovy.testCompletionGroovySuper1_1.completion |  2 +
 ...y.testCompletionInsideConstructor1_3.completion |  4 --
 ...r1.groovy.testCompletionInsideFor1_1.completion |  4 --
 ...r1.groovy.testCompletionInsideFor1_2.completion |  5 +++
 ...NoDot1.groovy.testCompletionNoDot1_2.completion |  3 --
 ...NoDot1.groovy.testCompletionNoDot1_3.completion |  1 +
 ...groovy.testCompletionNoPrefixString1.completion | 15 ++++++-
 ...groovy.testCompletionNoPrefixString2.completion | 15 ++++++-
 .../Methods1.groovy.testMethods1_4.completion      |  4 ++
 .../Methods2.groovy.testMethods2_1.completion      |  2 +
 ...structor.groovy.testEmptyConstructor.completion | 29 ++++++--------
 ....testFewParamsConstructor_AfterComma.completion | 28 ++++++-------
 ...amsConstructor_InsideNamedParameter1.completion |  2 -
 ...amsConstructor_InsideNamedParameter2.completion | 28 ++++++-------
 ...perator1.groovy.testElvisOperator1_1.completion |  1 +
 ...perator2.groovy.testElvisOperator2_1.completion |  1 +
 ...perator3.groovy.testElvisOperator3_1.completion |  1 +
 ...Closure1.groovy.testMethodClosure1_3.completion |  1 +
 ...gation1.groovy.testSafeNavigation1_3.completion |  1 +
 ....testSpreadOperator1_stringArray_all.completion | 15 ++++++-
 ...tSpreadOperator2_stringArray_sPrefix.completion |  1 +
 ...ovy.testSpreadOperator3_intArray_all.completion |  4 +-
 ...oovy.testAfterExtendsTypeCompletion1.completion | 30 ++++++--------
 ...oovy.testAfterExtendsTypeCompletion4.completion |  4 +-
 ...ion2.groovy.testFieldTypeCompletion2.completion |  4 +-
 ...ovy.testLocalVariableTypeCompletion2.completion |  4 +-
 ...1.groovy.testSingleton1_withInPrefix.completion |  2 +-
 ....groovy.testSingleton3_withoutPrefix.completion |  4 +-
 .../fqnTypeCompletion1/FqnTypeCompletion1.groovy   |  2 +-
 ...etion1.groovy.testFqnTypeCompletion1.completion | 25 ++++--------
 ...mpletion3.groovy.testTypeCompletion3.completion |  1 -
 ...mpletion4.groovy.testTypeCompletion4.completion |  1 -
 .../Variables1.groovy.testVariables1_3.completion  |  2 -
 .../editor/api/completion/GroovyCCTestBase.java    | 10 +++++
 .../groovy/editor/api/completion/TypesCCTest.java  |  2 +-
 .../parser/GroovyVirtualSourceProviderTest.java    | 46 +++++++++++-----------
 .../groovy/editor/imports/FastImportTest.java      | 16 ++++----
 .../groovy/editor/imports/ImportUtilsTest.java     |  1 -
 .../modules/groovy/editor/test/GroovyTestBase.java |  2 +-
 54 files changed, 212 insertions(+), 195 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to