Modernize o.e.launchbar.core.tests

* Bump BREE to Java 1.8.
* More warnings and fixes for them.
* Deprecation fixes.

Change-Id: I632ff2954021f1c2ff9a443b23f95985fb8040ee
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

tests/org.eclipse.launchbar.core.tests/.classpath

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

tests/org.eclipse.launchbar.core.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,113 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+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.source=1.7
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=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.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+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.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+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.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+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.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF

@@ -4,6 +4,7 @@ Bundle-Name: Launch Bar Core Tests
 Bundle-SymbolicName: org.eclipse.launchbar.core.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.launchbar.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.mockito;bundle-version="2.23.0"
+Automatic-Module-Name: org.eclipse.launchbar.core.tests

tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/PerTargetLaunchConfigProviderTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 QNX Software Systems and others.
+ * Copyright (c) 2015, 2018 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,7 +46,7 @@ public class PerTargetLaunchConfigProviderTest {
 	private PerTargetLaunchConfigProvider1 provider;
 
 	@Before
-	public void basicSetupOnly() throws CoreException {
+	public void basicSetupOnly() {
 		ILaunchTargetManager targetManager = mock(ILaunchTargetManager.class);
 		Activator.getDefault().getBundle().getBundleContext().registerService(ILaunchTargetManager.class, targetManager,
 				null);

tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 QNX Software Systems and others.
+ * Copyright (c) 2014, 2018 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,7 +86,7 @@ public class LaunchBarManager2Test {
 	private ILaunchTarget[] targets;
 
 	public class FixedLaunchBarManager extends LaunchBarManager {
-		public FixedLaunchBarManager() throws CoreException {
+		public FixedLaunchBarManager() {
 			super(false);
 		}
 
@@ -218,7 +218,7 @@ public class LaunchBarManager2Test {
 	private ILaunchTarget mockRemoteConnection(String t2) {
 		ILaunchTarget target = mock(ILaunchTarget.class);
 		doReturn(t2).when(target).getTypeId();
-		doReturn(t2 + ".target").when(target).getName();
+		doReturn(t2 + ".target").when(target).getId();
 		return target;
 	}
 
@@ -267,13 +267,13 @@ public class LaunchBarManager2Test {
 		manager = new FixedLaunchBarManager();
 		localTarget = mock(ILaunchTarget.class);
 		doReturn(ILaunchTargetManager.localLaunchTargetTypeId).when(localTarget).getTypeId();
-		doReturn("Local").when(localTarget).getName();
+		doReturn("Local").when(localTarget).getId();
 		// mock
 		launchObject = "test";
 		// remote connections
 		otherTarget = mock(ILaunchTarget.class);
 		doReturn("otherTargetType").when(otherTarget).getTypeId();
-		doReturn("otherTarget").when(otherTarget).getName();
+		doReturn("otherTarget").when(otherTarget).getId();
 		targets = new ILaunchTarget[] { otherTarget, localTarget };
 		// lc
 		String launchConfigTypeId = "lctype1";
@@ -399,7 +399,7 @@ public class LaunchBarManager2Test {
 	}
 
 	@Test
-	public void testGetLaunchDescriptors() throws CoreException {
+	public void testGetLaunchDescriptors() {
 		manager.launchObjectAdded(launchObject);
 		manager.launchConfigurationAdded(launchConfig);
 		ILaunchDescriptor[] launchDescriptors = manager.getLaunchDescriptors();
@@ -668,7 +668,7 @@ public class LaunchBarManager2Test {
 	}
 
 	@Test
-	public void testGetActiveLaunchDescriptor() throws CoreException {
+	public void testGetActiveLaunchDescriptor() {
 		ILaunchBarListener lis = mock(ILaunchBarListener.class);
 		manager.addListener(lis);
 		manager.launchObjectAdded(launchObject);
@@ -678,7 +678,7 @@ public class LaunchBarManager2Test {
 	}
 
 	@Test
-	public void testSetActiveLaunchDescriptorUnkn() throws CoreException {
+	public void testSetActiveLaunchDescriptorUnkn() {
 		try {
 			manager.setActiveLaunchDescriptor(descriptor);
 			fail();
@@ -695,7 +695,7 @@ public class LaunchBarManager2Test {
 	}
 
 	@Test
-	public void testSetActiveLaunchDescriptorLisBad() throws CoreException {
+	public void testSetActiveLaunchDescriptorLisBad() {
 		ILaunchBarListener lis = mock(ILaunchBarListener.class);
 		manager.addListener(lis);
 		doThrow(new NullPointerException()).when(lis).activeLaunchDescriptorChanged(any(ILaunchDescriptor.class));
@@ -754,7 +754,7 @@ public class LaunchBarManager2Test {
 	}
 
 	@Test
-	public void testSetActiveLaunchModeUnsupported() throws CoreException {
+	public void testSetActiveLaunchModeUnsupported() {
 		ILaunchConfigurationType lctype2 = mockLCType("lctype2");
 		ILaunchMode mode = mockLaunchModes(lctype2, "modex")[0];
 		mockLaunchModes(launchConfigType, "run", "debug", "foo");

tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManagerTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2015 QNX Software Systems and others.
+ * Copyright (c) 2014, 2018 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,7 +75,7 @@ public class LaunchBarManagerTest {
 		final ILaunchTargetManager targetManager = mock(ILaunchTargetManager.class);
 		ILaunchTarget localTarget = mock(ILaunchTarget.class);
 		doReturn(ILaunchTargetManager.localLaunchTargetTypeId).when(localTarget).getTypeId();
-		doReturn("Local").when(localTarget).getName();
+		doReturn("Local").when(localTarget).getId();
 		doReturn(new ILaunchTarget[] { localTarget }).when(targetManager).getLaunchTargets();
 
 		// Inject the launch config
@@ -94,7 +94,7 @@ public class LaunchBarManagerTest {
 
 		assertNotNull(manager.getActiveLaunchTarget());
 		assertEquals(ILaunchTargetManager.localLaunchTargetTypeId, manager.getActiveLaunchTarget().getTypeId());
-		assertEquals("Local", manager.getActiveLaunchTarget().getName());
+		assertEquals("Local", manager.getActiveLaunchTarget().getId());
 
 		assertNotNull(manager.getActiveLaunchMode());
 		assertEquals("run", manager.getActiveLaunchMode().getIdentifier());
@@ -166,7 +166,7 @@ public class LaunchBarManagerTest {
 		final ILaunchTargetManager targetManager = mock(ILaunchTargetManager.class);
 		ILaunchTarget localTarget = mock(ILaunchTarget.class);
 		doReturn(ILaunchTargetManager.localLaunchTargetTypeId).when(localTarget).getTypeId();
-		doReturn("Local").when(localTarget).getName();
+		doReturn("Local").when(localTarget).getId();
 		doReturn(new ILaunchTarget[] { localTarget }).when(targetManager).getLaunchTargets();
 
 		ILaunchConfiguration launchConfig = mock(ILaunchConfiguration.class);
@@ -207,7 +207,7 @@ public class LaunchBarManagerTest {
 		assertEquals(descriptor, manager.getActiveLaunchDescriptor());
 		assertEquals(runMode, manager.getActiveLaunchMode());
 		assertEquals(ILaunchTargetManager.localLaunchTargetTypeId, manager.getActiveLaunchTarget().getTypeId());
-		assertEquals("Local", manager.getActiveLaunchTarget().getName());
+		assertEquals("Local", manager.getActiveLaunchTarget().getId());
 		assertEquals(launchConfig, manager.getActiveLaunchConfiguration());
 	}
 

tests/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/target/LaunchTargetTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 QNX Software Systems and others.
+ * Copyright (c) 2016, 2018 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,13 +7,15 @@
  *******************************************************************************/
 package org.eclipse.launchbar.core.internal.target;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.launchbar.core.internal.Activator;
 import org.eclipse.launchbar.core.target.ILaunchTarget;
 import org.eclipse.launchbar.core.target.ILaunchTargetManager;
@@ -32,7 +34,7 @@ public class LaunchTargetTest {
 	}
 
 	@Test
-	public void testRemoveLaunchTarget() throws CoreException {
+	public void testRemoveLaunchTarget() {
 		ILaunchTargetManager manager = Activator.getLaunchTargetManager();
 		// Account for pre-populated targets
 		int baseSize = manager.getLaunchTargets().length;