diff options
| author | Stephan Herrmann | 2015-05-05 15:37:17 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2015-05-05 15:37:17 +0000 |
| commit | f4cfdb54ced5eac58e4c524a10fff943034ffe74 (patch) | |
| tree | 30d427b8867eb7e5b97c54b7fb192aff272aeee1 /testplugins | |
| parent | 7c1e20ec7ce6ec4180406315d0bdc301efd1286f (diff) | |
| download | org.eclipse.objectteams-f4cfdb54ced5eac58e4c524a10fff943034ffe74.tar.gz org.eclipse.objectteams-f4cfdb54ced5eac58e4c524a10fff943034ffe74.tar.xz org.eclipse.objectteams-f4cfdb54ced5eac58e4c524a10fff943034ffe74.zip | |
Clean-up:
- avoid warnings
- remove copy of test class that never had any OT specifics
Diffstat (limited to 'testplugins')
48 files changed, 209 insertions, 254 deletions
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF index 63cf1f259..d638b74a2 100644 --- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF +++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/META-INF/MANIFEST.MF @@ -29,4 +29,4 @@ Require-Bundle: org.apache.bcel, Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.objectteams.otdt.debug.tests,
org.eclipse.objectteams.otdt.debug.tests.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/build.properties b/testplugins/org.eclipse.objectteams.otdt.debug.tests/build.properties index 925883405..6d8f36913 100644 --- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/build.properties +++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/build.properties @@ -1,15 +1,8 @@ source.otdt-debugtests.jar = src/
output.otdt-debugtests.jar = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
+bin.includes = META-INF/,\
otdt-debugtests.jar,\
- testjars/,\
testprograms/,\
testresources/,\
- BCEL.jar,\
classfiles/,\
test.xml
-src.includes = build.properties,\
- test.xml,\
- .classpath,\
- .project
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AllTests.java b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AllTests.java index 153ddb490..e9ed36f79 100644 --- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AllTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/AllTests.java @@ -26,8 +26,6 @@ import junit.framework.Test; import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.eclipse.jdt.debug.tests.ProjectCreationDecorator;
-import org.eclipse.objectteams.otdt.debug.tests.core.JSR045Tests;
import org.eclipse.objectteams.otdt.debug.tests.core.SourceDebugExtensionTest;
import org.eclipse.objectteams.otdt.debug.tests.core.StratumTests;
import org.eclipse.swt.widgets.Display;
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/DebugTestsPlugin.java b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/DebugTestsPlugin.java index 4f5a27730..991cb25ea 100644 --- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/DebugTestsPlugin.java +++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/DebugTestsPlugin.java @@ -20,6 +20,7 @@ **********************************************************************/ package org.eclipse.objectteams.otdt.debug.tests;
+import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.plugin.*;
@@ -28,7 +29,6 @@ import org.osgi.framework.BundleContext; import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.*;
/**
* The main plugin class to be used in the desktop.
@@ -85,7 +85,7 @@ public class DebugTestsPlugin extends AbstractUIPlugin { if (test_src_dir != null)
platformURL = new URL(platformURL, test_src_dir.toString());
- return new File(Platform.asLocalURL(platformURL).getFile());
+ return new File(FileLocator.toFileURL(platformURL).getFile());
}
catch (IOException ex)
{
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ManualDebugTestSuite.java b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ManualDebugTestSuite.java index bf8b4341d..13865237d 100644 --- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ManualDebugTestSuite.java +++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/ManualDebugTestSuite.java @@ -26,9 +26,6 @@ import junit.framework.Test; import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.eclipse.jdt.debug.tests.ProjectCreationDecorator;
-import org.eclipse.objectteams.otdt.debug.tests.core.JSR045Tests;
-import org.eclipse.objectteams.otdt.debug.tests.core.SourceDebugExtensionTest;
import org.eclipse.objectteams.otdt.debug.tests.core.StratumTests;
import org.eclipse.swt.widgets.Display;
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/core/JSR045Tests.java b/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/core/JSR045Tests.java deleted file mode 100644 index e512faf11..000000000 --- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/src/org/eclipse/objectteams/otdt/debug/tests/core/JSR045Tests.java +++ /dev/null @@ -1,141 +0,0 @@ -/********************************************************************** - * This file is part of "Object Teams Development Tooling"-Software - * - * Copyright 2004, 2010 Fraunhofer Gesellschaft, Munich, Germany, - * for its Fraunhofer Institute and Computer Architecture and Software - * Technology (FIRST), Berlin, Germany and Technical University Berlin, - * Germany. - * - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * $Id: JSR045Tests.java 23492 2010-02-05 22:57:56Z stephan $ - * - * Please visit http://www.eclipse.org/objectteams for updates and contact. - * - * Contributors: - * Fraunhofer FIRST - Initial API and implementation - * Technical University Berlin - Initial API and implementation - **********************************************************************/
-package org.eclipse.objectteams.otdt.debug.tests.core;
-
-import org.eclipse.jdt.debug.core.IJavaClassType;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.objectteams.otdt.debug.tests.AbstractOTDTDebugTest;
-
-/**
- * Tests strata.
- */
-public class JSR045Tests extends AbstractOTDTDebugTest {
-
- public JSR045Tests(String name) {
- super(name);
- }
-
- /**
- * Test available strata on a type.
- *
- * @throws Exception
- */
- public void testAvailableStrata() throws Exception {
- String typeName = "Breakpoints";
- createLineBreakpoint(81, typeName);
-
- IJavaThread thread= null;
- try {
- thread= launchToBreakpoint(typeName);
- assertNotNull("Breakpoint not hit within timeout period", thread);
- IJavaClassType type = ((IJavaStackFrame)thread.getTopStackFrame()).getDeclaringType();
- String[] strata = type.getAvailableStrata();
- assertEquals("Wrong number of available strata", 1, strata.length);
- assertEquals("Wrong strata", "Java", strata[0]);
- } finally {
- terminateAndRemove(thread);
- removeAllBreakpoints();
- }
- }
-
- /**
- * Test default stratum on a type.
- *
- * @throws Exception
- */
- public void testDefaultStratum() throws Exception {
- String typeName = "Breakpoints";
- createLineBreakpoint(81, typeName);
-
- IJavaThread thread= null;
- try {
- thread= launchToBreakpoint(typeName);
- assertNotNull("Breakpoint not hit within timeout period", thread);
- IJavaClassType type = ((IJavaStackFrame)thread.getTopStackFrame()).getDeclaringType();
- String stratum = type.getDefaultStratum();
- assertEquals("Wrong strata", "Java", stratum);
- } finally {
- terminateAndRemove(thread);
- removeAllBreakpoints();
- }
- }
-
- /**
- * Test set / get default stratum on a java debug target.
- *
- * @throws Exception
- */
- public void testSetGetDefaultStratum() throws Exception {
- String typeName = "Breakpoints";
- createLineBreakpoint(81, typeName);
-
- IJavaThread thread= null;
- try {
- thread= launchToBreakpoint(typeName);
- assertNotNull("Breakpoint not hit within timeout period", thread);
- IJavaDebugTarget debugTarget= (IJavaDebugTarget)thread.getDebugTarget();
- String stratum= debugTarget.getDefaultStratum();
- assertNull("Default strata should be 'null'", stratum);
- debugTarget.setDefaultStratum("strataTest");
- stratum= debugTarget.getDefaultStratum();
- assertEquals("Wrong strata", "strataTest", stratum);
- } finally {
- terminateAndRemove(thread);
- removeAllBreakpoints();
- }
- }
-
- public void testGetLineInStratum() throws Exception {
- String typeName= "Breakpoints";
- createLineBreakpoint(81, typeName);
-
- IJavaThread thread= null;
- try {
- thread= launchToBreakpoint(typeName);
- assertNotNull("Breakpoint not hit within timeout period", thread);
- IJavaStackFrame stackFrame= (IJavaStackFrame)thread.getTopStackFrame();
- int lineNumber= stackFrame.getLineNumber("Java");
- assertEquals("Wrong line number", 81, lineNumber);
- } finally {
- terminateAndRemove(thread);
- removeAllBreakpoints();
- }
- }
-
- public void testGetSourceNameInStratum() throws Exception {
- String typeName= "Breakpoints";
- createLineBreakpoint(81, typeName);
-
- IJavaThread thread= null;
- try {
- thread= launchToBreakpoint(typeName);
- assertNotNull("Breakpoint not hit within timeout period", thread);
- IJavaStackFrame stackFrame= (IJavaStackFrame)thread.getTopStackFrame();
- String sourceName= stackFrame.getSourceName("Java");
- assertEquals("Wrong source name", "Breakpoints.java", sourceName);
- } finally {
- terminateAndRemove(thread);
- removeAllBreakpoints();
- }
- }
-}
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTEquinoxBuilderTests.java b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTEquinoxBuilderTests.java index d7f7887ce..43ce5c7c8 100644 --- a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTEquinoxBuilderTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTEquinoxBuilderTests.java @@ -75,10 +75,11 @@ public class OTEquinoxBuilderTests extends OTBuilderTests { } public static Test suite() { - if (true) { +//* return buildTestSuite(OTEquinoxBuilderTests.class); - } +/*/ return new OTEquinoxBuilderTests("testBaseImportTwoAspectBindings"); +//*/ } @Override diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTLaunchEnvironment.java b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTLaunchEnvironment.java index c5d80c294..58b08e403 100644 --- a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTLaunchEnvironment.java +++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTLaunchEnvironment.java @@ -129,7 +129,7 @@ public class OTLaunchEnvironment extends URLClassLoader public Object launch(String className, String methodName) throws Exception { - Class clazz = this.loadClass(className); + Class<?> clazz = this.loadClass(className); Method method = clazz.getMethod(methodName, new Class[0]); return method.invoke(null, new Object[0]); } diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/.settings/org.eclipse.jdt.core.prefs b/testplugins/org.eclipse.objectteams.otdt.tests/.settings/org.eclipse.jdt.core.prefs index e34f0a88f..be3d547e3 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/.settings/org.eclipse.jdt.core.prefs +++ b/testplugins/org.eclipse.objectteams.otdt.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,10 @@ -#Tue Oct 26 22:50:30 CEST 2010 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.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve @@ -10,53 +15,86 @@ 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=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore 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=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore 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=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +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=ignore +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=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +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=disabled 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=ignore 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.unusedDeclaredThrownExceptionWhenOverriding=disabled +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=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled 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=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/SourceElementRequestorTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/SourceElementRequestorTest.java index 83986bae0..562c8bccd 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/SourceElementRequestorTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/SourceElementRequestorTest.java @@ -24,7 +24,6 @@ import java.util.Locale; import junit.framework.Test; import org.eclipse.jdt.core.compiler.CategorizedProblem; -import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.internal.compiler.ISourceElementRequestor; import org.eclipse.jdt.internal.compiler.SourceElementParser; import org.eclipse.jdt.internal.compiler.ast.Expression; @@ -37,7 +36,6 @@ import org.eclipse.objectteams.otdt.tests.otmodel.FileBasedModelTest; /** * @author haebor/mkr - * @version $Id: SourceElementRequestorTest.java 23494 2010-02-05 23:06:44Z stephan $ */ public class SourceElementRequestorTest extends FileBasedModelTest implements ISourceElementRequestor { diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java index 8cfd0cd90..973d820ac 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/compiler/org/eclipse/objectteams/otdt/tests/compiler/smap/AbstractSourceMapGeneratorTest.java @@ -136,7 +136,6 @@ public abstract class AbstractSourceMapGeneratorTest extends FileBasedModelTest return classLibs;
}
- @SuppressWarnings("unchecked")
protected CompilerOptions getCompilerOptions()
{
CompilerOptions cOptions = new CompilerOptions();
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/hierarchy/org/eclipse/objectteams/otdt/tests/subhierarchy/OTTypeHierarchyBuilderTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/hierarchy/org/eclipse/objectteams/otdt/tests/subhierarchy/OTTypeHierarchyBuilderTest.java index d3f1a658d..a4ffa9455 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/hierarchy/org/eclipse/objectteams/otdt/tests/subhierarchy/OTTypeHierarchyBuilderTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/hierarchy/org/eclipse/objectteams/otdt/tests/subhierarchy/OTTypeHierarchyBuilderTest.java @@ -10,7 +10,6 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * $Id: OTTypeHierarchyBuilderTest.java 23494 2010-02-05 23:06:44Z stephan $ * * Please visit http://www.eclipse.org/objectteams for updates and contact. * @@ -30,15 +29,12 @@ import org.eclipse.jdt.core.search.SearchEngine; import org.eclipse.jdt.internal.core.hierarchy.HierarchyBuilder; import org.eclipse.jdt.internal.core.hierarchy.IndexBasedHierarchyBuilder; import org.eclipse.jdt.internal.core.hierarchy.TypeHierarchy; -import org.eclipse.objectteams.otdt.core.IOTType; -import org.eclipse.objectteams.otdt.core.OTModelManager; import org.eclipse.objectteams.otdt.core.TypeHelper; import org.eclipse.objectteams.otdt.tests.otmodel.FileBasedModelTest; /** * * @author Michael Krueger (mkr) - * @version $Id: OTTypeHierarchyBuilderTest.java 23494 2010-02-05 23:06:44Z stephan $ * */ public class OTTypeHierarchyBuilderTest extends FileBasedModelTest diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/CallinMappingTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/CallinMappingTest.java index a81e6388a..7dab03268 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/CallinMappingTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/CallinMappingTest.java @@ -28,7 +28,6 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.compiler.CharOperation; import org.eclipse.jdt.internal.core.SourceType; import org.eclipse.objectteams.otdt.core.ICallinMapping; import org.eclipse.objectteams.otdt.core.IMethodMapping; @@ -38,7 +37,6 @@ import org.eclipse.objectteams.otdt.core.IRoleType; import org.eclipse.objectteams.otdt.core.OTModelManager; /** - * $Id: CallinMappingTest.java 23494 2010-02-05 23:06:44Z stephan $ * * testcase: * a team class with a bound role class and various callin binding declarations diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/OTReconcilerTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/OTReconcilerTests.java index 7332f99f0..d17890271 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/OTReconcilerTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/OTReconcilerTests.java @@ -606,7 +606,7 @@ public class OTReconcilerTests extends ReconcilerTests { " String s1, s2, s3, s4, s5, s6;\n" + " }\n").length()), null); - wc.reconcile(AST.JLS3, + wc.reconcile(AST.JLS8, ICompilationUnit.FORCE_PROBLEM_DETECTION|ICompilationUnit.ENABLE_STATEMENTS_RECOVERY|ICompilationUnit.ENABLE_BINDINGS_RECOVERY, wc.getOwner(), null); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/role/bound/torole/LayeredTeamsTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/role/bound/torole/LayeredTeamsTests.java index 5b11bbbe8..c911e39a5 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/role/bound/torole/LayeredTeamsTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/model/org/eclipse/objectteams/otdt/tests/otmodel/role/bound/torole/LayeredTeamsTests.java @@ -10,7 +10,6 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * $Id: LayeredTeamsTests.java 23494 2010-02-05 23:06:44Z stephan $ * * Please visit http://www.eclipse.org/objectteams for updates and contact. * @@ -30,12 +29,10 @@ import org.eclipse.objectteams.otdt.core.IOTJavaElement; import org.eclipse.objectteams.otdt.core.IOTType; import org.eclipse.objectteams.otdt.core.IRoleType; import org.eclipse.objectteams.otdt.core.OTModelManager; -import org.eclipse.objectteams.otdt.tests.otmodel.FileBasedModelTest; import org.eclipse.objectteams.otdt.tests.otmodel.RetargetableFileBasedModelTest; /** * @author stephan - * @version $Id: LayeredTeamsTests.java 23494 2010-02-05 23:06:44Z stephan $ * * This class contains testing methods for a test setting with an empty role class * where the role class is bound to a baseclass which is a role of a lower team class diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java index 7c546c47f..5e15f9920 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/AbstractOTJLDNullAnnotationTest.java @@ -27,10 +27,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.tests.compiler.regression.AbstractNullAnnotationTest; import org.eclipse.jdt.core.tests.compiler.regression.InMemoryNameEnvironment; import org.eclipse.jdt.core.tests.compiler.regression.RegressionTestSetup; -import org.eclipse.jdt.core.tests.compiler.regression.Requestor; import org.eclipse.jdt.core.tests.util.CompilerTestSetup; import org.eclipse.jdt.core.tests.util.TestVerifier; -import org.eclipse.jdt.core.tests.util.Util; import org.eclipse.jdt.internal.compiler.Compiler; import org.eclipse.jdt.internal.compiler.batch.FileSystem; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/SomeTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/SomeTests.java index 118a765ec..258ca4fa6 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/SomeTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/SomeTests.java @@ -16,7 +16,6 @@ **********************************************************************/ package org.eclipse.objectteams.otdt.tests.otjld; -import org.eclipse.objectteams.otdt.tests.otjld.api.Reflection; import org.eclipse.objectteams.otdt.tests.otjld.callinbinding.BaseCalls; import org.eclipse.objectteams.otdt.tests.otjld.callinbinding.CallinMethodBinding; import org.eclipse.objectteams.otdt.tests.otjld.callinbinding.CallinParameterMapping_LiftingAndLowering; @@ -24,39 +23,12 @@ import org.eclipse.objectteams.otdt.tests.otjld.callinbinding.CallinWithTranslat import org.eclipse.objectteams.otdt.tests.otjld.calloutbinding.CalloutMethodBinding; import org.eclipse.objectteams.otdt.tests.otjld.calloutbinding.CalloutParameterBinding_LiftingAndLowering; import org.eclipse.objectteams.otdt.tests.otjld.calloutbinding.CalloutToField; -import org.eclipse.objectteams.otdt.tests.otjld.calloutbinding.OverridingAccessRestrictions; -import org.eclipse.objectteams.otdt.tests.otjld.liftlower.AllSmartLiftingTests; import org.eclipse.objectteams.otdt.tests.otjld.liftlower.DeclaredLifting; -import org.eclipse.objectteams.otdt.tests.otjld.other.AccessModifiers; -import org.eclipse.objectteams.otdt.tests.otjld.other.Exceptions; -import org.eclipse.objectteams.otdt.tests.otjld.other.Java5; -import org.eclipse.objectteams.otdt.tests.otjld.other.Misc; -import org.eclipse.objectteams.otdt.tests.otjld.other.Modifiers; -import org.eclipse.objectteams.otdt.tests.otjld.regression.CompilationOrder; import org.eclipse.objectteams.otdt.tests.otjld.regression.DevelopmentExamples; import org.eclipse.objectteams.otdt.tests.otjld.regression.ReportedBugs; -import org.eclipse.objectteams.otdt.tests.otjld.roleplaying.AllBindingAmbiguitiesTests; -import org.eclipse.objectteams.otdt.tests.otjld.roleplaying.BaseClassVisibility; -import org.eclipse.objectteams.otdt.tests.otjld.roleplaying.ExplicitRoleCreation; -import org.eclipse.objectteams.otdt.tests.otjld.roleplaying.GC; import org.eclipse.objectteams.otdt.tests.otjld.roleplaying.LiftingAndLowering; -import org.eclipse.objectteams.otdt.tests.otjld.roleplaying.PlayedByRelation; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.AcquisitionAndInheritanceOfRoleClasses; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.Confinement; import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.Covariance; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.ExternalizedRoles; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.FileStructure; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.ImplicitInheritance; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.InheritanceHierarchyOfTeams; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.OldExternalizedRoles; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.RegularRoleInheritance; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.RelevantRole; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.RoleObjectContainment; import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.TeamNesting; -import org.eclipse.objectteams.otdt.tests.otjld.rolesandteams.ValueParameters; -import org.eclipse.objectteams.otdt.tests.otjld.syntax.Syntax; -import org.eclipse.objectteams.otdt.tests.otjld.teamactivation.ExplicitTeamActivation; -import org.eclipse.objectteams.otdt.tests.otjld.teamactivation.ImplicitTeamActivation; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting23.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting23.java index 524f942c7..581f63d1b 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting23.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting23.java @@ -35,7 +35,6 @@ public class SmartLifting23 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting28.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting28.java index e05a1a4dd..81e8f785a 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting28.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting28.java @@ -35,7 +35,6 @@ public class SmartLifting28 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting29.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting29.java index ae49b7c5f..3748133cb 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting29.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting29.java @@ -35,7 +35,6 @@ public class SmartLifting29 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting3.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting3.java index 5b9679c4f..bd62d9d68 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting3.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting3.java @@ -35,7 +35,6 @@ public class SmartLifting3 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting6.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting6.java index e2c2c54a4..1e80b750c 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting6.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting6.java @@ -35,7 +35,6 @@ public class SmartLifting6 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting7.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting7.java index ca3f7ff18..79e837304 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting7.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting7.java @@ -35,7 +35,6 @@ public class SmartLifting7 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting8.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting8.java index e4b248b2e..c20876d61 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting8.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting8.java @@ -35,7 +35,6 @@ public class SmartLifting8 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting9.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting9.java index eacc07fce..d03dbe2f9 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting9.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/liftlower/SmartLifting9.java @@ -35,7 +35,6 @@ public class SmartLifting9 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test buildComparableTestSuite(Class evaluationTestClass) { Test suite = buildMinimalComplianceTestSuite(evaluationTestClass, F_1_6); // one compliance level is enough for smart lifting tests. TESTS_COUNTERS.put(evaluationTestClass.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java7.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java7.java index 8e5cf9815..87bb9a3b0 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java7.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java7.java @@ -38,7 +38,6 @@ public class Java7 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test suite() { Test suite = buildMinimalComplianceTestSuite(Java7.class, F_1_7); TESTS_COUNTERS.put(Java7.class.getName(), new Integer(suite.countTestCases())); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java8.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java8.java index ab5cd0e2d..b70591557 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java8.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/other/Java8.java @@ -38,7 +38,6 @@ public class Java8 extends AbstractOTJLDTest { // TESTS_RANGE = new int[] { 1097, -1 }; } - @SuppressWarnings("unchecked") public static Test suite() { Test suite = buildMinimalComplianceTestSuite(Java8.class, F_1_8); TESTS_COUNTERS.put(Java8.class.getName(), new Integer(suite.countTestCases())); @@ -280,7 +279,6 @@ public class Java8 extends AbstractOTJLDTest { "B.java", "public class B {}\n" }); - @SuppressWarnings("unchecked") Map<String, String> compilerOptions = getCompilerOptions(); compilerOptions.put(CompilerOptions.OPTION_ReportOtreWeavingIntoJava8, CompilerOptions.ERROR); String[] teamSource = new String[] { "MyTeam.java", diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/BindingAmbiguities1.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/BindingAmbiguities1.java index b9ea75513..e43f872e5 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/BindingAmbiguities1.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/BindingAmbiguities1.java @@ -20,7 +20,6 @@ package org.eclipse.objectteams.otdt.tests.otjld.roleplaying; import java.util.Map; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; -import org.eclipse.objectteams.otdt.core.ext.WeavingScheme; import org.eclipse.objectteams.otdt.tests.otjld.AbstractOTJLDTest; import junit.framework.Test; @@ -50,7 +49,6 @@ public class BindingAmbiguities1 extends AbstractOTJLDTest { // smart-lifting of a base object to a role object results in an ambiguous binding // 7.3.1-otjld_g-ambiguous-binding-1 - @SuppressWarnings("unchecked") public void test731_ambiguousBinding1() { Map options = getCompilerOptions(); options.put(CompilerOptions.OPTION_SuppressOptionalErrors, CompilerOptions.ENABLED); diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/PlayedByRelation.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/PlayedByRelation.java index 070675c97..b0605c304 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/PlayedByRelation.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/roleplaying/PlayedByRelation.java @@ -19,7 +19,6 @@ package org.eclipse.objectteams.otdt.tests.otjld.roleplaying; import java.util.Map; -import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import org.eclipse.objectteams.otdt.core.ext.WeavingScheme; import org.eclipse.objectteams.otdt.tests.otjld.AbstractOTJLDTest; diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java index 4374e520c..98584c719 100644 --- a/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java @@ -1604,7 +1604,7 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases { // set compliance level options if ("1.5".equals(compliance)) { - Map options = new HashMap(); + Map<String, String> options = new HashMap<String, String>(); options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5); options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); @@ -2689,7 +2689,7 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases { setUpJCLClasspathVariables(compliance); // set options - Map options = new HashMap(); + Map<String, String> options = new HashMap<String, String>(); options.put(CompilerOptions.OPTION_Compliance, version); options.put(CompilerOptions.OPTION_Source, version); options.put(CompilerOptions.OPTION_TargetPlatform, version); diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.settings/org.eclipse.jdt.core.prefs b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..1f46d5059 --- /dev/null +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,101 @@ +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.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +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.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +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=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +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=ignore +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=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +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=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +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=disabled +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=ignore +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.unusedDeclaredThrownExceptionWhenOverriding=disabled +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=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +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=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java index 12483d66a..a32bf497a 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/src/org/eclipse/objectteams/otdt/ui/tests/refactoring/extractmethod/ExtractMethodRefactoringUtilTests.java @@ -145,10 +145,9 @@ public class ExtractMethodRefactoringUtilTests extends FileBasedRefactoringTest return result;
}
- @SuppressWarnings("unchecked")
// raw List from ExtractMethodRefactoring.
private String[] fetchNewParameterTypes() {
- List parameterInfos = _refactoring.getParameterInfos();
+ List<ParameterInfo> parameterInfos = _refactoring.getParameterInfos();
String[] parameterTypes = new String[parameterInfos.size()];
for (int i = 0; i < parameterTypes.length; i++)
parameterTypes[i] = ((ParameterInfo) parameterInfos.get(i)).getNewTypeName();
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/testplugins/org.eclipse.objectteams.otdt.ui.tests/.settings/org.eclipse.jdt.core.prefs index 37bc5a4d2..7112e7016 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,52 +1,90 @@ -#Thu Mar 08 23:10:44 CET 2007 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.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning 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=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore 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=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore 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=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +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=ignore +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=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +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=disabled 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=ignore 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.unusedDeclaredThrownExceptionWhenOverriding=disabled +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=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled 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=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/build.properties b/testplugins/org.eclipse.objectteams.otdt.ui.tests/build.properties index 837a8181d..8b1511d08 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/build.properties +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/build.properties @@ -7,4 +7,3 @@ bin.includes = plugin.xml,\ test.xml,\ testresources/,\ JCL/ -src.includes = src/ diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/TestPlugin.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/TestPlugin.java index 6fb416f8a..0d00da896 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/TestPlugin.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/TestPlugin.java @@ -26,8 +26,8 @@ import java.net.URL; import java.util.MissingResourceException; import java.util.ResourceBundle; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.objectteams.otdt.internal.ui.preferences.GeneralPreferences; import org.eclipse.objectteams.otdt.ui.OTDTUIPlugin; @@ -111,7 +111,7 @@ public class TestPlugin extends AbstractUIPlugin { try { URL installURL = new URL(getDefault().getBundle().getEntry("/"), path.toString()); - URL localURL = Platform.asLocalURL(installURL); + URL localURL = FileLocator.toFileURL(installURL); return new File(localURL.getFile()); } catch (IOException ex) diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/InternalDefinedRoleContentAndParentTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/InternalDefinedRoleContentAndParentTests.java index 95bb98dec..2bdd75ea0 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/InternalDefinedRoleContentAndParentTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/InternalDefinedRoleContentAndParentTests.java @@ -42,7 +42,6 @@ import org.eclipse.jdt.internal.ui.packageview.PackageExplorerContentProvider; * PackageExplorerContentProvider.getChildren and PackageExplorerContentProvider.getParent * with several internal defined role classes as argument */ -@SuppressWarnings("restriction") public class InternalDefinedRoleContentAndParentTests extends FileBasedUITest { final int METHOD_IDX = 0; diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/TeamContentTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/TeamContentTests.java index 04209754e..78aa596a8 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/TeamContentTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/contentprovider/TeamContentTests.java @@ -41,7 +41,6 @@ import org.eclipse.jdt.internal.ui.packageview.PackageExplorerContentProvider; * PackageExplorerContentProvider.getChildren * with several team classes as argument */ -@SuppressWarnings("restriction") public class TeamContentTests extends FileBasedUITest { diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddUnimplementedMethodsTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddUnimplementedMethodsTest.java index 4e79302b1..2ab484e96 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddUnimplementedMethodsTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/AddUnimplementedMethodsTest.java @@ -84,7 +84,7 @@ public class AddUnimplementedMethodsTest extends TestCase { fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin"); assertNotNull(JavaProjectHelper.addRTJar(fJavaProject)); - Hashtable options= TestOptions.getDefaultOptions(); + Hashtable<String,String> options= TestOptions.getDefaultOptions(); options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE); options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4"); options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "999"); @@ -141,7 +141,7 @@ public class AddUnimplementedMethodsTest extends TestCase { } private void testHelper(IType testClass, int insertionPos, boolean implementAllOverridable) throws JavaModelException, CoreException { - RefactoringASTParser parser= new RefactoringASTParser(AST.JLS3); + RefactoringASTParser parser= new RefactoringASTParser(AST.JLS8); CompilationUnit unit= parser.parse(testClass.getCompilationUnit(), true); AbstractTypeDeclaration declaration= (AbstractTypeDeclaration) ASTNodes.getParent(NodeFinder.perform(unit, testClass.getNameRange()), AbstractTypeDeclaration.class); assertNotNull("Could not find type declaration node", declaration); diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CallinQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CallinQuickFixTest.java index 5481c58bb..5003260e6 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CallinQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CallinQuickFixTest.java @@ -60,7 +60,6 @@ public class CallinQuickFixTest extends OTQuickFixTest { return allTests(); } - @SuppressWarnings("unchecked") @Override protected void addOptions(Hashtable options) { super.addOptions(options); diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CalloutQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CalloutQuickFixTest.java index 1f75b9024..903a24f4f 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CalloutQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CalloutQuickFixTest.java @@ -60,7 +60,6 @@ public class CalloutQuickFixTest extends OTQuickFixTest { return allTests(); } - @SuppressWarnings("unchecked") @Override protected void addOptions(Hashtable options) { super.addOptions(options); diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CodeCompletionTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CodeCompletionTest.java index 058f2130d..789320409 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CodeCompletionTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/CodeCompletionTest.java @@ -123,7 +123,6 @@ public class CodeCompletionTest extends CoreTests { cu.codeComplete(offset, collector); } - @SuppressWarnings("unchecked") protected void setUp() throws Exception { fJProject1= JavaProjectHelper.createOTJavaProject("OTTestProject1", "bin"); JavaProjectHelper.addRTJar(fJProject1); diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java index fe647ee26..4990d35dd 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/PrecedenceQuickFixTest.java @@ -39,7 +39,6 @@ public class PrecedenceQuickFixTest extends OTQuickFixTest { super(name); } - @SuppressWarnings("unchecked") public static Test allTests() { return setUpTest(new TestSuite(THIS)); } diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProjectTestSetup.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProjectTestSetup.java index f9cf3e086..ff17cd4eb 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProjectTestSetup.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProjectTestSetup.java @@ -13,16 +13,11 @@ *******************************************************************************/ package org.eclipse.objectteams.otdt.ui.tests.core; -import junit.extensions.TestSetup; -import junit.framework.Test; - +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -30,7 +25,9 @@ import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.util.CoreUtility; import org.eclipse.jdt.testplugin.JavaProjectHelper; import org.eclipse.jdt.testplugin.TestOptions; -import org.eclipse.objectteams.otdt.core.ext.OTDTPlugin; + +import junit.extensions.TestSetup; +import junit.framework.Test; //{OT_COPY_PASTE: Copy of class org.eclipse.jdt.ui.tests.core.ProjectTestSetup /** diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java index df8f5780a..70bf76af3 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/ProposalAdaptor.java @@ -29,9 +29,9 @@ import base org.eclipse.jdt.internal.ui.text.java.ParameterGuessingProposal; public team class ProposalAdaptor { /** Just decapsulate one private field ;-) */ - @SuppressWarnings("decapsulation") protected class GuessingProposal playedBy ParameterGuessingProposal { + @SuppressWarnings("decapsulation") protected ICompletionProposal[][] getFChoices() -> get ICompletionProposal[][] fChoices; } @@ -42,6 +42,7 @@ public team class ProposalAdaptor { /** Access to one protected method: */ protected class LinkedCorrectionProposal playedBy LinkedCorrectionProposal { + @SuppressWarnings("decapsulation") LinkedProposalModel getLinkedProposalModel() -> LinkedProposalModel getLinkedProposalModel(); } /** API */ diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/StringAsserts.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/StringAsserts.java index d4328540f..649714bdb 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/StringAsserts.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/StringAsserts.java @@ -26,7 +26,7 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; /** * @author brcan diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/hierarchy/contentprovider/TraditionalHierarchyContentProviderTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/hierarchy/contentprovider/TraditionalHierarchyContentProviderTests.java index 9be557f54..a732a5a7f 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/hierarchy/contentprovider/TraditionalHierarchyContentProviderTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/hierarchy/contentprovider/TraditionalHierarchyContentProviderTests.java @@ -20,19 +20,16 @@ **********************************************************************/ package org.eclipse.objectteams.otdt.ui.tests.hierarchy.contentprovider; -import junit.framework.Test; - import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.ITypeHierarchy; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.internal.ui.typehierarchy.SuperTypeHierarchyViewer; import org.eclipse.jdt.internal.ui.typehierarchy.TraditionalHierarchyViewer; import org.eclipse.jdt.internal.ui.typehierarchy.TraditionalHierarchyViewer.TraditionalHierarchyContentProvider; import org.eclipse.jdt.internal.ui.typehierarchy.TypeHierarchyLifeCycle; -import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.objectteams.otdt.ui.tests.FileBasedUITest; +import junit.framework.Test; + /** * @author haebor * diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/AllInternalRoleCreationTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/AllInternalRoleCreationTests.java index 3b3778592..c8d772bf0 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/AllInternalRoleCreationTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/AllInternalRoleCreationTests.java @@ -23,14 +23,13 @@ package org.eclipse.objectteams.otdt.ui.tests.typecreator; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import org.eclipse.objectteams.otdt.tests.otmodel.TestDataHandler; +import org.eclipse.objectteams.otdt.tests.otmodel.TestSetting; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.objectteams.otdt.tests.AbstractJavaModelTests; -import org.eclipse.objectteams.otdt.tests.otmodel.TestDataHandler; -import org.eclipse.objectteams.otdt.tests.otmodel.TestSetting; - /** * @author kaschja * @version $Id: AllInternalRoleCreationTests.java 23495 2010-02-05 23:15:16Z stephan $ diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/RoleCreationTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/RoleCreationTests.java index 38f1cad1b..176c4e4f0 100644 --- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/RoleCreationTests.java +++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/typecreator/RoleCreationTests.java @@ -935,7 +935,7 @@ public class RoleCreationTests extends FileBasedUITest _roleCreator.setTypeInfo(typeInfo); _roleCreator.createType(new NullProgressMonitor()); - cu1.reconcile(AST.JLS3, true, wcOwner, null); + cu1.reconcile(AST.JLS8, true, wcOwner, null); String result = cu1.getBuffer().getContents(); String expectedCU = "package teampkg;\n" + "team class Outer { \n" + |