diff options
author | Alexander Kurtakov | 2016-02-18 21:13:26 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-02-18 21:13:26 +0000 |
commit | ac9cb96a7aa5e358c9605e97d18087a01764a726 (patch) | |
tree | 0d0c0e92fc00753dfdfe497fdc4d687edec9a734 /org.eclipse.ua.tests.doc | |
parent | 5bdc953788e766751ea11d4d796a73eb087c8acc (diff) | |
download | eclipse.platform.ua-ac9cb96a7aa5e358c9605e97d18087a01764a726.tar.gz eclipse.platform.ua-ac9cb96a7aa5e358c9605e97d18087a01764a726.tar.xz eclipse.platform.ua-ac9cb96a7aa5e358c9605e97d18087a01764a726.zip |
Bug 488061 - Add project specific compiler warnings in o.e.ua.tests.doc
And fix the new warnings.
Change-Id: I471586afab309f6c4d83ce1c65fe7e3c571f777a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.ua.tests.doc')
6 files changed, 151 insertions, 50 deletions
diff --git a/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs index c537b6306..fe214f9fb 100644 --- a/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.ua.tests.doc/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,104 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +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.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=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 +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +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=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.6 diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java index 66f1dd888..f2edceb0a 100644 --- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java +++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/LinkCheckServlet.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2015 IBM Corporation and others. + * Copyright (c) 2009, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.ua.tests.doc.internal; import java.io.IOException; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -22,7 +21,7 @@ public class LinkCheckServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { + throws IOException { req.setCharacterEncoding("UTF-8"); //$NON-NLS-1$ resp.setContentType("text/html; charset=UTF-8"); //$NON-NLS-1$ StringBuffer buf = new StringBuffer(); diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java index c6dc834a5..0912ebb34 100644 --- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java +++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckTocAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2015 IBM Corporation and others. + * Copyright (c) 2009, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,6 +20,7 @@ import org.eclipse.help.internal.validation.TocValidator; import org.eclipse.help.internal.validation.TocValidator.BrokenLink; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.Window; import org.eclipse.ua.tests.doc.internal.dialogs.SelectTocDialog; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; @@ -59,7 +60,7 @@ public class CheckTocAction implements IWorkbenchWindowActionDelegate { public void run(IAction action) { SelectTocDialog dlg = new SelectTocDialog(window.getShell()); dlg.open(); - if (dlg.getReturnCode() == SelectTocDialog.CANCEL) { + if (dlg.getReturnCode() == Window.CANCEL) { return; } Toc[] tocsToCheck = dlg.getTocsToCheck(); diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java index af3e0fe5d..bd5579d40 100644 --- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java +++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/LoadTocAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2015 IBM Corporation and others. + * Copyright (c) 2009, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,6 +22,7 @@ import org.eclipse.help.internal.webapp.servlet.ExtraFilters; import org.eclipse.help.internal.webapp.servlet.PrioritizedFilter; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.Window; import org.eclipse.ua.tests.doc.internal.dialogs.SelectTocDialog; import org.eclipse.ua.tests.doc.internal.linkchecker.AddScriptFilter; import org.eclipse.ua.tests.doc.internal.linkchecker.OnLoadFilter; @@ -163,7 +164,7 @@ public class LoadTocAction implements IWorkbenchWindowActionDelegate { showErrors(); SelectTocDialog dlg = new SelectTocDialog(window.getShell()); dlg.open(); - if (dlg.getReturnCode() == SelectTocDialog.CANCEL) { + if (dlg.getReturnCode() == Window.CANCEL) { return; } int testKind = dlg.getTestKind(); diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/ApiDocTest.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/ApiDocTest.java index ccb4947be..6706bd6f1 100644 --- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/ApiDocTest.java +++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/ApiDocTest.java @@ -50,11 +50,11 @@ import org.xml.sax.helpers.DefaultHandler; import junit.framework.TestCase; public class ApiDocTest extends TestCase { - + static class InternalExtensionFoundException extends SAXException { private static final long serialVersionUID = 1L; } - + static class InternalExtensionFinder extends DefaultHandler { /* Look for this pattern: <element name="extension"> @@ -62,9 +62,9 @@ public class ApiDocTest extends TestCase { <appInfo> <meta.element internal="true" /> */ - + int state = 0; - + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { switch (state) { @@ -72,17 +72,17 @@ public class ApiDocTest extends TestCase { if ("element".equalsIgnoreCase(qName) && "extension".equals(attributes.getValue("name"))) state = 1; break; - + case 1: if ("annotation".equalsIgnoreCase(qName)) state = 2; break; - + case 2: if ("appInfo".equalsIgnoreCase(qName)) state = 3; break; - + case 3: if ("meta.element".equalsIgnoreCase(qName) && "true".equals(attributes.getValue("internal"))) { throw new InternalExtensionFoundException(); @@ -90,13 +90,13 @@ public class ApiDocTest extends TestCase { break; } } - + @Override - public void endElement(String uri, String localName, String qName) throws SAXException { + public void endElement(String uri, String localName, String qName) { state = 0; } } - + private static final String[] TOCS = { "org.eclipse.platform.doc.isv", "org.eclipse.jdt.doc.isv", @@ -106,29 +106,32 @@ public class ApiDocTest extends TestCase { private static final String REFERENCE_EXTENSION_POINTS = "reference/extension-points/"; private static final String REFERENCE_API = "reference/api/"; private static final Pattern NON_API_PACKAGES = Pattern.compile(".+\\.(?:internal|tests|examples)(?:\\..+)?"); - + /** - * Missing extension points / API packages currently don't make this test fail, - * since the list contains false positives (esp. when run locally). The test doesn't - * know which bundles eventually end up in the build, and which bundles are: + * Missing extension points / API packages currently don't make this test + * fail, since the list contains false positives (esp. when run locally). + * The test doesn't know which bundles eventually end up in the build, and + * which bundles are: * <ul> * <li>part of the test infrastructure</li> * <li>dependencies (e.g. from Orbit)</li> - * <li>unrelated projects in the user's workspace that are not excluded in the launch configuration</li> + * <li>unrelated projects in the user's workspace that are not excluded in + * the launch configuration</li> * </ul> - * - * However, the test prints potentially missing extension points / API packages to System.out. - * - * @throws Exception + * + * However, the test prints potentially missing extension points / API + * packages to System.out. + * + * @throws Exception */ public void testTopicsReference() throws Exception { System.out.println("Running " + ApiDocTest.class.getName() + "#testTopicsReference()\n"); - + StringBuilder problems = new StringBuilder(); - + Set<String> extIds = new TreeSet<String>(); Set<String> packageIds = new TreeSet<String>(); - + TocFileParser parser = new TocFileParser(); for (String tocFile : TOCS) { TocContribution contribution = parser.parse(new TocFile(tocFile, TOPICS_REFERENCE_XML, true, "en", null, null)); @@ -168,17 +171,17 @@ public class ApiDocTest extends TestCase { } } } - + checkExtensionPoints(extIds, problems); checkPackages(packageIds, problems); - + assertEquals("", problems.toString()); } private static void checkExtensionPoints(Set<String> extIds, StringBuilder problems) throws Exception { Callable<BundleInfo[]> sourceBundlesCache= new Callable<BundleInfo[]>() { private BundleInfo[] bundleInfos; - + @Override public BundleInfo[] call() throws Exception { if (bundleInfos == null) { @@ -190,9 +193,9 @@ public class ApiDocTest extends TestCase { return bundleInfos; } }; - + Set<String> registeredIds = new TreeSet<String>(); - + IExtensionRegistry registry = RegistryFactory.getRegistry(); IExtensionPoint[] extensionPoints = registry.getExtensionPoints(); for (IExtensionPoint extensionPoint : extensionPoints) { @@ -218,7 +221,7 @@ public class ApiDocTest extends TestCase { } registeredIds.add(id); } - + TreeSet<String> unexpectedTocIds = new TreeSet<String>(extIds); unexpectedTocIds.removeAll(registeredIds); if (!unexpectedTocIds.isEmpty()) { @@ -227,7 +230,7 @@ public class ApiDocTest extends TestCase { problems.append(unexpectedTocId).append('\n'); } } - + registeredIds.removeAll(extIds); if (!registeredIds.isEmpty()) { // these currently don't make the test fail, since the list contains false positives (esp. when run locally) @@ -263,10 +266,10 @@ public class ApiDocTest extends TestCase { return null; } } - + private static void checkPackages(Set<String> packageIds, StringBuilder problems) { Set<String> exportedPackageIds = new TreeSet<String>(); - + exportedPackageIds.add("org.eclipse.core.runtime.adaptor"); // not exported, but makes sense to document since accessible from outside of OSGi framework exportedPackageIds.add("org.eclipse.swt.ole.win32"); // somehow missing from State#getExportedPackages(), maybe because it's declared in the fragment only @@ -294,7 +297,7 @@ public class ApiDocTest extends TestCase { // System.out.append("Exported package without class files: ").append(name).append('\n'); } } - + TreeSet<String> unexpectedPackageIds = new TreeSet<String>(packageIds); unexpectedPackageIds.removeAll(exportedPackageIds); if (!unexpectedPackageIds.isEmpty()) { @@ -303,7 +306,7 @@ public class ApiDocTest extends TestCase { problems.append(unexpectedTocId).append('\n'); } } - + exportedPackageIds.removeAll(packageIds); if (!exportedPackageIds.isEmpty()) { // these currently don't make the test fail, since the list contains false positives (esp. when run locally) diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java index 55cce5226..c12f167d6 100644 --- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java +++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/linkchecker/PrebuiltIndexChecker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,16 +12,16 @@ package org.eclipse.ua.tests.doc.internal.linkchecker; import java.net.URL; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.osgi.framework.Bundle; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /******************************************************************************* * Copyright (c) 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -45,23 +45,23 @@ public class PrebuiltIndexChecker extends TestCase { return new TestSuite(PrebuiltIndexChecker.class); } - public void testPlatformUserIndex() throws Exception { + public void testPlatformUserIndex() { validateIndex(PLATFORM_USER, "index"); } - public void testPlatformIsvIndex() throws Exception { + public void testPlatformIsvIndex() { validateIndex(PLATFORM_ISV, "index"); } - public void testPdeUserIndex() throws Exception { + public void testPdeUserIndex() { validateIndex(PDE_USER, "index"); } - public void testJdtUserIndex() throws Exception { + public void testJdtUserIndex() { validateIndex(JDT_USER, "index"); } - public void testJdtIsvIndex() throws Exception { + public void testJdtIsvIndex() { validateIndex(JDT_ISV, "index"); } |