Fixed bug 414983: [CommonNavigator] Compile warnings in org.eclipse.ui.tests.navigator

11 files changed, 132 insertions, 65 deletions

diff --git a/tests/org.eclipse.ui.tests.navigator/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ui.tests.navigator/.settings/org.eclipse.jdt.core.prefs
index 3ddaf09a696..34c5c3911b8 100644
--- a/tests/org.eclipse.ui.tests.navigator/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ui.tests.navigator/.settings/org.eclipse.jdt.core.prefs
@@ -1,57 +1,80 @@
-#Sun Jan 10 12:25:35 PST 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=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
 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.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=ignore
+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=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+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=ignore
 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=warning
 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=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
@@ -64,14 +87,16 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=error
 org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+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.4
+org.eclipse.jdt.core.compiler.source=1.3
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java
index d401471efe9..a0035b1cd36 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/ActionProviderTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Oakland Software Incorporated and others.
+ * Copyright (c) 2009, 2013 Oakland Software Incorporated 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
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.resources.IContainer;
+
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IMenuManager;
@@ -28,6 +29,9 @@ import org.eclipse.ui.tests.navigator.extension.TestExtensionTreeData;
 
 public class ActionProviderTest extends NavigatorTestBase {
 
+	private static final boolean SLEEP_LONG = false;
+
+
 	public ActionProviderTest() {
 		_navigatorInstanceId = TEST_VIEWER;
 	}
@@ -69,7 +73,7 @@ public class ActionProviderTest extends NavigatorTestBase {
 				((IContainer) _p2.members()[1]).members()[0]);
 		_viewer.setSelection(sel);
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 
 		// Overridden
@@ -120,7 +124,7 @@ public class ActionProviderTest extends NavigatorTestBase {
 			}
 		}
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 
 		assertEquals(4, priorityItems.size());
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LabelProviderTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LabelProviderTest.java
index 89e66125cb7..6b6db5bf198 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LabelProviderTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LabelProviderTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
+ * Copyright (c) 2008, 2013 Oakland Software Incorporated and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,9 +12,12 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.navigator;
 
+import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.core.resources.IFile;
+
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.ui.internal.navigator.extensions.NavigatorContentExtension;
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
 import org.eclipse.ui.tests.navigator.extension.TestEmptyContentProvider;
@@ -26,6 +29,9 @@ import org.eclipse.ui.tests.navigator.extension.TrackingLabelProvider;
 
 public class LabelProviderTest extends NavigatorTestBase {
 
+	private static final boolean PRINT_DEBUG_INFO = false;
+	private static final boolean SLEEP_LONG = false;
+
 	public LabelProviderTest() {
 		_navigatorInstanceId = "org.eclipse.ui.tests.navigator.OverrideTestView";
 	}
@@ -219,7 +225,7 @@ public class LabelProviderTest extends NavigatorTestBase {
 		DisplayHelper.sleep(200);
 
 		final String EXPECTED = "FEDBGCA";
-		if (false)
+		if (PRINT_DEBUG_INFO)
 			System.out.println("Map: " + TrackingLabelProvider.styledTextQueries);
 		String queries = (String) TrackingLabelProvider.styledTextQueries.get(_project);
 		// This can happen multiple times depending on when the decorating label
@@ -236,7 +242,7 @@ public class LabelProviderTest extends NavigatorTestBase {
 
 		refreshViewer();
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 
 		TreeItem[] rootItems = _viewer.getTree().getItems();
@@ -256,7 +262,7 @@ public class LabelProviderTest extends NavigatorTestBase {
 		IFile f = _project.getFile("newfile");
 		_viewer.add(_project, new Object[] { f });
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 
 		TreeItem[] rootItems = _viewer.getTree().getItems();
@@ -289,7 +295,7 @@ public class LabelProviderTest extends NavigatorTestBase {
 
 		//System.out.println(System.currentTimeMillis() + " after sleep");
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 		
 		// Wait a little bit still to give the rest of the tree time to refresh
@@ -314,7 +320,7 @@ public class LabelProviderTest extends NavigatorTestBase {
 
 		TreeItem[] rootItems = _viewer.getTree().getItems();
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 
 		// But we get the text from the overridden label provider
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LinkHelperTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LinkHelperTest.java
index 25103558705..6ac2aa2fed6 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LinkHelperTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/LinkHelperTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oakland Software Incorporated and others.
+ * Copyright (c) 2010, 2013 Oakland Software Incorporated 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
@@ -11,6 +11,7 @@
 package org.eclipse.ui.tests.navigator;
 
 import org.eclipse.jface.viewers.StructuredSelection;
+
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
@@ -20,11 +21,13 @@ import org.eclipse.ui.tests.navigator.extension.TestLinkHelper;
 
 public class LinkHelperTest extends NavigatorTestBase {
 
+	private static final int SLEEP_TIME = 800;
+	private static final boolean SLEEP_LONG = false;
+
 	public LinkHelperTest() {
 		_navigatorInstanceId = TEST_VIEWER_LINK_HELPER;
 	}
 
-	private static final int SLEEP_TIME = 800;
 	
 	public void testLinkHelperSelectionChange() throws Exception {
 
@@ -58,7 +61,7 @@ public class LinkHelperTest extends NavigatorTestBase {
 		assertEquals(0, TestLinkHelper.instance.findSelectionCount);
 		assertEquals(1, TestLinkHelper.instance.activateEditorCount);
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(100000000);
 	}
 
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
index 2c0bd821831..535681c5531 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Fair Isaac Corporation.
+ * Copyright (c) 2009, 2013 Fair Isaac Corporation.
  * 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
@@ -8,19 +8,22 @@
  *     Fair Isaac Corporation - initial API and implementation
  ******************************************************************************/
 package org.eclipse.ui.tests.navigator;
+import org.eclipse.swt.widgets.TreeItem;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
 import org.eclipse.ui.tests.navigator.m12.M1ContentProvider;
 import org.eclipse.ui.tests.navigator.m12.M2ContentProvider;
 import org.eclipse.ui.tests.navigator.m12.model.M1Project;
 import org.eclipse.ui.tests.navigator.m12.model.M2File;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.swt.widgets.TreeItem;
 
 /**
  * M1/M2 tests. Those tests configure the M1 content provider override policy as
@@ -28,8 +31,8 @@ import org.eclipse.swt.widgets.TreeItem;
  */
 public class M12Tests extends NavigatorTestBase {
 
-	
-	
+	private static final boolean SLEEP_LONG = false;
+
 	public M12Tests() {
 		_navigatorInstanceId = TEST_CONTENT_M12_VIEW;
 	}
@@ -106,7 +109,7 @@ public class M12Tests extends NavigatorTestBase {
 		TreeItem[] p2Children = p2Item.getItems();
 		_expand(p2Children);
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 
 		TreeItem file2Child = _findChild("file2.txt", p2Children);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java
index 07bbdeb36f2..e68d21fdc02 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/PipelineChainTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Fair Isaac Corporation.
+ * Copyright (c) 2009, 2013 Fair Isaac Corporation.
  * 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
@@ -11,14 +11,17 @@
 
 package org.eclipse.ui.tests.navigator;
 
+import org.eclipse.swt.widgets.TreeItem;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
 import org.eclipse.ui.tests.navigator.extension.TestPipelineProvider;
 
@@ -28,6 +31,9 @@ import org.eclipse.ui.tests.navigator.extension.TestPipelineProvider;
  */
 public class PipelineChainTest extends NavigatorTestBase {
 
+	private static final boolean SLEEP_LONG = false;
+
+
 	public PipelineChainTest() {
 		_navigatorInstanceId = TEST_VIEWER_PIPELINE;
 	}
@@ -86,7 +92,7 @@ public class PipelineChainTest extends NavigatorTestBase {
 		
 		_expand(rootItems);
 		
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(10000000);
 		_viewer.refresh(rootItems[_p1Ind]);
 		
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java
index cc771486ee2..c79ed1ef4ce 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/WorkingSetTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2011 Oakland Software Incorporated and others.
+ * Copyright (c) 2008, 2013 Oakland Software Incorporated and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,13 +12,17 @@ package org.eclipse.ui.tests.navigator;
 
 import junit.framework.TestSuite;
 
-import org.eclipse.core.resources.IFile;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.core.runtime.IAdaptable;
+
+import org.eclipse.core.resources.IFile;
+
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkingSet;
@@ -38,6 +42,9 @@ import org.eclipse.ui.tests.harness.util.DisplayHelper;
 
 public class WorkingSetTest extends NavigatorTestBase {
 
+	private static final boolean SLEEP_LONG = false;
+
+
 	public static TestSuite suite() {
 		TestSuite suite = new TestSuite("org.eclipse.ui.tests.navigator.WorkingSetTest");
 		suite.addTest(new WorkingSetTest("testEmptyWindowWorkingSet"));
@@ -317,7 +324,7 @@ public class WorkingSetTest extends NavigatorTestBase {
 		items = _viewer.getTree().getItems();
 		assertTrue(items[0].getData().equals(_p2));
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(Display.getCurrent(), 10000000);
 
 	}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java
index a45a84009cf..cf77f353c93 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/cdt/CdtTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oakland Software Incorporated and others.
+ * Copyright (c) 2008, 2013 Oakland Software Incorporated 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
@@ -11,11 +11,13 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.navigator.cdt;
 
+import org.eclipse.swt.widgets.TreeItem;
+
+import org.eclipse.core.runtime.Path;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
 
-import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.navigator.resources.ProjectExplorer;
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
 import org.eclipse.ui.tests.navigator.NavigatorTestBase;
@@ -31,6 +33,8 @@ import org.eclipse.ui.tests.navigator.util.TestWorkspace;
 public class CdtTest extends NavigatorTestBase {
 
 	private static final String CPROJECT_NAME = "Chello";
+	private static final boolean SLEEP_LONG = false;
+	private static final boolean IS_JDT_DISABLED = false;
 
 	public CdtTest() {
 		_navigatorInstanceId = ProjectExplorer.VIEW_ID;
@@ -51,7 +55,7 @@ public class CdtTest extends NavigatorTestBase {
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
 				CPROJECT_NAME);
 
-		if (false)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(1000000000);
 
 		_viewer.setExpandedState(project, true);
@@ -63,7 +67,7 @@ public class CdtTest extends NavigatorTestBase {
 				assertEquals("CL: CElement: Debug", items[0].getText());
 				assertEquals("CL: CElement: src", items[1].getText());
 
-				if (false) {
+				if (IS_JDT_DISABLED) {
 					// This is how it appears if you disable the JDT NCE, it
 					// uses the CDT label provider
 					assertEquals("CL: chello/test.c", items[2].getText());
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java
index d2e50b4e6c0..69387824b7f 100755
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestActionProviderDependent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,10 +10,12 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.navigator.extension;
 
-import junit.framework.Assert;
+
+import org.junit.Assert;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
+
 import org.eclipse.ui.navigator.CommonActionProvider;
 import org.eclipse.ui.navigator.ICommonActionExtensionSite;
 
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
index 2238df9853d..4f47f2a07e3 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Fair Issac Corp and others.
+ * Copyright (c) 2009, 2013 Fair Issac Corp 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
@@ -14,17 +14,19 @@ package org.eclipse.ui.tests.navigator.extension;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
+
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.IFontProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.navigator.ICommonContentExtensionSite;
 import org.eclipse.ui.navigator.ICommonLabelProvider;
@@ -38,6 +40,7 @@ public class TrackingLabelProvider extends LabelProvider implements
 ICommonLabelProvider, IDescriptionProvider, IColorProvider,
 IFontProvider, IStyledLabelProvider {
 	
+	private static final boolean PRINT_DEBUG_INFO = false;
 	public static Color BG_COLOR = Display.getCurrent().getSystemColor(
 			SWT.COLOR_GRAY);
 	public static Color FG_COLOR = Display.getCurrent().getSystemColor(
@@ -73,7 +76,7 @@ IFontProvider, IStyledLabelProvider {
 		StringBuffer builder = new StringBuffer(entry==null ? "" : entry);
 		builder.append(_id);
 		map.put(element, builder.toString());
-		if (false)
+		if (PRINT_DEBUG_INFO)
 			System.out.println(_id + ": " + element + " map: " + map);
 	}
 
@@ -110,11 +113,8 @@ IFontProvider, IStyledLabelProvider {
 	public void restoreState(IMemento aMemento) {}
 	public void saveState(IMemento aMemento) {}
 
-	/**
-	 * 
-	 */
 	public static void resetQueries() {
-		if (false)
+		if (PRINT_DEBUG_INFO)
 			System.out.println("resetQueries()");
 		descriptionQueries.clear();
 		backgroundQueries.clear();
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
index 8f8c2d57ab7..9bf9bcbd7a8 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/JstPipelineTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,17 +11,24 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.navigator.jst;
 
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
+import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.Path;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.TreeItem;
+
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
 import org.eclipse.ui.tests.navigator.NavigatorTestBase;
 
 public class JstPipelineTest extends NavigatorTestBase {
 
+	private static final boolean SLEEP_LONG = false;
+
+
 	public JstPipelineTest() {
 		_navigatorInstanceId = TEST_VIEWER_PIPELINE;
 	}
@@ -79,7 +86,7 @@ public class JstPipelineTest extends NavigatorTestBase {
 
 		TreeItem[] projectChildren = rootItems[_projectInd].getItems();
 
-		if (!true)
+		if (SLEEP_LONG)
 			DisplayHelper.sleep(1000000);
 
 		boolean foundJava = false;