Adapt code to Guava 15.
Adapt to API changes in Guava.
Bump the bundle to Java-1.8 to allow using lambdas instead of adding
Overrides.
Fix warnings in the touched java file.
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/.classpath b/tests/org.eclipse.dltk.javascript.ui.tests/.classpath
index ad32c83..eca7bdb 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/.classpath
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs
index e8e5493..b87100e 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
index a0d4589..59db52d 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
org.eclipse.dltk.ui.tests,
org.eclipse.dltk.javascript.core,
org.eclipse.dltk.javascript.ui,
- com.google.guava;bundle-version="[12.0.0,13.0.0)",
+ com.google.guava;bundle-version="[15.0.0,16.0.0)",
org.eclipse.dltk.javascript.parser
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/src/org/eclipse/dltk/javascript/ui/tests/codeassist/JSCodeAssistUITest.java b/tests/org.eclipse.dltk.javascript.ui.tests/src/org/eclipse/dltk/javascript/ui/tests/codeassist/JSCodeAssistUITest.java
index 7ce3676..a5e2f7c 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/src/org/eclipse/dltk/javascript/ui/tests/codeassist/JSCodeAssistUITest.java
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/src/org/eclipse/dltk/javascript/ui/tests/codeassist/JSCodeAssistUITest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 NumberFour AG
+ * Copyright (c) 2012, 2016 NumberFour AG and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -54,21 +54,16 @@
List<ICompletionProposal> proposals, Class<T> proposalClass,
Predicate<T> predicate) {
return FluentIterable.from(proposals).filter(proposalClass)
- .filter(predicate).toImmutableList();
+ .filter(predicate).toList();
}
private List<ScriptTemplateProposal> filterProposalsWithJSDoc(
final List<ICompletionProposal> proposals) {
return filter(proposals, ScriptTemplateProposal.class,
- new Predicate<ScriptTemplateProposal>() {
- public boolean apply(ScriptTemplateProposal input) {
- return input.getAdditionalProposalInfo().contains(
- MultiLineComment.JSDOC_PREFIX);
- }
- });
+ input -> input.getAdditionalProposalInfo()
+ .contains(MultiLineComment.JSDOC_PREFIX));
}
- @SuppressWarnings("unchecked")
private static Matcher<String> stringHasValue() {
return CoreMatchers.allOf(CoreMatchers.<String> notNullValue(String.class),
CoreMatchers.not(""));
@@ -88,12 +83,7 @@
// function keyword
final List<IScriptCompletionProposal> keywords = filter(proposals,
IScriptCompletionProposal.class,
- new Predicate<IScriptCompletionProposal>() {
- public boolean apply(IScriptCompletionProposal input) {
- return Keywords.FUNCTION.equals(input
- .getDisplayString());
- }
- });
+ input -> Keywords.FUNCTION.equals(input.getDisplayString()));
assertEquals(1, keywords.size());
// 2 function declaration templates (with jsdoc and without it)
@@ -123,12 +113,7 @@
final List<IScriptCompletionProposal> keywords = filter(proposals,
IScriptCompletionProposal.class,
- new Predicate<IScriptCompletionProposal>() {
- public boolean apply(IScriptCompletionProposal input) {
- return Keywords.FUNCTION.equals(input
- .getDisplayString());
- }
- });
+ input -> Keywords.FUNCTION.equals(input.getDisplayString()));
assertEquals(1, keywords.size());
util.apply(keywords.get(0));
assertEquals(PROJECT.getFileContentsAsString("src/file1keyword.txt"),
@@ -192,11 +177,7 @@
final List<IScriptCompletionProposal> proposals = filter(
util.invokeCompletion(), IScriptCompletionProposal.class,
- new Predicate<IScriptCompletionProposal>() {
- public boolean apply(IScriptCompletionProposal input) {
- return input.getDisplayString().startsWith("length");
- }
- });
+ input -> input.getDisplayString().startsWith("length"));
assertEquals(1, proposals.size());
assertThat(proposals.get(0).getAdditionalProposalInfo(),
stringHasValue());
@@ -211,11 +192,7 @@
final List<IScriptCompletionProposal> proposals = filter(
util.invokeCompletion(), IScriptCompletionProposal.class,
- new Predicate<IScriptCompletionProposal>() {
- public boolean apply(IScriptCompletionProposal input) {
- return input.getDisplayString().startsWith("toString");
- }
- });
+ input -> input.getDisplayString().startsWith("toString"));
assertEquals(1, proposals.size());
assertThat(proposals.get(0).getAdditionalProposalInfo(),
stringHasValue());
