formatter.tests: Bump to Java 8. Enable more warnings, save actions and fix them. Change-Id: I9718a0699495e24736889f705ccd49f7b165b6ed Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/tests/org.eclipse.dltk.ruby.formatter.tests/.classpath b/tests/org.eclipse.dltk.ruby.formatter.tests/.classpath index ad32c83..eca7bdb 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/.classpath +++ b/tests/org.eclipse.dltk.ruby.formatter.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.ruby.formatter.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.dltk.ruby.formatter.tests/.settings/org.eclipse.jdt.core.prefs index cc8d94e..45b191c 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.dltk.ruby.formatter.tests/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -67,7 +67,7 @@ org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -86,9 +86,9 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning @@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -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.ruby.formatter.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.dltk.ruby.formatter.tests/.settings/org.eclipse.jdt.ui.prefs index e25132f..7d5cec7 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/tests/org.eclipse.dltk.ruby.formatter.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -36,13 +36,13 @@ sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_unnecessary_casts=true sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_imports=true sp_cleanup.remove_unused_local_variables=false sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false
diff --git a/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF index 1d2dadc..8207ce5 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.dltk.ruby.formatter.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ org.eclipse.ui, org.eclipse.dltk.formatter, org.eclipse.dltk.formatter.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.dltk.ruby.formatter.tests Bundle-Activator: org.eclipse.dltk.ruby.formatter.tests.RubyFormatterTestsPlugin Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/FormatRubyLibTest.java b/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/FormatRubyLibTest.java index c553d39..90f7319 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/FormatRubyLibTest.java +++ b/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/FormatRubyLibTest.java
@@ -70,9 +70,9 @@ if (!path.isFile()) { fail(path + " is not found"); //$NON-NLS-1$ } - final ZipInputStream zipInputStream = new ZipInputStream( - new FileInputStream(path)); - try { + + try (final ZipInputStream zipInputStream = new ZipInputStream( + new FileInputStream(path))) { final RubyFormatter f = new TestRubyFormatter(); ZipEntry entry; while ((entry = zipInputStream.getNextEntry()) != null) { @@ -110,12 +110,6 @@ zipInputStream.closeEntry(); } } - } finally { - try { - zipInputStream.close(); - } catch (IOException e) { - // - } } if (errorCount > 0) { final String msg = "Syntax errors: " + errorCount;
diff --git a/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/ParserTest.java b/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/ParserTest.java index dc09261..b6b55cc 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/ParserTest.java +++ b/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/ParserTest.java
@@ -99,7 +99,7 @@ private String createInput(final String id1, final String[] hereDoc1, final String id2, final String[] hereDoc2) { - List<String> lines = new ArrayList<String>(); + List<String> lines = new ArrayList<>(); lines.add("def myfunc"); lines.add("print <<\"" + id1 + "\", <<\"" + id2 + "\",1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19"); @@ -113,7 +113,7 @@ } private List<HeredocNode> selectHeredocNodes(RubyParserResult result) { - final List<HeredocNode> heredocNodes = new ArrayList<HeredocNode>(); + final List<HeredocNode> heredocNodes = new ArrayList<>(); result.getAST().accept(new AbstractVisitor() { @Override @@ -152,7 +152,7 @@ final String input = "hash = { one: 1, two: 2 }"; RubyParserResult result = RubyParser.parse(input); assertNotNull(result); - final List<Node> arrays = new ArrayList<Node>(); + final List<Node> arrays = new ArrayList<>(); result.getAST().accept(new AbstractVisitor() { @Override protected Instruction visitNode(Node visited) {
diff --git a/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/TestRubyFormatter.java b/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/TestRubyFormatter.java index d69f63d..41557b3 100644 --- a/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/TestRubyFormatter.java +++ b/tests/org.eclipse.dltk.ruby.formatter.tests/src/org/eclipse/dltk/ruby/formatter/tests/TestRubyFormatter.java
@@ -36,7 +36,7 @@ } public static Map<String, Object> createTestingPreferences() { - final Map<String, Object> result = new HashMap<String, Object>(); + final Map<String, Object> result = new HashMap<>(); for (int i = 0; i < INDENTING.length; ++i) { result.put(INDENTING[i], Boolean.TRUE); }