valgrind.ui.tests: Fix compilation.

Also bring it in sync with other test plugins.

Change-Id: Id09328590024da88f88b1404b894b11d477a719d

5 files changed, 204 insertions, 52 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs
index c537b63063..a78c3c72cf 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,95 @@
 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.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+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=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=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=warning
+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=warning
+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=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.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.6
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..9795a6f906
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF
index 61929da75c..838fa688f9 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Fragment-Host: org.eclipse.linuxtools.valgrind.ui
 Require-Bundle: org.junit;bundle-version="4.7.0",
  org.eclipse.linuxtools.valgrind.memcheck,
  org.eclipse.cdt.codan.ui.cxx
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Import-Package: org.eclipse.linuxtools.internal.valgrind.tests,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
index 309b60ee4b..60eec68d2b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
@@ -33,7 +33,7 @@
           <testClass>org.eclipse.linuxtools.internal.valgrind.ui.quickfixes.tests.AllTests</testClass>
        	  <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>
-          <product>org.eclipse.sdk.ide</product>
+          <product>org.eclipse.product.ide</product>
         </configuration>
       </plugin>
     </plugins>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/tests/WrongDeallocationResolutionTest.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/tests/WrongDeallocationResolutionTest.java
index 5b19c2c057..4901ad8427 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/tests/WrongDeallocationResolutionTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/tests/WrongDeallocationResolutionTest.java
@@ -7,14 +7,17 @@
  *
  * Contributors:
  *    Rafael Medeiros Teixeira <rafaelmt@linux.vnet.ibm.com> - initial API and implementation
-*******************************************************************************/
+ *******************************************************************************/
 
 package org.eclipse.linuxtools.internal.valgrind.ui.quickfixes.tests;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Scanner;
 
@@ -26,8 +29,9 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.linuxtools.internal.valgrind.tests.AbstractValgrindTest;
 import org.eclipse.linuxtools.internal.valgrind.ui.quickfixes.WrongDeallocationResolution;
-
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 
@@ -43,35 +47,40 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 	}
 
 	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		super.setUp();
 		proj = createProjectAndBuild("wrongDeallocTest"); //$NON-NLS-1$
 		ILaunchConfiguration config = createConfiguration(proj.getProject());
 		doLaunch(config, "wrongDeallocTest"); //$NON-NLS-1$
 
 		document = new Document();
-		InputStream fileInputStream = proj.getProject().getFile("wrongDealloc.cpp").getContents(); //$NON-NLS-1$
-	    Scanner scanner = new java.util.Scanner(fileInputStream).useDelimiter("\\A"); //$NON-NLS-1$
-	    String content;
-	    if(scanner.hasNext()) {
-	    	content = scanner.next();
-	    } else {
-	    	content = EMPTY_STRING;
-	    }
-	    document.set(content);
+		InputStream fileInputStream = proj.getProject()
+				.getFile("wrongDealloc.cpp").getContents(); //$NON-NLS-1$
+		Scanner scanner = new Scanner(fileInputStream).useDelimiter("\\A"); //$NON-NLS-1$
+		String content;
+		if (scanner.hasNext()) {
+			content = scanner.next();
+		} else {
+			content = EMPTY_STRING;
+		}
+		document.set(content);
 		markers = proj.getProject().findMarkers(VALGRIND_MARKER_TYPE, true, 1);
-		markers = sortByLineNumber(markers);
+		Arrays.sort(markers, new MarkerComparator());
 	}
 
 	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws CoreException {
 		deleteProject(proj);
 		super.tearDown();
 	}
 
-	public void testMallocDeleteQuickFix() throws Exception {
+	@Test
+	public void testMallocDeleteQuickFix() throws CoreException {
 		IMarker mallocDeleteMarker = markers[1];
-		int markerLine = mallocDeleteMarker.getAttribute(IMarker.LINE_NUMBER, -1);
+		int markerLine = mallocDeleteMarker.getAttribute(IMarker.LINE_NUMBER,
+				-1);
 
 		createResolutionAndApply(mallocDeleteMarker);
 
@@ -80,9 +89,11 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 		assertFalse(newContent.contains("delete")); //$NON-NLS-1$
 	}
 
-	public void testMallocDeleteArrayQuickFix() throws Exception {
+	@Test
+	public void testMallocDeleteArrayQuickFix() throws CoreException {
 		IMarker mallocDeleteArrayMarker = markers[3];
-		int markerLine = mallocDeleteArrayMarker.getAttribute(IMarker.LINE_NUMBER, -1);
+		int markerLine = mallocDeleteArrayMarker.getAttribute(
+				IMarker.LINE_NUMBER, -1);
 
 		createResolutionAndApply(mallocDeleteArrayMarker);
 
@@ -92,7 +103,8 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 		assertFalse(newContent.contains("[")); //$NON-NLS-1$
 	}
 
-	public void testNewFreeQuickFix() throws Exception {
+	@Test
+	public void testNewFreeQuickFix() throws CoreException {
 		IMarker newFreeMarker = markers[5];
 		int markerLine = newFreeMarker.getAttribute(IMarker.LINE_NUMBER, -1);
 
@@ -103,9 +115,11 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 		assertFalse(newContent.contains("free")); //$NON-NLS-1$
 	}
 
-	public void testNewArrayFreeQuickFix() throws Exception {
+	@Test
+	public void testNewArrayFreeQuickFix() throws CoreException {
 		IMarker newArrayFreeMarker = markers[7];
-		int markerLine = newArrayFreeMarker.getAttribute(IMarker.LINE_NUMBER, -1);
+		int markerLine = newArrayFreeMarker.getAttribute(IMarker.LINE_NUMBER,
+				-1);
 
 		createResolutionAndApply(newArrayFreeMarker);
 
@@ -114,9 +128,11 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 		assertFalse(newContent.contains("free")); //$NON-NLS-1$
 	}
 
-	public void testNewArrayDeleteQuickFix() throws Exception {
+	@Test
+	public void testNewArrayDeleteQuickFix() throws CoreException {
 		IMarker newArrayDeleteMarker = markers[9];
-		int markerLine = newArrayDeleteMarker.getAttribute(IMarker.LINE_NUMBER, -1);
+		int markerLine = newArrayDeleteMarker.getAttribute(IMarker.LINE_NUMBER,
+				-1);
 
 		createResolutionAndApply(newArrayDeleteMarker);
 
@@ -125,17 +141,20 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 	}
 
 	private void createResolutionAndApply(IMarker marker) throws CoreException {
-		WrongDeallocationResolution resolution = new WrongDeallocationResolution(marker);
+		WrongDeallocationResolution resolution = new WrongDeallocationResolution(
+				marker);
 		assertNotNull(resolution);
 
-		int numMarkersBefore = proj.getProject().findMarkers(VALGRIND_MARKER_TYPE, true, 1).length;
+		int numMarkersBefore = proj.getProject().findMarkers(
+				VALGRIND_MARKER_TYPE, true, 1).length;
 		resolution.apply(marker, document);
-		int numMarkersAfter = proj.getProject().findMarkers(VALGRIND_MARKER_TYPE, true, 1).length;
+		int numMarkersAfter = proj.getProject().findMarkers(
+				VALGRIND_MARKER_TYPE, true, 1).length;
 
 		assertEquals(numMarkersAfter, numMarkersBefore - 2);
 	}
 
-	private String getLineContent(Document document, int line){
+	private String getLineContent(Document document, int line) {
 		try {
 			int lineOffset = document.getLineOffset(line - 1);
 			int lineLength = document.getLineLength(line - 1);
@@ -145,27 +164,18 @@ public class WrongDeallocationResolutionTest extends AbstractValgrindTest {
 		}
 	}
 
-	private IMarker[] sortByLineNumber(IMarker[] markers){
-		ArrayList<IMarker> markersList = new ArrayList<IMarker>(Arrays.asList(markers));
-		Comparator<IMarker> c = new Comparator<IMarker>() {
+	private static class MarkerComparator implements Comparator<IMarker> {
+		@Override
+		public int compare(IMarker marker1, IMarker marker2) {
+			int line1 = marker1.getAttribute(IMarker.LINE_NUMBER, -1);
+			int line2 = marker2.getAttribute(IMarker.LINE_NUMBER, -1);
 
-			public int compare(IMarker marker1, IMarker marker2) {
-				int line1 = marker1.getAttribute(IMarker.LINE_NUMBER, -1);
-				int line2 = marker2.getAttribute(IMarker.LINE_NUMBER, -1);
-
-				if(line1 > line2){
-					return 1;
-				} else if(line2 < line1){
-					return -1;
-				}
-				return 0;
+			if (line1 > line2) {
+				return 1;
+			} else if (line2 < line1) {
+				return -1;
 			}
-		};
-		Collections.sort(markersList, c);
-
-		IMarker[] sortedMarkers = new IMarker[markersList.size()];
-		sortedMarkers = markersList.toArray(sortedMarkers);
-
-		return sortedMarkers;
+			return 0;
+		}
 	}
 }