diff options
10 files changed, 82 insertions, 59 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java index 1f08dd467..85a1e7abb 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.compare.tests; import java.util.HashMap; -import junit.framework.Assert; import junit.framework.TestCase; import org.eclipse.compare.ICompareFilter; @@ -22,6 +21,7 @@ import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; +import org.junit.Assert; public class DocLineComparatorTest extends TestCase { diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FilterTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FilterTest.java index 540729682..98079fc70 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FilterTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FilterTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2017 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,8 +11,8 @@ package org.eclipse.compare.tests; import org.eclipse.compare.internal.CompareResourceFilter; +import org.junit.Assert; -import junit.framework.*; import junit.framework.TestCase; public class FilterTest extends TestCase { diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/LineReaderTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/LineReaderTest.java index 0e2357435..c7ee28a43 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/LineReaderTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/LineReaderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2017 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 @@ -18,12 +18,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.List; -import junit.framework.Assert; import junit.framework.TestCase; import org.eclipse.compare.internal.core.patch.LineReader; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.junit.Assert; public class LineReaderTest extends TestCase { diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUtils.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUtils.java index 1dbd16c74..c1d0c7564 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUtils.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2017 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,27 +10,17 @@ *******************************************************************************/ package org.eclipse.compare.tests; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; import java.net.URL; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import junit.framework.Assert; - import org.eclipse.compare.internal.Utilities; import org.eclipse.compare.patch.PatchConfiguration; import org.eclipse.core.resources.IStorage; 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.runtime.*; +import org.junit.Assert; import org.osgi.framework.Bundle; public class PatchUtils { diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java index 27076c691..903faa9dc 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 IBM Corporation and others. + * Copyright (c) 2013, 2017 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 @@ -14,7 +14,6 @@ import java.util.HashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; import junit.framework.TestCase; import org.eclipse.compare.ICompareFilter; @@ -29,6 +28,7 @@ import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; +import org.junit.Assert; public class StructureCreatorTest extends TestCase { diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java index 4a816213c..a17810898 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,9 +12,7 @@ package org.eclipse.team.tests.ccvs.core.provider; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; @@ -39,8 +37,12 @@ import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder; import org.eclipse.team.internal.ccvs.core.resources.RemoteModule; import org.eclipse.team.tests.ccvs.core.CVSTestSetup; import org.eclipse.team.tests.ccvs.core.EclipseTest; +import org.junit.Assert; import org.osgi.framework.Bundle; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * This class tests the Command framework using simple CVS commands */ diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java index eb08f65fd..a48984099 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2017 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 @@ -15,9 +15,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import junit.framework.Assert; -import junit.framework.AssertionFailedError; - import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -39,6 +36,9 @@ import org.eclipse.team.internal.ccvs.ui.subscriber.ConfirmMergedOperation; import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter; import org.eclipse.team.internal.ui.synchronize.SyncInfoModelElement; import org.eclipse.team.tests.ccvs.core.CVSTestSetup; +import org.junit.Assert; + +import junit.framework.AssertionFailedError; /** * This class acts as the source for the sync info used by the subscriber tests. @@ -179,7 +179,7 @@ public class SyncInfoSource { // When running in the suites, we want to avoid intermittent failures. // However, still fail if we expected a change but we get no change since that can // cause work to be lost - junit.framework.Assert.assertTrue(errorString, result); + Assert.assertTrue(errorString, result); } else if (!result) { System.out.println(errorString); new Exception().printStackTrace(); @@ -271,7 +271,7 @@ public class SyncInfoSource { } catch (InvocationTargetException e) { throw CVSException.wrapException(e); } catch (InterruptedException e) { - junit.framework.Assert.fail("Operation was interrupted"); + Assert.fail("Operation was interrupted"); } } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java index 6ef950571..6802e34f6 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2017 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,12 +10,12 @@ *******************************************************************************/ package org.eclipse.team.tests.ccvs.core.subscriber; -import junit.framework.Assert; import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.resources.IResource; import org.eclipse.team.core.synchronize.SyncInfoSet; import org.eclipse.team.internal.ccvs.ui.subscriber.MergeUpdateOperation; +import org.junit.Assert; class TestMergeUpdateOperation extends MergeUpdateOperation { @@ -26,9 +26,6 @@ class TestMergeUpdateOperation extends MergeUpdateOperation { this.allowOverwrite = allowOverwrite; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#promptForOverwrite(org.eclipse.team.core.synchronize.SyncInfoSet) - */ protected boolean promptForOverwrite(SyncInfoSet syncSet) { if (allowOverwrite) return true; if (syncSet.isEmpty()) return true; @@ -37,9 +34,6 @@ class TestMergeUpdateOperation extends MergeUpdateOperation { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob() - */ protected boolean canRunAsJob() { return false; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java index 337afe789..481f24842 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java @@ -13,47 +13,85 @@ package org.eclipse.team.tests.ccvs.ui; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import junit.framework.Assert; -import junit.framework.AssertionFailedError; - import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.internal.resources.mapping.ShallowContainer; -import org.eclipse.core.resources.*; -import org.eclipse.core.resources.mapping.*; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.mapping.ModelProvider; +import org.eclipse.core.resources.mapping.ResourceMapping; +import org.eclipse.core.resources.mapping.ResourceMappingContext; +import org.eclipse.core.resources.mapping.ResourceTraversal; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.viewers.*; -import org.eclipse.swt.widgets.*; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.diff.IDiff; import org.eclipse.team.core.diff.IThreeWayDiff; import org.eclipse.team.core.diff.provider.Diff; import org.eclipse.team.core.history.IFileRevision; -import org.eclipse.team.core.mapping.*; +import org.eclipse.team.core.mapping.IResourceDiffTree; +import org.eclipse.team.core.mapping.ISynchronizationContext; +import org.eclipse.team.core.mapping.ISynchronizationScopeManager; import org.eclipse.team.core.mapping.provider.ResourceDiffTree; import org.eclipse.team.core.mapping.provider.SynchronizationContext; -import org.eclipse.team.core.subscribers.*; +import org.eclipse.team.core.subscribers.Subscriber; +import org.eclipse.team.core.subscribers.SubscriberMergeContext; +import org.eclipse.team.core.subscribers.SubscriberScopeManager; import org.eclipse.team.core.synchronize.SyncInfo; -import org.eclipse.team.internal.ccvs.core.*; +import org.eclipse.team.internal.ccvs.core.CVSCompareSubscriber; +import org.eclipse.team.internal.ccvs.core.CVSException; +import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber; +import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; +import org.eclipse.team.internal.ccvs.core.CVSTag; +import org.eclipse.team.internal.ccvs.core.CVSWorkspaceSubscriber; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.mappings.*; +import org.eclipse.team.internal.ccvs.ui.mappings.CompareSubscriberContext; +import org.eclipse.team.internal.ccvs.ui.mappings.MergeSubscriberContext; +import org.eclipse.team.internal.ccvs.ui.mappings.ModelCompareParticipant; +import org.eclipse.team.internal.ccvs.ui.mappings.ModelMergeParticipant; +import org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceModelParticipant; +import org.eclipse.team.internal.ccvs.ui.mappings.WorkspaceSubscriberContext; import org.eclipse.team.internal.ccvs.ui.wizards.CommitWizard; import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter; import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.team.internal.ui.Utils; -import org.eclipse.team.internal.ui.mapping.*; -import org.eclipse.team.internal.ui.synchronize.*; +import org.eclipse.team.internal.ui.mapping.ModelSynchronizePage; +import org.eclipse.team.internal.ui.mapping.ResourceMarkAsMergedHandler; +import org.eclipse.team.internal.ui.mapping.ResourceMergeHandler; +import org.eclipse.team.internal.ui.synchronize.IRefreshEvent; +import org.eclipse.team.internal.ui.synchronize.IRefreshSubscriberListener; +import org.eclipse.team.internal.ui.synchronize.RefreshModelParticipantJob; +import org.eclipse.team.internal.ui.synchronize.RefreshParticipantJob; +import org.eclipse.team.internal.ui.synchronize.SynchronizeView; import org.eclipse.team.tests.ccvs.core.CVSTestSetup; import org.eclipse.team.ui.TeamUI; -import org.eclipse.team.ui.synchronize.*; +import org.eclipse.team.ui.synchronize.ISynchronizeManager; +import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; +import org.eclipse.team.ui.synchronize.ISynchronizeParticipant; +import org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference; +import org.eclipse.team.ui.synchronize.ISynchronizeView; +import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; import org.eclipse.ui.part.IPage; +import org.junit.Assert; + +import junit.framework.AssertionFailedError; public class ModelParticipantSyncInfoSource extends ParticipantSyncInfoSource { diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java index 141332348..ee28e4635 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2017 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 @@ -25,8 +25,6 @@ import java.util.List; import java.util.zip.ZipException; import java.util.zip.ZipFile; -import junit.framework.Assert; - import org.eclipse.compare.structuremergeviewer.DiffNode; import org.eclipse.compare.structuremergeviewer.IDiffContainer; import org.eclipse.compare.structuremergeviewer.IDiffElement; @@ -44,6 +42,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.team.internal.ccvs.core.CVSStatus; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider; +import org.junit.Assert; /** * Provides helpers for: |