You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/11/15 12:56:56 UTC
[GitHub] matthiasblaesing closed pull request #948: [NETBEANS-1294] Fix
failing unit tests in groovy.editor.
matthiasblaesing closed pull request #948: [NETBEANS-1294] Fix failing unit tests in groovy.editor.
URL: https://github.com/apache/incubator-netbeans/pull/948
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
index 978d2123ef..8e9d3c558c 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
@@ -72,6 +72,7 @@ METHOD sleep(long, Closure) void
METHOD split(Closure) Collection
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
+METHOD tap(Closure) Object
METHOD test() [PUBLIC] Object
METHOD toString() [PUBLIC] String
METHOD use(Class, Closure) Object
@@ -81,5 +82,6 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD class [PUBLIC] Class
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion
index a5aae53ddf..af95ccfde3 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_1.completion
@@ -7,6 +7,7 @@ PACKAGE groovy null
PACKAGE groovyjarjarantlr null
PACKAGE groovyjarjarasm null
PACKAGE groovyjarjarcommonscli null
+PACKAGE groovyjarjarpicocli null
PACKAGE java null
PACKAGE javax null
PACKAGE jdk null
@@ -22,8 +23,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
@@ -44,6 +43,7 @@ CLASS BitSet null
CLASS Boolean null
CLASS BootstrapMethodError null
CLASS BufferedInputStream null
+CLASS BufferedIterator null
CLASS BufferedOutputStream null
CLASS BufferedReader null
CLASS BufferedWriter null
@@ -69,7 +69,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
@@ -141,7 +140,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
@@ -170,24 +168,18 @@ CLASS GrabExclude null
CLASS GrabResolver null
CLASS Grapes null
CLASS GregorianCalendar null
-CLASS GroovyAssert null
CLASS GroovyCallable null
CLASS GroovyClassLoader null
CLASS GroovyCodeSource null
CLASS GroovyCollections null
CLASS GroovyInterceptable null
-CLASS GroovyLogTestCase null
-CLASS GroovyMBean null
CLASS GroovyObject null
CLASS GroovyObjectSupport null
CLASS GroovyResourceLoader null
CLASS GroovyRuntimeException null
CLASS GroovyScriptEngine null
CLASS GroovyShell null
-CLASS GroovyShellTestCase null
CLASS GroovySystem null
-CLASS GroovyTestCase null
-CLASS GroovyTestSuite null
CLASS HashMap null
CLASS HashSet null
CLASS Hashtable null
@@ -242,8 +234,6 @@ CLASS InvalidPropertiesFormatExcepti null
CLASS Iterable null
CLASS Iterator null
CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
CLASS Lazy null
CLASS LineNumberInputStream null
CLASS LineNumberReader null
@@ -307,6 +297,7 @@ CLASS NotSerializableException null
CLASS NullPointerException null
CLASS Number null
CLASS NumberFormatException null
+CLASS NumberRange null
CLASS Object null
CLASS ObjectGraphBuilder null
CLASS ObjectInput null
@@ -325,7 +316,6 @@ CLASS ObservableList null
CLASS ObservableMap null
CLASS ObservableSet null
CLASS Observer null
-CLASS OptionAccessor null
CLASS Optional null
CLASS OptionalDataException null
CLASS OptionalDouble null
@@ -433,7 +423,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
@@ -453,7 +442,15 @@ CLASS TracingInterceptor null
CLASS TreeMap null
CLASS TreeSet null
CLASS Tuple null
+CLASS Tuple1 null
CLASS Tuple2 null
+CLASS Tuple3 null
+CLASS Tuple4 null
+CLASS Tuple5 null
+CLASS Tuple6 null
+CLASS Tuple7 null
+CLASS Tuple8 null
+CLASS Tuple9 null
CLASS TypeNotPresentException null
CLASS URI null
CLASS URISyntaxException null
@@ -485,11 +482,9 @@ CLASS WeakHashMap null
CLASS Writable null
CLASS WriteAbortedException null
CLASS Writer null
-CLASS XmlNodePrinter null
-CLASS XmlParser null
-CLASS XmlSlurper null
FIELD binding [PUBLIC] Binding
FIELD class [PUBLIC] Class
+FIELD defaultMetaClass [PRIVATE] MetaClass
VARIABLE it Object
KEYWORD assert null
KEYWORD boolean null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion
index b2d47b897c..72cc7d90f0 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_3.completion
@@ -11,8 +11,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion
index 85b6beee3f..53ad5d1d41 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/closures/insideClosure1/InsideClosure1.groovy.testInsideClosure1_7.completion
@@ -52,4 +52,4 @@ CLASS Iterator null
KEYWORD if null
KEYWORD in null
KEYWORD instanceof null
-KEYWORD int null
+KEYWORD int null
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion
index b60aad6866..3a98426625 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_3.completion
@@ -19,3 +19,4 @@ METHOD asImmutable() List
METHOD asList() List
METHOD asSynchronized() List
METHOD asType(Class) Object
+METHOD asUnmodifiable() List
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion
index fc14989616..fe698c9293 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/collections/collections1/Collections1.groovy.testCollections1_5.completion
@@ -19,6 +19,9 @@ METHOD asImmutable() List
METHOD asList() List
METHOD asSynchronized() List
METHOD asType(Class) Object
+METHOD asUnmodifiable() List
+METHOD bufferedIterator() BufferedIterator
+METHOD chop(int[]) List
METHOD clear() [PUBLIC] void
METHOD collate(int) List
METHOD collate(int, boolean) List
@@ -37,7 +40,7 @@ METHOD collectNested(Closure) List
METHOD collectNested(Collection, Clos Collection
METHOD combinations() List
METHOD combinations(Closure) List
-METHOD contains(Object) boolean
+METHOD contains(Object) [PUBLIC] boolean
METHOD containsAll(Collection<?>) [PUBLIC] boolean
METHOD containsAll(Object[]) boolean
METHOD containsWithinBounds(Object) [PUBLIC] boolean
@@ -45,7 +48,7 @@ METHOD count(Closure) Number
METHOD count(Object) Number
METHOD countBy(Closure) Map
METHOD disjoint(Iterable) boolean
-METHOD drop(int) Collection
+METHOD drop(int) List
METHOD dropRight(int) List
METHOD dropWhile(Closure) List
METHOD dump() String
@@ -104,11 +107,14 @@ METHOD indexOf(Object) [PUBLIC] int
METHOD indexed() Map
METHOD indexed(int) Map
METHOD init() List
+METHOD inits() List
METHOD inject(Closure) Object
METHOD inject(Object, Closure) Object
METHOD inspect() [PUBLIC] String
METHOD intersect(Collection) Collection
-METHOD intersect(Iterable) Collection
+METHOD intersect(Collection, Comparat Collection
+METHOD intersect(Iterable) List
+METHOD intersect(Iterable, Comparator List
METHOD invokeMethod(String, Object) Object
METHOD is(Object) boolean
METHOD isCase(Object) boolean
@@ -129,9 +135,9 @@ METHOD min() Object
METHOD min(Closure) Object
METHOD min(Comparator) Object
METHOD minus(Collection) List
-METHOD minus(Iterable) Collection
+METHOD minus(Iterable) List
METHOD minus(Object) List
-METHOD multiply(Number) Collection
+METHOD multiply(Number) List
METHOD notify() [PUBLIC] void
METHOD notifyAll() [PUBLIC] void
METHOD parallelStream() [PUBLIC] Stream<E>
@@ -168,6 +174,7 @@ METHOD removeAll(Object[]) boolean
METHOD removeAt(int) Object
METHOD removeElement(Object) boolean
METHOD removeIf(Predicate<? super E>) [PUBLIC] boolean
+METHOD removeLast() Object
METHOD replaceAll(UnaryOperator<E>) [PUBLIC] void
METHOD respondsTo(String) List
METHOD respondsTo(String, Object) List
@@ -179,7 +186,7 @@ METHOD reverse(boolean) List
METHOD reverseEach(Closure) List
METHOD set(int, E) [PUBLIC] E
METHOD setMetaClass(MetaClass) void
-METHOD size() int
+METHOD size() [PUBLIC] int
METHOD sleep(long) void
METHOD sleep(long, Closure) void
METHOD sort() List
@@ -202,10 +209,12 @@ METHOD sum(Closure) Object
METHOD sum(Object) Object
METHOD sum(Object, Closure) Object
METHOD swap(int, int) List
-METHOD tail() Collection
+METHOD tail() List
+METHOD tails() List
METHOD take(int) List
-METHOD takeRight(int) Collection
+METHOD takeRight(int) List
METHOD takeWhile(Closure) List
+METHOD tap(Closure) Object
METHOD toArray() [PUBLIC] Object[]
METHOD toArray(T[]) [PUBLIC] T[]
METHOD toList() List
@@ -218,7 +227,7 @@ METHOD toSorted(Comparator) List
METHOD toSpreadMap() SpreadMap
METHOD toString() String
METHOD toUnique() List
-METHOD toUnique(Closure) Collection
+METHOD toUnique(Closure) List
METHOD toUnique(Comparator) List
METHOD transpose() List
METHOD unique() List
@@ -234,11 +243,12 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
-METHOD withDefault(Closure) List
-METHOD withEagerDefault(Closure) List
+METHOD with(boolean, Closure) Object
+METHOD withDefault(Closure) ListWithDefault
+METHOD withEagerDefault(Closure) ListWithDefault
METHOD withIndex() List
METHOD withIndex(int) List
-METHOD withLazyDefault(Closure) List
+METHOD withLazyDefault(Closure) ListWithDefault
METHOD withTraits(Class[]) Object
FIELD empty [PUBLIC] boolean
FIELD from [PUBLIC] Comparable
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion
index 5cc0825360..3ece3d5307 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors4/Constructors4.groovy.testConstructors4.completion
@@ -10,7 +10,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion
index 5c781678c0..1644af3e42 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors5/Constructors5.groovy.testConstructors5.completion
@@ -11,7 +11,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion
index 6a18a48362..0c25ce4d68 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors7/Constructors7.groovy.testConstructors7.completion
@@ -24,7 +24,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion
index afed219121..e1ae7b029d 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/constructors/constructors8/Constructors8.groovy.testConstructors8.completion
@@ -24,7 +24,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion
index 22b05b4816..7d7b0cdc60 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion
@@ -12,8 +12,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion
index 8e983ff6df..3368399681 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/grails/dataSourceClosure1/DataSourceClosure1.groovy.testDataSourceClosure1.completion
@@ -97,6 +97,7 @@ METHOD sleep(long, Closure) void
METHOD split(Closure) Collection
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
+METHOD tap(Closure) Object
METHOD toString() String
METHOD trampoline() [PUBLIC] Closure<V>
METHOD trampoline(Object[]) [PUBLIC] Closure<V>
@@ -107,6 +108,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD DELEGATE_FIRST [STATIC, int
FIELD DELEGATE_ONLY [STATIC, int
@@ -117,6 +119,7 @@ FIELD OWNER_ONLY [STATIC, int
FIELD SKIP [STATIC, int
FIELD TO_SELF [STATIC, int
FIELD class [PUBLIC] Class
+FIELD defaultMetaClass [PRIVATE] MetaClass
FIELD delegate [PUBLIC] Object
FIELD directive [PUBLIC] int
FIELD maximumNumberOfParameters [PUBLIC] int
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion
index a5e6ded98c..b83ea06b83 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion
@@ -16,3 +16,4 @@ METHOD asImmutable() Set
METHOD asList() List
METHOD asSynchronized() Set
METHOD asType(Class) Object
+METHOD asUnmodifiable() Set
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion
index 94fa2ed7aa..0a1d8f75fa 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/interface/interfaceCompletion1/InterfaceCompletion1.groovy.testInterfaceCompletion1_1.completion
@@ -7,6 +7,7 @@ PACKAGE groovy null
PACKAGE groovyjarjarantlr null
PACKAGE groovyjarjarasm null
PACKAGE groovyjarjarcommonscli null
+PACKAGE groovyjarjarpicocli null
PACKAGE java null
PACKAGE javax null
PACKAGE jdk null
@@ -16,6 +17,7 @@ PACKAGE sun null
CLASS AdaptingMetaClass null
CLASS Appendable null
CLASS AutoCloseable null
+CLASS BufferedIterator null
CLASS Buildable null
CLASS CharSequence null
CLASS Cloneable null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion
index 41741109eb..068beea069 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovyClass1/CompletionGroovyClass1.groovy.testCompletionGroovyClass1_1.completion
@@ -68,6 +68,7 @@ METHOD sleep(long, Closure) void
METHOD split(Closure) Collection
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
+METHOD tap(Closure) Object
METHOD toString() [PUBLIC] String
METHOD use(Class, Closure) Object
METHOD use(List, Closure) Object
@@ -76,6 +77,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD class [PUBLIC] Class
FIELD x [PRIVATE] String
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion
index e178d07d3a..aefe1fe40a 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionGroovySuper1/CompletionGroovySuper1.groovy.testCompletionGroovySuper1_1.completion
@@ -66,6 +66,7 @@ METHOD sleep(long, Closure) void
METHOD split(Closure) Collection
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
+METHOD tap(Closure) Object
METHOD toString() [PUBLIC] String
METHOD use(Class, Closure) Object
METHOD use(List, Closure) Object
@@ -74,5 +75,6 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD class [PUBLIC] Class
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion
index 2a2a3459c7..eadb61e9aa 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideConstructor1/CompletionInsideConstructor1.groovy.testCompletionInsideConstructor1_3.completion
@@ -3,11 +3,8 @@ if (new File(new Date().get|)) {}
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
METHOD getAt(String) Object
-METHOD getAt(int) int
METHOD getClass() [PUBLIC] Class<?>
METHOD getDate() [PUBLIC] int
-METHOD getDateString() String
-METHOD getDateTimeString() String
METHOD getDay() [PUBLIC] int
METHOD getHours() [PUBLIC] int
METHOD getMetaClass() MetaClass
@@ -17,6 +14,5 @@ METHOD getMonth() [PUBLIC] int
METHOD getProperties() Map
METHOD getSeconds() [PUBLIC] int
METHOD getTime() [PUBLIC] long
-METHOD getTimeString() String
METHOD getTimezoneOffset() [PUBLIC] int
METHOD getYear() [PUBLIC] int
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion
index 6577fc5db8..382daf4afe 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_1.completion
@@ -3,11 +3,8 @@ for(new Date().get|;;) {}
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
METHOD getAt(String) Object
-METHOD getAt(int) int
METHOD getClass() [PUBLIC] Class<?>
METHOD getDate() [PUBLIC] int
-METHOD getDateString() String
-METHOD getDateTimeString() String
METHOD getDay() [PUBLIC] int
METHOD getHours() [PUBLIC] int
METHOD getMetaClass() MetaClass
@@ -17,6 +14,5 @@ METHOD getMonth() [PUBLIC] int
METHOD getProperties() Map
METHOD getSeconds() [PUBLIC] int
METHOD getTime() [PUBLIC] long
-METHOD getTimeString() String
METHOD getTimezoneOffset() [PUBLIC] int
METHOD getYear() [PUBLIC] int
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion
index 2872f7c5b4..2eee575fe6 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionInsideFor1/CompletionInsideFor1.groovy.testCompletionInsideFor1_2.completion
@@ -9,6 +9,7 @@ METHOD asBoolean() boolean
METHOD asImmutable() Map
METHOD asSynchronized() Map
METHOD asType(Class) Object
+METHOD asUnmodifiable() Map
METHOD clear() [PUBLIC] void
METHOD collect() Collection
METHOD collect(Closure) List
@@ -102,11 +103,13 @@ METHOD putAt(String, Object) void
METHOD putIfAbsent(K, V) [PUBLIC] V
METHOD remove(Object) [PUBLIC] V
METHOD remove(Object, Object) [PUBLIC] boolean
+METHOD removeAll(Closure) boolean
METHOD replace(K, V) [PUBLIC] V
METHOD replace(K, V, V) [PUBLIC] boolean
METHOD replaceAll(BiFunction<? super [PUBLIC] void
METHOD respondsTo(String) List
METHOD respondsTo(String, Object) List
+METHOD retainAll(Closure) boolean
METHOD reverseEach(Closure) Map
METHOD setMetaClass(MetaClass) void
METHOD size() [PUBLIC] int
@@ -123,6 +126,7 @@ METHOD subMap(Collection) Map
METHOD subMap(Object[]) Map
METHOD take(int) Map
METHOD takeWhile(Closure) Map
+METHOD tap(Closure) Object
METHOD toMapString() String
METHOD toMapString(int) String
METHOD toSorted() Map
@@ -138,6 +142,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withDefault(Closure) Map
METHOD withTraits(Class[]) Object
FIELD empty [PUBLIC] boolean
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion
index 7ba697f780..3324e589c8 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_2.completion
@@ -2,7 +2,4 @@ Code completion result for source line:
x|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
-CLASS XmlNodePrinter null
-CLASS XmlParser null
-CLASS XmlSlurper null
METHOD x() [PUBLIC] Object
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion
index ea5e46e589..7b4f914c5e 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoDot1/CompletionNoDot1.groovy.testCompletionNoDot1_3.completion
@@ -25,6 +25,7 @@ CLASS NotSerializableException null
CLASS NullPointerException null
CLASS Number null
CLASS NumberFormatException null
+CLASS NumberRange null
METHOD notify() [PUBLIC] void
METHOD notifyAll() [PUBLIC] void
KEYWORD native null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion
index 89ea0fb07c..117c69392e 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString1/CompletionNoPrefixString1.groovy.testCompletionNoPrefixString1.completion
@@ -32,10 +32,12 @@ METHOD copyValueOf(char[]) [STATIC, String
METHOD copyValueOf(char[], int, int) [STATIC, String
METHOD count(CharSequence) int
METHOD decodeBase64() byte[]
+METHOD decodeBase64Url() byte[]
METHOD decodeHex() byte[]
METHOD denormalize() String
+METHOD digest(String) String
METHOD drop(int) CharSequence
-METHOD dropWhile(Closure) CharSequence
+METHOD dropWhile(Closure) String
METHOD dump() String
METHOD each(Closure) Object
METHOD eachLine(Closure) Object
@@ -45,6 +47,7 @@ METHOD eachMatch(Pattern, Closure) String
METHOD eachMatch(String, Closure) String
METHOD eachWithIndex(Closure) Object
METHOD endsWith(String) [PUBLIC] boolean
+METHOD endsWithAny(CharSequence[]) boolean
METHOD equals(Object) [PUBLIC] boolean
METHOD equalsIgnoreCase(String) [PUBLIC] boolean
METHOD every() boolean
@@ -111,6 +114,7 @@ METHOD is(Object) boolean
METHOD isAllWhitespace() boolean
METHOD isBigDecimal() boolean
METHOD isBigInteger() boolean
+METHOD isBlank() boolean
METHOD isCase(Object) boolean
METHOD isDouble() boolean
METHOD isEmpty() [PUBLIC] boolean
@@ -129,6 +133,7 @@ METHOD leftShift(Object) StringBuffer
METHOD length() [PUBLIC] int
METHOD matches(Pattern) boolean
METHOD matches(String) [PUBLIC] boolean
+METHOD md5() String
METHOD metaClass(Closure) MetaClass
METHOD minus(Object) String
METHOD minus(Pattern) String
@@ -158,7 +163,9 @@ METHOD readLines() List
METHOD regionMatches(boolean, int, St [PUBLIC] boolean
METHOD regionMatches(int, String, int [PUBLIC] boolean
METHOD replace(CharSequence, CharSequ [PUBLIC] String
+METHOD replace(Map) String
METHOD replace(char, char) [PUBLIC] String
+METHOD replace(int, Map) String
METHOD replaceAll(CharSequence, CharS String
METHOD replaceAll(CharSequence, Closu String
METHOD replaceAll(Pattern, CharSequen String
@@ -186,6 +193,7 @@ METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
METHOD startsWith(String) [PUBLIC] boolean
METHOD startsWith(String, int) [PUBLIC] boolean
+METHOD startsWithAny(CharSequence[]) boolean
METHOD stripIndent() String
METHOD stripIndent(int) String
METHOD stripMargin() String
@@ -195,7 +203,8 @@ METHOD subSequence(int, int) [PUBLIC] CharSequence
METHOD substring(int) [PUBLIC] String
METHOD substring(int, int) [PUBLIC] String
METHOD take(int) CharSequence
-METHOD takeWhile(Closure) CharSequence
+METHOD takeWhile(Closure) String
+METHOD tap(Closure) Object
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
METHOD toBoolean() Boolean
@@ -220,6 +229,7 @@ METHOD tokenize(CharSequence) List
METHOD tokenize(Character) List
METHOD tr(CharSequence, CharSequence) String
METHOD trim() [PUBLIC] String
+METHOD uncapitalize() String
METHOD unexpand() String
METHOD unexpand(int) String
METHOD unexpandLine(int) String
@@ -239,6 +249,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD CASE_INSENSITIVE_ORDER [STATIC, Comparator<String>
FIELD bytes [PUBLIC] byte[]
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion
index e2d1493e4a..822206d5fb 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/completionNoPrefixString2/CompletionNoPrefixString2.groovy.testCompletionNoPrefixString2.completion
@@ -32,10 +32,12 @@ METHOD copyValueOf(char[]) [STATIC, String
METHOD copyValueOf(char[], int, int) [STATIC, String
METHOD count(CharSequence) int
METHOD decodeBase64() byte[]
+METHOD decodeBase64Url() byte[]
METHOD decodeHex() byte[]
METHOD denormalize() String
+METHOD digest(String) String
METHOD drop(int) CharSequence
-METHOD dropWhile(Closure) CharSequence
+METHOD dropWhile(Closure) String
METHOD dump() String
METHOD each(Closure) Object
METHOD eachLine(Closure) Object
@@ -45,6 +47,7 @@ METHOD eachMatch(Pattern, Closure) String
METHOD eachMatch(String, Closure) String
METHOD eachWithIndex(Closure) Object
METHOD endsWith(String) [PUBLIC] boolean
+METHOD endsWithAny(CharSequence[]) boolean
METHOD equals(Object) [PUBLIC] boolean
METHOD equalsIgnoreCase(String) [PUBLIC] boolean
METHOD every() boolean
@@ -111,6 +114,7 @@ METHOD is(Object) boolean
METHOD isAllWhitespace() boolean
METHOD isBigDecimal() boolean
METHOD isBigInteger() boolean
+METHOD isBlank() boolean
METHOD isCase(Object) boolean
METHOD isDouble() boolean
METHOD isEmpty() [PUBLIC] boolean
@@ -129,6 +133,7 @@ METHOD leftShift(Object) StringBuffer
METHOD length() [PUBLIC] int
METHOD matches(Pattern) boolean
METHOD matches(String) [PUBLIC] boolean
+METHOD md5() String
METHOD metaClass(Closure) MetaClass
METHOD minus(Object) String
METHOD minus(Pattern) String
@@ -158,7 +163,9 @@ METHOD readLines() List
METHOD regionMatches(boolean, int, St [PUBLIC] boolean
METHOD regionMatches(int, String, int [PUBLIC] boolean
METHOD replace(CharSequence, CharSequ [PUBLIC] String
+METHOD replace(Map) String
METHOD replace(char, char) [PUBLIC] String
+METHOD replace(int, Map) String
METHOD replaceAll(CharSequence, CharS String
METHOD replaceAll(CharSequence, Closu String
METHOD replaceAll(Pattern, CharSequen String
@@ -186,6 +193,7 @@ METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
METHOD startsWith(String) [PUBLIC] boolean
METHOD startsWith(String, int) [PUBLIC] boolean
+METHOD startsWithAny(CharSequence[]) boolean
METHOD stripIndent() String
METHOD stripIndent(int) String
METHOD stripMargin() String
@@ -195,7 +203,8 @@ METHOD subSequence(int, int) [PUBLIC] CharSequence
METHOD substring(int) [PUBLIC] String
METHOD substring(int, int) [PUBLIC] String
METHOD take(int) CharSequence
-METHOD takeWhile(Closure) CharSequence
+METHOD takeWhile(Closure) String
+METHOD tap(Closure) Object
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
METHOD toBoolean() Boolean
@@ -220,6 +229,7 @@ METHOD tokenize(CharSequence) List
METHOD tokenize(Character) List
METHOD tr(CharSequence, CharSequence) String
METHOD trim() [PUBLIC] String
+METHOD uncapitalize() String
METHOD unexpand() String
METHOD unexpand(int) String
METHOD unexpandLine(int) String
@@ -239,6 +249,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD CASE_INSENSITIVE_ORDER [STATIC, Comparator<String>
FIELD bytes [PUBLIC] byte[]
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion
index 0b7db0ea88..a18d3ec74b 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods1/Methods1.groovy.testMethods1_4.completion
@@ -109,6 +109,7 @@ METHOD splitEachLine(String, Closure) Object
METHOD splitEachLine(String, String, Object
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
+METHOD tap(Closure) Object
METHOD toExternalForm() [PUBLIC] String
METHOD toString() [PUBLIC] String
METHOD toURI() [PUBLIC] URI
@@ -119,6 +120,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withInputStream(Closure) Object
METHOD withReader(Closure) Object
METHOD withReader(String, Closure) Object
@@ -128,6 +130,7 @@ FIELD authority [PUBLIC] String
FIELD class [PUBLIC] Class
FIELD content [PUBLIC] Object
FIELD defaultPort [PUBLIC] int
+FIELD deserializedFields [PRIVATE] URLStreamHandler
FIELD file [PUBLIC] String
FIELD host [PUBLIC] String
FIELD path [PUBLIC] String
@@ -135,4 +138,5 @@ FIELD port [PUBLIC] int
FIELD protocol [PUBLIC] String
FIELD query [PUBLIC] String
FIELD ref [PUBLIC] String
+FIELD serializedHashCode [PRIVATE] int
FIELD userInfo [PUBLIC] String
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion
index 53462ab0dd..55b57ec1d0 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/method/methods2/Methods2.groovy.testMethods2_1.completion
@@ -104,6 +104,7 @@ METHOD split(Closure) Collection
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
METHOD step(Number, Number, Closure) void
+METHOD tap(Closure) Object
METHOD times(Closure) void
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
@@ -128,6 +129,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
METHOD xor(Number) Number
FIELD BYTES [STATIC, int
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion
index ae3938c8f1..a66fc1d76e 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/emptyConstructor/EmptyConstructor.groovy.testEmptyConstructor.completion
@@ -12,6 +12,7 @@ PACKAGE groovy null
PACKAGE groovyjarjarantlr null
PACKAGE groovyjarjarasm null
PACKAGE groovyjarjarcommonscli null
+PACKAGE groovyjarjarpicocli null
PACKAGE java null
PACKAGE javax null
PACKAGE jdk null
@@ -27,8 +28,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
@@ -50,6 +49,7 @@ CLASS BitSet null
CLASS Boolean null
CLASS BootstrapMethodError null
CLASS BufferedInputStream null
+CLASS BufferedIterator null
CLASS BufferedOutputStream null
CLASS BufferedReader null
CLASS BufferedWriter null
@@ -75,7 +75,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
@@ -148,7 +147,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
@@ -177,24 +175,18 @@ CLASS GrabExclude null
CLASS GrabResolver null
CLASS Grapes null
CLASS GregorianCalendar null
-CLASS GroovyAssert null
CLASS GroovyCallable null
CLASS GroovyClassLoader null
CLASS GroovyCodeSource null
CLASS GroovyCollections null
CLASS GroovyInterceptable null
-CLASS GroovyLogTestCase null
-CLASS GroovyMBean null
CLASS GroovyObject null
CLASS GroovyObjectSupport null
CLASS GroovyResourceLoader null
CLASS GroovyRuntimeException null
CLASS GroovyScriptEngine null
CLASS GroovyShell null
-CLASS GroovyShellTestCase null
CLASS GroovySystem null
-CLASS GroovyTestCase null
-CLASS GroovyTestSuite null
CLASS HashMap null
CLASS HashSet null
CLASS Hashtable null
@@ -248,8 +240,6 @@ CLASS InvalidPropertiesFormatExcepti null
CLASS Iterable null
CLASS Iterator null
CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
CLASS Lazy null
CLASS LineNumberInputStream null
CLASS LineNumberReader null
@@ -313,6 +303,7 @@ CLASS NotSerializableException null
CLASS NullPointerException null
CLASS Number null
CLASS NumberFormatException null
+CLASS NumberRange null
CLASS Object null
CLASS ObjectGraphBuilder null
CLASS ObjectInput null
@@ -331,7 +322,6 @@ CLASS ObservableList null
CLASS ObservableMap null
CLASS ObservableSet null
CLASS Observer null
-CLASS OptionAccessor null
CLASS Optional null
CLASS OptionalDataException null
CLASS OptionalDouble null
@@ -439,7 +429,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
@@ -459,7 +448,15 @@ CLASS TracingInterceptor null
CLASS TreeMap null
CLASS TreeSet null
CLASS Tuple null
+CLASS Tuple1 null
CLASS Tuple2 null
+CLASS Tuple3 null
+CLASS Tuple4 null
+CLASS Tuple5 null
+CLASS Tuple6 null
+CLASS Tuple7 null
+CLASS Tuple8 null
+CLASS Tuple9 null
CLASS TypeNotPresentException null
CLASS URI null
CLASS URISyntaxException null
@@ -491,8 +488,6 @@ CLASS WeakHashMap null
CLASS Writable null
CLASS WriteAbortedException null
CLASS Writer null
-CLASS XmlNodePrinter null
-CLASS XmlParser null
-CLASS XmlSlurper null
FIELD binding [PUBLIC] Binding
FIELD class [PUBLIC] Class
+FIELD defaultMetaClass [PRIVATE] MetaClass
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion
index 02d09d01fa..374a9d84fb 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_AfterComma.completion
@@ -14,8 +14,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
@@ -37,6 +35,7 @@ CLASS BitSet null
CLASS Boolean null
CLASS BootstrapMethodError null
CLASS BufferedInputStream null
+CLASS BufferedIterator null
CLASS BufferedOutputStream null
CLASS BufferedReader null
CLASS BufferedWriter null
@@ -62,7 +61,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
@@ -135,7 +133,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
@@ -164,24 +161,18 @@ CLASS GrabExclude null
CLASS GrabResolver null
CLASS Grapes null
CLASS GregorianCalendar null
-CLASS GroovyAssert null
CLASS GroovyCallable null
CLASS GroovyClassLoader null
CLASS GroovyCodeSource null
CLASS GroovyCollections null
CLASS GroovyInterceptable null
-CLASS GroovyLogTestCase null
-CLASS GroovyMBean null
CLASS GroovyObject null
CLASS GroovyObjectSupport null
CLASS GroovyResourceLoader null
CLASS GroovyRuntimeException null
CLASS GroovyScriptEngine null
CLASS GroovyShell null
-CLASS GroovyShellTestCase null
CLASS GroovySystem null
-CLASS GroovyTestCase null
-CLASS GroovyTestSuite null
CLASS HashMap null
CLASS HashSet null
CLASS Hashtable null
@@ -235,8 +226,6 @@ CLASS InvalidPropertiesFormatExcepti null
CLASS Iterable null
CLASS Iterator null
CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
CLASS Lazy null
CLASS LineNumberInputStream null
CLASS LineNumberReader null
@@ -300,6 +289,7 @@ CLASS NotSerializableException null
CLASS NullPointerException null
CLASS Number null
CLASS NumberFormatException null
+CLASS NumberRange null
CLASS Object null
CLASS ObjectGraphBuilder null
CLASS ObjectInput null
@@ -318,7 +308,6 @@ CLASS ObservableList null
CLASS ObservableMap null
CLASS ObservableSet null
CLASS Observer null
-CLASS OptionAccessor null
CLASS Optional null
CLASS OptionalDataException null
CLASS OptionalDouble null
@@ -426,7 +415,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
@@ -446,7 +434,15 @@ CLASS TracingInterceptor null
CLASS TreeMap null
CLASS TreeSet null
CLASS Tuple null
+CLASS Tuple1 null
CLASS Tuple2 null
+CLASS Tuple3 null
+CLASS Tuple4 null
+CLASS Tuple5 null
+CLASS Tuple6 null
+CLASS Tuple7 null
+CLASS Tuple8 null
+CLASS Tuple9 null
CLASS TypeNotPresentException null
CLASS URI null
CLASS URISyntaxException null
@@ -478,8 +474,6 @@ CLASS WeakHashMap null
CLASS Writable null
CLASS WriteAbortedException null
CLASS Writer null
-CLASS XmlNodePrinter null
-CLASS XmlParser null
-CLASS XmlSlurper null
FIELD binding [PUBLIC] Binding
FIELD class [PUBLIC] Class
+FIELD defaultMetaClass [PRIVATE] MetaClass
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion
index 5f82ae810f..93403a0841 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter1.completion
@@ -12,8 +12,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion
index 6db9717f60..63d22c3877 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/namedparams/fewParamsConstructor/FewParamsConstructor.groovy.testFewParamsConstructor_InsideNamedParameter2.completion
@@ -11,8 +11,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
@@ -34,6 +32,7 @@ CLASS BitSet null
CLASS Boolean null
CLASS BootstrapMethodError null
CLASS BufferedInputStream null
+CLASS BufferedIterator null
CLASS BufferedOutputStream null
CLASS BufferedReader null
CLASS BufferedWriter null
@@ -59,7 +58,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
@@ -132,7 +130,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
@@ -161,24 +158,18 @@ CLASS GrabExclude null
CLASS GrabResolver null
CLASS Grapes null
CLASS GregorianCalendar null
-CLASS GroovyAssert null
CLASS GroovyCallable null
CLASS GroovyClassLoader null
CLASS GroovyCodeSource null
CLASS GroovyCollections null
CLASS GroovyInterceptable null
-CLASS GroovyLogTestCase null
-CLASS GroovyMBean null
CLASS GroovyObject null
CLASS GroovyObjectSupport null
CLASS GroovyResourceLoader null
CLASS GroovyRuntimeException null
CLASS GroovyScriptEngine null
CLASS GroovyShell null
-CLASS GroovyShellTestCase null
CLASS GroovySystem null
-CLASS GroovyTestCase null
-CLASS GroovyTestSuite null
CLASS HashMap null
CLASS HashSet null
CLASS Hashtable null
@@ -232,8 +223,6 @@ CLASS InvalidPropertiesFormatExcepti null
CLASS Iterable null
CLASS Iterator null
CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
CLASS Lazy null
CLASS LineNumberInputStream null
CLASS LineNumberReader null
@@ -297,6 +286,7 @@ CLASS NotSerializableException null
CLASS NullPointerException null
CLASS Number null
CLASS NumberFormatException null
+CLASS NumberRange null
CLASS Object null
CLASS ObjectGraphBuilder null
CLASS ObjectInput null
@@ -315,7 +305,6 @@ CLASS ObservableList null
CLASS ObservableMap null
CLASS ObservableSet null
CLASS Observer null
-CLASS OptionAccessor null
CLASS Optional null
CLASS OptionalDataException null
CLASS OptionalDouble null
@@ -423,7 +412,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
@@ -443,7 +431,15 @@ CLASS TracingInterceptor null
CLASS TreeMap null
CLASS TreeSet null
CLASS Tuple null
+CLASS Tuple1 null
CLASS Tuple2 null
+CLASS Tuple3 null
+CLASS Tuple4 null
+CLASS Tuple5 null
+CLASS Tuple6 null
+CLASS Tuple7 null
+CLASS Tuple8 null
+CLASS Tuple9 null
CLASS TypeNotPresentException null
CLASS URI null
CLASS URISyntaxException null
@@ -475,8 +471,6 @@ CLASS WeakHashMap null
CLASS Writable null
CLASS WriteAbortedException null
CLASS Writer null
-CLASS XmlNodePrinter null
-CLASS XmlParser null
-CLASS XmlSlurper null
FIELD binding [PUBLIC] Binding
FIELD class [PUBLIC] Class
+FIELD defaultMetaClass [PRIVATE] MetaClass
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion
index 3fb6bbf28b..48598b0078 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator1/ElvisOperator1.groovy.testElvisOperator1_1.completion
@@ -10,6 +10,7 @@ METHOD eachMatch(Pattern, Closure) String
METHOD eachMatch(String, Closure) String
METHOD eachWithIndex(Closure) Object
METHOD endsWith(String) [PUBLIC] boolean
+METHOD endsWithAny(CharSequence[]) boolean
METHOD equals(Object) [PUBLIC] boolean
METHOD equalsIgnoreCase(String) [PUBLIC] boolean
METHOD every() boolean
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion
index fc77413ead..e6a045887a 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator2/ElvisOperator2.groovy.testElvisOperator2_1.completion
@@ -10,6 +10,7 @@ METHOD eachMatch(Pattern, Closure) String
METHOD eachMatch(String, Closure) String
METHOD eachWithIndex(Closure) Object
METHOD endsWith(String) [PUBLIC] boolean
+METHOD endsWithAny(CharSequence[]) boolean
METHOD equals(Object) [PUBLIC] boolean
METHOD equalsIgnoreCase(String) [PUBLIC] boolean
METHOD every() boolean
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion
index 20b90335e5..6bacceb210 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/elvisOperator3/ElvisOperator3.groovy.testElvisOperator3_1.completion
@@ -10,6 +10,7 @@ METHOD eachMatch(Pattern, Closure) String
METHOD eachMatch(String, Closure) String
METHOD eachWithIndex(Closure) Object
METHOD endsWith(String) [PUBLIC] boolean
+METHOD endsWithAny(CharSequence[]) boolean
METHOD equals(Object) [PUBLIC] boolean
METHOD equalsIgnoreCase(String) [PUBLIC] boolean
METHOD every() boolean
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion
index 1ec409823d..cd9e5ee4fd 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/methodClosure1/MethodClosure1.groovy.testMethodClosure1_3.completion
@@ -2,6 +2,7 @@ Code completion result for source line:
r.&t|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
+METHOD tap(Closure) Object
METHOD times(Closure) void
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion
index 0c99df4475..45426afb2a 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/safeNavigation1/SafeNavigation1.groovy.testSafeNavigation1_3.completion
@@ -2,6 +2,7 @@ Code completion result for source line:
r?.t|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
+METHOD tap(Closure) Object
METHOD times(Closure) void
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion
index 3264431e34..d93f4abc6c 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator1/SpreadOperator1.groovy.testSpreadOperator1_stringArray_all.completion
@@ -32,10 +32,12 @@ METHOD copyValueOf(char[]) [STATIC, String
METHOD copyValueOf(char[], int, int) [STATIC, String
METHOD count(CharSequence) int
METHOD decodeBase64() byte[]
+METHOD decodeBase64Url() byte[]
METHOD decodeHex() byte[]
METHOD denormalize() String
+METHOD digest(String) String
METHOD drop(int) CharSequence
-METHOD dropWhile(Closure) CharSequence
+METHOD dropWhile(Closure) String
METHOD dump() String
METHOD each(Closure) Object
METHOD eachLine(Closure) Object
@@ -45,6 +47,7 @@ METHOD eachMatch(Pattern, Closure) String
METHOD eachMatch(String, Closure) String
METHOD eachWithIndex(Closure) Object
METHOD endsWith(String) [PUBLIC] boolean
+METHOD endsWithAny(CharSequence[]) boolean
METHOD equals(Object) [PUBLIC] boolean
METHOD equalsIgnoreCase(String) [PUBLIC] boolean
METHOD every() boolean
@@ -111,6 +114,7 @@ METHOD is(Object) boolean
METHOD isAllWhitespace() boolean
METHOD isBigDecimal() boolean
METHOD isBigInteger() boolean
+METHOD isBlank() boolean
METHOD isCase(Object) boolean
METHOD isDouble() boolean
METHOD isEmpty() [PUBLIC] boolean
@@ -129,6 +133,7 @@ METHOD leftShift(Object) StringBuffer
METHOD length() [PUBLIC] int
METHOD matches(Pattern) boolean
METHOD matches(String) [PUBLIC] boolean
+METHOD md5() String
METHOD metaClass(Closure) MetaClass
METHOD minus(Object) String
METHOD minus(Pattern) String
@@ -158,7 +163,9 @@ METHOD readLines() List
METHOD regionMatches(boolean, int, St [PUBLIC] boolean
METHOD regionMatches(int, String, int [PUBLIC] boolean
METHOD replace(CharSequence, CharSequ [PUBLIC] String
+METHOD replace(Map) String
METHOD replace(char, char) [PUBLIC] String
+METHOD replace(int, Map) String
METHOD replaceAll(CharSequence, CharS String
METHOD replaceAll(CharSequence, Closu String
METHOD replaceAll(Pattern, CharSequen String
@@ -186,6 +193,7 @@ METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
METHOD startsWith(String) [PUBLIC] boolean
METHOD startsWith(String, int) [PUBLIC] boolean
+METHOD startsWithAny(CharSequence[]) boolean
METHOD stripIndent() String
METHOD stripIndent(int) String
METHOD stripMargin() String
@@ -195,7 +203,8 @@ METHOD subSequence(int, int) [PUBLIC] CharSequence
METHOD substring(int) [PUBLIC] String
METHOD substring(int, int) [PUBLIC] String
METHOD take(int) CharSequence
-METHOD takeWhile(Closure) CharSequence
+METHOD takeWhile(Closure) String
+METHOD tap(Closure) Object
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
METHOD toBoolean() Boolean
@@ -220,6 +229,7 @@ METHOD tokenize(CharSequence) List
METHOD tokenize(Character) List
METHOD tr(CharSequence, CharSequence) String
METHOD trim() [PUBLIC] String
+METHOD uncapitalize() String
METHOD unexpand() String
METHOD unexpand(int) String
METHOD unexpandLine(int) String
@@ -239,6 +249,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
FIELD CASE_INSENSITIVE_ORDER [STATIC, Comparator<String>
FIELD bytes [PUBLIC] byte[]
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion
index b67f38f8af..91b5de6d91 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator2/SpreadOperator2.groovy.testSpreadOperator2_stringArray_sPrefix.completion
@@ -16,6 +16,7 @@ METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
METHOD startsWith(String) [PUBLIC] boolean
METHOD startsWith(String, int) [PUBLIC] boolean
+METHOD startsWithAny(CharSequence[]) boolean
METHOD stripIndent() String
METHOD stripIndent(int) String
METHOD stripMargin() String
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion
index f8dba3cbbe..a3a8abc24d 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/operators/spreadOperator3/SpreadOperator3.groovy.testSpreadOperator3_intArray_all.completion
@@ -129,6 +129,7 @@ METHOD sprintf(String, Object) String
METHOD step(Number, Number, Closure) void
METHOD stringSize(int) [STATIC] int
METHOD sum(int, int) [STATIC, int
+METHOD tap(Closure) Object
METHOD times(Closure) void
METHOD toBigDecimal() BigDecimal
METHOD toBigInteger() BigInteger
@@ -158,6 +159,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
METHOD xor(Number) Number
-FIELD class [PUBLIC] Class
+FIELD class [PUBLIC] Class
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion
index edb43852c0..33a4ef0185 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion1/AfterExtendsTypeCompletion1.groovy.testAfterExtendsTypeCompletion1.completion
@@ -7,6 +7,7 @@ PACKAGE groovy null
PACKAGE groovyjarjarantlr null
PACKAGE groovyjarjarasm null
PACKAGE groovyjarjarcommonscli null
+PACKAGE groovyjarjarpicocli null
PACKAGE java null
PACKAGE javax null
PACKAGE jdk null
@@ -22,8 +23,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
@@ -44,6 +43,7 @@ CLASS BitSet null
CLASS Boolean null
CLASS BootstrapMethodError null
CLASS BufferedInputStream null
+CLASS BufferedIterator null
CLASS BufferedOutputStream null
CLASS BufferedReader null
CLASS BufferedWriter null
@@ -69,7 +69,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
@@ -141,7 +140,6 @@ CLASS FileDescriptor null
CLASS FileFilter null
CLASS FileInputStream null
CLASS FileNameByRegexFinder null
-CLASS FileNameFinder null
CLASS FileNameMap null
CLASS FileNotFoundException null
CLASS FileOutputStream null
@@ -170,24 +168,18 @@ CLASS GrabExclude null
CLASS GrabResolver null
CLASS Grapes null
CLASS GregorianCalendar null
-CLASS GroovyAssert null
CLASS GroovyCallable null
CLASS GroovyClassLoader null
CLASS GroovyCodeSource null
CLASS GroovyCollections null
CLASS GroovyInterceptable null
-CLASS GroovyLogTestCase null
-CLASS GroovyMBean null
CLASS GroovyObject null
CLASS GroovyObjectSupport null
CLASS GroovyResourceLoader null
CLASS GroovyRuntimeException null
CLASS GroovyScriptEngine null
CLASS GroovyShell null
-CLASS GroovyShellTestCase null
CLASS GroovySystem null
-CLASS GroovyTestCase null
-CLASS GroovyTestSuite null
CLASS HashMap null
CLASS HashSet null
CLASS Hashtable null
@@ -241,8 +233,6 @@ CLASS InvalidPropertiesFormatExcepti null
CLASS Iterable null
CLASS Iterator null
CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
CLASS Lazy null
CLASS LineNumberInputStream null
CLASS LineNumberReader null
@@ -306,6 +296,7 @@ CLASS NotSerializableException null
CLASS NullPointerException null
CLASS Number null
CLASS NumberFormatException null
+CLASS NumberRange null
CLASS Object null
CLASS ObjectGraphBuilder null
CLASS ObjectInput null
@@ -324,7 +315,6 @@ CLASS ObservableList null
CLASS ObservableMap null
CLASS ObservableSet null
CLASS Observer null
-CLASS OptionAccessor null
CLASS Optional null
CLASS OptionalDataException null
CLASS OptionalDouble null
@@ -432,7 +422,6 @@ CLASS StringBuilder null
CLASS StringIndexOutOfBoundsExceptio null
CLASS StringJoiner null
CLASS StringReader null
-CLASS StringTestUtil null
CLASS StringTokenizer null
CLASS StringWriter null
CLASS StringWriterIOException null
@@ -452,7 +441,15 @@ CLASS TracingInterceptor null
CLASS TreeMap null
CLASS TreeSet null
CLASS Tuple null
+CLASS Tuple1 null
CLASS Tuple2 null
+CLASS Tuple3 null
+CLASS Tuple4 null
+CLASS Tuple5 null
+CLASS Tuple6 null
+CLASS Tuple7 null
+CLASS Tuple8 null
+CLASS Tuple9 null
CLASS TypeNotPresentException null
CLASS URI null
CLASS URISyntaxException null
@@ -483,7 +480,4 @@ CLASS Void null
CLASS WeakHashMap null
CLASS Writable null
CLASS WriteAbortedException null
-CLASS Writer null
-CLASS XmlNodePrinter null
-CLASS XmlParser null
-CLASS XmlSlurper null
+CLASS Writer null
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion
index fe5e4fb28a..7c86cef00f 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/afterExtendsTypeCompletion4/AfterExtendsTypeCompletion4.groovy.testAfterExtendsTypeCompletion4.completion
@@ -2,6 +2,4 @@ Code completion result for source line:
class PrefixMatchPackageCaseInsensitive extends Ja| {
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
-CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
+CLASS JarURLConnection null
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion
index 14fb6dc644..8450891270 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/fieldTypeCompletion2/FieldTypeCompletion2.groovy.testFieldTypeCompletion2.completion
@@ -2,6 +2,4 @@ Code completion result for source line:
Ja|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
-CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
+CLASS JarURLConnection null
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion
index 14fb6dc644..8450891270 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/package/localVariableTypeCompletion2/LocalVariableTypeCompletion2.groovy.testLocalVariableTypeCompletion2.completion
@@ -2,6 +2,4 @@ Code completion result for source line:
Ja|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
-CLASS JarURLConnection null
-CLASS JavadocAssertionTestBuilder null
-CLASS JavadocAssertionTestSuite null
+CLASS JarURLConnection null
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion
index a70e0c4eda..85512fd049 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton1/Singleton1.groovy.testSingleton1_withInPrefix.completion
@@ -6,4 +6,4 @@ METHOD inject(Closure) Object
METHOD inject(Object, Closure) Object
METHOD inspect() String
METHOD invokeMethod(String, Object) Object
-FIELD instance [STATIC] Singleton1
+FIELD instance [STATIC, Singleton1
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion
index 5f4bac6281..bc1dbe836b 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/transformations/singleton3/Singleton3.groovy.testSingleton3_withoutPrefix.completion
@@ -2,8 +2,6 @@ Code completion result for source line:
Singleton3.|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
-CLASS Singleton3() null
-CLASS y() null
METHOD addShutdownHook(Closure) void
METHOD any() boolean
METHOD any(Closure) boolean
@@ -71,6 +69,7 @@ METHOD sleep(long, Closure) void
METHOD split(Closure) Collection
METHOD sprintf(String, Object) String
METHOD sprintf(String, Object) String
+METHOD tap(Closure) Object
METHOD toString() [PUBLIC] String
METHOD use(Class, Closure) Object
METHOD use(List, Closure) Object
@@ -79,6 +78,7 @@ METHOD wait() [PUBLIC] void
METHOD wait(long) [PUBLIC] void
METHOD wait(long, int) [PUBLIC] void
METHOD with(Closure) Object
+METHOD with(boolean, Closure) Object
METHOD withTraits(Class[]) Object
METHOD y() [PUBLIC] Object
FIELD class [PUBLIC] Class
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy
index 97374beb6b..e27b23e053 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy
@@ -1 +1 @@
-groovy.xml.
\ No newline at end of file
+groovy.time.
\ No newline at end of file
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion
index 954c987e13..e1c44ec7b0 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/fqnTypeCompletion1/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion
@@ -1,21 +1,10 @@
Code completion result for source line:
-groovy.xml.|
+groovy.time.|
(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
------------------------------------
-PACKAGE dom null
-PACKAGE streamingmarkupsupport null
-CLASS DOMBuilder null
-CLASS Entity null
-CLASS FactorySupport null
-CLASS MarkupBuilder null
-CLASS MarkupBuilderHelper null
-CLASS Namespace null
-CLASS NamespaceBuilder null
-CLASS NamespaceBuilderSupport null
-CLASS QName null
-CLASS SAXBuilder null
-CLASS StaxBuilder null
-CLASS StreamingDOMBuilder null
-CLASS StreamingMarkupBuilder null
-CLASS StreamingSAXBuilder null
-CLASS XmlUtil null
+CLASS BaseDuration null
+CLASS DatumDependentDuration null
+CLASS Duration null
+CLASS TimeCategory null
+CLASS TimeDatumDependentDuration null
+CLASS TimeDuration null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion
index 18a61c74d2..6ae3c59f9e 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion3/TypeCompletion3.groovy.testTypeCompletion3.completion
@@ -9,7 +9,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion
index d7e3625d64..f55f3e09ad 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/types/typeCompletion4/TypeCompletion4.groovy.testTypeCompletion4.completion
@@ -9,7 +9,6 @@ CLASS ClassFormatError null
CLASS ClassLoader null
CLASS ClassNotFoundException null
CLASS ClassValue null
-CLASS CliBuilder null
CLASS CloneNotSupportedException null
CLASS Cloneable null
CLASS Closeable null
diff --git a/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion
index 79dbf72eda..0b479725ad 100644
--- a/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion
+++ b/groovy/groovy.editor/test/unit/data/testfiles/completion/variables/variables1/Variables1.groovy.testVariables1_3.completion
@@ -11,8 +11,6 @@ CLASS AbstractQueue null
CLASS AbstractSequentialList null
CLASS AbstractSet null
CLASS AdaptingMetaClass null
-CLASS AllTestSuite null
-CLASS AntBuilder null
CLASS Appendable null
CLASS ArithmeticException null
CLASS ArrayDeque null
diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java
index eee23050c8..0b5a3d8aa1 100644
--- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java
+++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/GroovyCCTestBase.java
@@ -91,4 +91,14 @@ private String getClassName() {
}
return nameWithoutPrefix;
}
+
+ @Override
+ protected void assertDescriptionMatches(String relFilePath,
+ String description, boolean includeTestName, String ext, boolean checkFileExistence) throws Exception {
+ super.assertDescriptionMatches(relFilePath, removeSpuriousCompletionItemsFromDescription(description), includeTestName, ext, checkFileExistence);
+ }
+
+ private String removeSpuriousCompletionItemsFromDescription(String description) {
+ return description.replaceAll("PACKAGE\\s+apple\\s+null\n", "");
+ }
}
diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java
index f402052b28..410ee21003 100644
--- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java
+++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCCTest.java
@@ -35,7 +35,7 @@ protected String getTestType() {
}
public void testFqnTypeCompletion1() throws Exception {
- checkCompletion(BASE + "FqnTypeCompletion1.groovy", "groovy.xml.^", false);
+ checkCompletion(BASE + "FqnTypeCompletion1.groovy", "groovy.time.^", false);
}
// we don't get proper AST for this mini-class, disable it for now.
diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java
index a1e99f6604..419dbec598 100644
--- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java
+++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java
@@ -54,12 +54,12 @@ public void testGeneratorWithClass() throws IOException {
GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
CharSequence charSequence = generator.generateClass(classNodes.get(0));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class Foo" + lineSep +
" extends java.lang.Object implements" + lineSep +
@@ -85,17 +85,19 @@ public void testGeneratorWithScript() throws IOException {
GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
CharSequence charSequence = generator.generateClass(classNodes.get(0));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class Test" + lineSep +
" extends groovy.lang.Script {" + lineSep +
"public Test() {}" + lineSep +
- "public Test(groovy.lang.Binding context) {}" + lineSep +
+ "public Test(groovy.lang.Binding context) {" + lineSep +
+ "super ();" + lineSep +
+ "}" + lineSep +
"public static void main(java.lang.String[] args) { }" + lineSep +
"public java.lang.Object run() { return null;}" + lineSep +
"public java.lang.Object method1() { return null;}" + lineSep +
@@ -115,12 +117,12 @@ public void testGenerics() throws IOException {
GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
CharSequence charSequence = generator.generateClass(classNodes.get(0));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class Foo" + lineSep +
" extends java.lang.Object implements" + lineSep +
@@ -145,13 +147,13 @@ public void testImports() throws IOException {
GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
CharSequence charSequence = generator.generateClass(classNodes.get(0));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import javax.swing.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class MyTest" + lineSep +
" extends javax.swing.JPanel implements" + lineSep +
@@ -181,12 +183,12 @@ public void testMultipleClasses() throws IOException {
GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
CharSequence charSequence = generator.generateClass(classNodes.get(0));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class PostService" + lineSep +
" extends java.lang.Object implements" + lineSep +
@@ -200,12 +202,12 @@ public void testMultipleClasses() throws IOException {
charSequence = generator.generateClass(classNodes.get(1));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class PostException" + lineSep +
" extends java.lang.Exception implements" + lineSep +
@@ -236,12 +238,12 @@ public void testThrowsClause() throws IOException {
GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
CharSequence charSequence = generator.generateClass(classNodes.get(0));
assertEquals(
- "import groovy.util.*;" + lineSep +
- "import java.lang.*;" + lineSep +
"import groovy.lang.*;" + lineSep +
+ "import java.net.*;" + lineSep +
"import java.util.*;" + lineSep +
+ "import java.lang.*;" + lineSep +
+ "import groovy.util.*;" + lineSep +
"import java.io.*;" + lineSep +
- "import java.net.*;" + lineSep +
"" + lineSep +
"public class MyTest" + lineSep +
" extends java.lang.Object implements" + lineSep +
diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java
index 002549812b..7cf9cd2eb4 100644
--- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java
+++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/FastImportTest.java
@@ -19,7 +19,9 @@
package org.netbeans.modules.groovy.editor.imports;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import javax.lang.model.element.ElementKind;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.modules.groovy.editor.api.completion.CompletionItem;
@@ -44,15 +46,13 @@ public FastImportTest(String testName) {
}
@Override
- protected Map<String, ClassPath> createClassPathsForTest() {
- return Collections.singletonMap(
- ClassPath.SOURCE,
- ClassPathSupport.createClassPath(new FileObject[] {
- FileUtil.toFileObject(getDataFile("/testfiles/ccresult"))
- })
- );
- }
+ protected Set<String> additionalSourceClassPath() {
+ HashSet<String> sourceClassPath = new HashSet<String>();
+ sourceClassPath.add("/testfiles/ccresult");
+ return sourceClassPath;
+ }
+
public void testNoImportsYet_spaceAfterPackageStatement() throws Exception {
checkResult("NoImportsSpaceAfterPackage", " AAA^", aaaType);
}
diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java
index 3d7ff25f64..3ca29c8605 100644
--- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java
+++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/imports/ImportUtilsTest.java
@@ -21,7 +21,6 @@
import java.util.HashSet;
import java.util.Set;
-import static junit.framework.Assert.assertTrue;
import org.netbeans.modules.groovy.editor.spi.completion.DefaultImportsProvider;
import org.netbeans.modules.groovy.editor.test.GroovyTestBase;
import org.openide.util.test.MockLookup;
diff --git a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java
index fdf9e155a0..0798d34e50 100644
--- a/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java
+++ b/groovy/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/test/GroovyTestBase.java
@@ -161,7 +161,7 @@ private static ClassPath createBootClassPath() {
}
private static ClassPath createCompilePath() {
- URL url = org.codehaus.groovy.ant.Groovyc.class.getProtectionDomain().getCodeSource().getLocation();
+ URL url = groovy.lang.GroovyObject.class.getProtectionDomain().getCodeSource().getLocation();
return ClassPathSupport.createClassPath(FileUtil.getArchiveRoot(url));
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists