Bug 522727 - Avoid using deprecated DialogCheck#assertDialogTexts methodI20171018-2000

Change-Id: I08023c787aff1e85ee14d7f09b39665d0b27d32e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

12 files changed, 100 insertions, 100 deletions

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/compare/UIComparePreferencesAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/compare/UIComparePreferencesAuto.java
index 80935d6b05b..95f2a46694c 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/compare/UIComparePreferencesAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/compare/UIComparePreferencesAuto.java
@@ -57,7 +57,7 @@ public class UIComparePreferencesAuto extends TestCase {
 
     public void testCompareViewersPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.compare.internal.ComparePreferencePage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIDialogsAuto.java
index 6b50e5bea5e..4c5980c35a3 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIDialogsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIDialogsAuto.java
@@ -36,7 +36,7 @@ public class DeprecatedUIDialogsAuto extends TestCase {
                 new WorkbenchContentProvider(),
                 new WorkbenchPartLabelProvider(), WorkbenchMessages.EditorManager_saveResourcesMessage);
         dialog.setTitle(WorkbenchMessages.EditorManager_saveResourcesTitle);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIPreferencesAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIPreferencesAuto.java
index 0d5257e6f9b..d1768237a61 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIPreferencesAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIPreferencesAuto.java
@@ -56,38 +56,38 @@ public class DeprecatedUIPreferencesAuto extends TestCase {
 
     public void testWorkbenchPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Workbench");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testAppearancePref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Views");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDefaultTextEditorPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.TextEditor");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testFileEditorsPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileEditors");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testLocalHistoryPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileStates");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testPerspectivesPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Perspectives");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     //Only really checking if this opens without an exception
     public void testFontEditorsPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.tests.dialogs.FontFieldEditorTestPreferencePage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testInfoProp() {
@@ -97,7 +97,7 @@ public class DeprecatedUIPreferencesAuto extends TestCase {
          * is an SWT issue.
          *
          Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.info.file");
-         DialogCheck.assertDialogTexts(dialog, this);
+         DialogCheck.assertDialogTexts(dialog);
          */
     }
 
@@ -108,7 +108,7 @@ public class DeprecatedUIPreferencesAuto extends TestCase {
          * is an SWT issue.
          *
          Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.project.reference");
-         DialogCheck.assertDialogTexts(dialog, this);
+         DialogCheck.assertDialogTexts(dialog);
          */
     }
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIWizardsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIWizardsAuto.java
index 4893e1007d5..8eb1bbd6725 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIWizardsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/DeprecatedUIWizardsAuto.java
@@ -135,7 +135,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
 
     public void testExportResources() {//reference: ExportResourcesAction
         Dialog dialog = exportWizard(null);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
@@ -143,16 +143,16 @@ public class DeprecatedUIWizardsAuto extends TestCase {
      *
      public void testFileSystemExport() {
      Dialog dialog = exportWizard( DataTransferTestStub.newFileSystemResourceExportPage1(null) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      public void testZipFileExport() {
      Dialog dialog = exportWizard( DataTransferTestStub.newZipFileResourceExportPage1(null) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      */
     public void testImportResources() {//reference: ImportResourcesAction
         Dialog dialog = importWizard(null);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
@@ -160,11 +160,11 @@ public class DeprecatedUIWizardsAuto extends TestCase {
      *
      public void testFileSystemImport() {
      Dialog dialog = importWizard( DataTransferTestStub.newFileSystemResourceImportPage1(WorkbenchPlugin.getDefault().getWorkbench(), StructuredSelection.EMPTY) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      public void testZipFileImport() {
      Dialog dialog = importWizard( DataTransferTestStub.newZipFileResourceImportPage1(null) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      */
     public void testNewFile() {
@@ -177,7 +177,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IIDEHelpContextIds.NEW_FILE_WIZARD);
 
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
@@ -210,7 +210,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFileAction_title");
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_FILE_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewFolder() {
@@ -222,7 +222,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFolderAction_title");
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IIDEHelpContextIds.NEW_FOLDER_WIZARD);
 
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewProjectPage1() {
@@ -238,7 +238,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFileAction_title");
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IIDEHelpContextIds.NEW_PROJECT_WIZARD);
 
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewProjectPage2() {
@@ -262,7 +262,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IIDEHelpContextIds.NEW_PROJECT_WIZARD);
 
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewProject() {
@@ -298,7 +298,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IIDEHelpContextIds.NEW_PROJECT_WIZARD);
 
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewResource() {
@@ -331,7 +331,7 @@ public class DeprecatedUIWizardsAuto extends TestCase {
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IWorkbenchHelpContextIds.NEW_WIZARD);
 
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextMessageDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextMessageDialogsAuto.java
index efe0b9ced4e..fad4a4a75a5 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextMessageDialogsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/TextMessageDialogsAuto.java
@@ -71,13 +71,13 @@ public class TextMessageDialogsAuto extends TestCase {
                     bundle
                             .getString("Editor_error_activated_deleted_close_message"));
         }
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testErrorClosing() {
         Dialog dialog = getQuestionDialog(WorkbenchMessages.Error,
                 WorkbenchMessages.ErrorClosingNoArg);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testFileChanged() {
@@ -90,7 +90,7 @@ public class TextMessageDialogsAuto extends TestCase {
                     bundle
                             .getString("Editor_error_activated_outofsync_message"));
         }
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
     public void testSaveFileDeleted() {
         MessageDialog dialog = null;
@@ -102,7 +102,7 @@ public class TextMessageDialogsAuto extends TestCase {
 					bundle.getString("Editor_error_activated_deleted_save_button_save"),
 					bundle.getString("Editor_error_activated_deleted_save_button_close"));
         }
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testUpdateConflict() {
@@ -114,7 +114,7 @@ public class TextMessageDialogsAuto extends TestCase {
                     .getString("Editor_error_save_outofsync_title"), bundle
                     .getString("Editor_error_save_outofsync_message"));
         }
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java
index c61548eab14..b3f5039efe3 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIDialogsAuto.java
@@ -70,7 +70,7 @@ public class UIDialogsAuto extends TestCase {
     public void testAbout() {
         Dialog dialog = null;
         dialog = new AboutDialog(getShell());
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
      public void testAboutPlugins() {
@@ -82,13 +82,13 @@ public class UIDialogsAuto extends TestCase {
 				WorkbenchMessages.AboutFeaturesDialog_pluginInfoTitle,
 				"Title",
 				IWorkbenchHelpContextIds.ABOUT_FEATURES_PLUGINS_DIALOG);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testAddProjects() {
 		Dialog dialog = new ListSelectionDialog(getShell(), null, ArrayContentProvider.getInstance(),
 				new LabelProvider(), PROJECT_SELECTION_MESSAGE);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testCopyMoveProject() {
@@ -96,13 +96,13 @@ public class UIDialogsAuto extends TestCase {
                 .getProject("DummyProject");
         Dialog dialog = new ProjectLocationSelectionDialog(getShell(),
                 dummyProject);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testCopyMoveResource() {
         Dialog dialog = new ContainerSelectionDialog(getShell(), null, true,
                 "Copy Resources");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testEditActionSetsDialog() {
@@ -116,45 +116,45 @@ public class UIDialogsAuto extends TestCase {
          * (WorkbenchPage)getWorkbench().getActiveWorkbenchWindow().getActivePage() );
          * dialog = new CustomizePerspectiveDialog(getShell(), persp); } catch
          * (WorkbenchException e) { dialog = null; }
-         * DialogCheck.assertDialogTexts(dialog, this); if (persp != null) {
+         * DialogCheck.assertDialogTexts(dialog); if (persp != null) {
          * persp.dispose(); }
          */
     }
 
     public void testEditorSelection() {
         Dialog dialog = new EditorSelectionDialog(getShell());
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
      * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public
      * packages. public void testFindReplace() { Dialog dialog =
      * TextEditorTestStub.newFindReplaceDialog( getShell() );
-     * DialogCheck.assertDialogTexts(dialog, this); } public void
+     * DialogCheck.assertDialogTexts(dialog); } public void
      * testGotoResource() { Dialog dialog =
      * NavigatorTestStub.newGotoResourceDialog(getShell(), new IResource[0]);
-     * DialogCheck.assertDialogTexts(dialog, this); }
+     * DialogCheck.assertDialogTexts(dialog); }
      */
     public void testNavigatorFilter() {
 		Dialog dialog = new ListSelectionDialog(getShell(), null, ArrayContentProvider.getInstance(),
 				new LabelProvider(), FILTER_SELECTION_MESSAGE);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewFileType() {
         Dialog dialog = new FileExtensionDialog(getShell());
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testProgressInformation() {
         ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
         dialog.setBlockOnOpen(true);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testSaveAs() {
         Dialog dialog = new SaveAsDialog(getShell());
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testSavePerspective() {
@@ -168,18 +168,18 @@ public class UIDialogsAuto extends TestCase {
                         .getActiveWorkbenchWindow().getActivePage()
                         .getPerspective().getId());
         dialog.setInitialSelection(description);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testSelectPerspective() {
         Dialog dialog = new SelectPerspectiveDialog(getShell(), PlatformUI
                 .getWorkbench().getPerspectiveRegistry());
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testSelectTypes() {
         Dialog dialog = new TypeFilteringDialog(getShell(), null);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testShowView() {
@@ -193,12 +193,12 @@ public class UIDialogsAuto extends TestCase {
 		MApplication app = workbench.getService(MApplication.class);
 		MWindow window = workbench.getService(MWindow.class);
 		Dialog dialog = new ShowViewDialog(shell, app, window, modelService, partService, ctx);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
     /**
      * 1GJWD2E: ITPUI:ALL - Test classes should not be released in public
      * packages. public void testTaskFilters() { Dialog dialog =
      * TaskListTestStub.newFiltersDialog( getShell() );
-     * DialogCheck.assertDialogTexts(dialog, this); }
+     * DialogCheck.assertDialogTexts(dialog); }
      */
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIEditWorkingSetWizardAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIEditWorkingSetWizardAuto.java
index 5c789fadd90..2bcabe4ddd4 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIEditWorkingSetWizardAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIEditWorkingSetWizardAuto.java
@@ -111,7 +111,7 @@ public class UIEditWorkingSetWizardAuto extends UIWorkingSetWizardsAuto {
         assertTrue(ArrayUtil.contains(workingSetItems, p1));
         assertTrue(ArrayUtil.contains(workingSetItems, p2));
 
-        DialogCheck.assertDialogTexts(fWizardDialog, this);
+		DialogCheck.assertDialogTexts(fWizardDialog);
     }
 }
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
index b0b67a9949b..d110201bf84 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
@@ -225,8 +225,8 @@ public class UIMessageDialogs extends TestCase {
 				DUMMY_PROJECT,
 				"c:\\dummypath\\" + DUMMY_PROJECT })),
 				MessageDialog.QUESTION, 0, IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
-        DialogCheck.assertDialog(dialog);
+        DialogCheck.assertDialogTexts(dialog);
+		DialogCheck.assertDialog(dialog);
     }
 
     public void testRenameOverwrite() {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
index 275eb5d2779..dafe86bed9a 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
@@ -86,12 +86,12 @@ public class UIMessageDialogsAuto extends TestCase {
         Dialog dialog = getWarningDialog(JFaceResources
                 .getString("AbortPageFlippingDialog.title"), JFaceResources
                 .getString("AbortPageFlippingDialog.message"));
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testCopyOverwrite() {
         Dialog dialog = getQuestionDialog("Exists","");
-         DialogCheck.assertDialogTexts(dialog, this);
+         DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDeleteProject() {
@@ -101,7 +101,7 @@ public class UIMessageDialogsAuto extends TestCase {
 				msg, MessageDialog.QUESTION, 0,
 				IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDeleteReadOnlyCheck() {
@@ -112,17 +112,17 @@ public class UIMessageDialogsAuto extends TestCase {
 				IDialogConstants.YES_TO_ALL_LABEL,
 				IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDeleteResource() {
         Dialog dialog = getQuestionDialog("Delete","");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDeleteResources() {
 		  Dialog dialog = getQuestionDialog("Delete","");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDropOverwrite() {
@@ -135,42 +135,42 @@ public class UIMessageDialogsAuto extends TestCase {
 				IDialogConstants.YES_TO_ALL_LABEL,
 				IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testErrorClosing() {
         Dialog dialog = getQuestionDialog(WorkbenchMessages.Error,
                 WorkbenchMessages.ErrorClosingNoArg);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
     public void testFileExtensionEmpty() {
         Dialog dialog = getInformationDialog(
                 "Empty",
                 "ExtensionEmptyMessage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testFileNameWrong() {
         Dialog dialog = getInformationDialog(
                 "InvalidTitle",
                "InvalidMessage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testFileTypeExists() {
         Dialog dialog = getInformationDialog(WorkbenchMessages.FileEditorPreference_existsTitle,
                 WorkbenchMessages.FileEditorPreference_existsMessage);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testInvalidType_1() {
         Dialog dialog = getWarningDialog("invalidTitle","invalidMessage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testInvalidType_2() {
         Dialog dialog = getWarningDialog("invalidType", "invalidTypeMessage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testMoveReadOnlyCheck() {
@@ -180,28 +180,28 @@ public class UIMessageDialogsAuto extends TestCase {
                 IDialogConstants.YES_TO_ALL_LABEL,
                 IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNoBuilders() {
         Dialog dialog = getWarningDialog("BuildAction_warning", "noBuilders");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNoGlobalBuildersDialog() {
         Dialog dialog = getWarningDialog("GlobalBuildAction_warning","GlobalBuildAction_noBuilders");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNoPropertyPage() {
         Dialog dialog = getInformationDialog(WorkbenchMessages.PropertyDialog_messageTitle, NLS.bind(WorkbenchMessages.PropertyDialog_noPropertyMessage, (new Object[] { "DummyPropertyPage" })));
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 
     public void testOperationNotAvailable() {
         Dialog dialog = getInformationDialog(WorkbenchMessages.Information, "operationNotAvailableMessage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testOverwritePerspective() {
@@ -211,7 +211,7 @@ public class UIMessageDialogsAuto extends TestCase {
 				IDialogConstants.YES_LABEL,
 				IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testRefreshDeleteProject() {
@@ -220,12 +220,12 @@ public class UIMessageDialogsAuto extends TestCase {
                 MessageDialog.QUESTION, 0,
                 IDialogConstants.YES_LABEL,
                 IDialogConstants.NO_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testRenameOverwrite() {
         Dialog dialog = getQuestionDialog(".RenameResourceAction_resourceExist",DUMMY_RELATIVE_PATH);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testResetPerspective() {
@@ -233,7 +233,7 @@ public class UIMessageDialogsAuto extends TestCase {
                 MessageDialog.QUESTION, 0,
                 IDialogConstants.OK_LABEL,
                 IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testSaveAsOverwrite() {
@@ -242,7 +242,7 @@ public class UIMessageDialogsAuto extends TestCase {
 				IDialogConstants.YES_LABEL,
 				IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testSaveChanges() {
@@ -250,7 +250,7 @@ public class UIMessageDialogsAuto extends TestCase {
                 0,
 				WorkbenchMessages.Save, WorkbenchMessages.Dont_Save,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 
@@ -261,7 +261,7 @@ public class UIMessageDialogsAuto extends TestCase {
 						.getString("WizardClosingDialog_message"),
                 MessageDialog.QUESTION,
 				0, IDialogConstants.OK_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testWizardOverwrite() {
@@ -270,7 +270,7 @@ public class UIMessageDialogsAuto extends TestCase {
 				IDialogConstants.YES_TO_ALL_LABEL,
 				IDialogConstants.NO_LABEL,
 				IDialogConstants.CANCEL_LABEL);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UINewWorkingSetWizardAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UINewWorkingSetWizardAuto.java
index a8de6c13151..387322eb01d 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UINewWorkingSetWizardAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UINewWorkingSetWizardAuto.java
@@ -81,7 +81,7 @@ public class UINewWorkingSetWizardAuto extends UIWorkingSetWizardsAuto {
             /*
              * Check page texts
              */
-            DialogCheck.assertDialogTexts(fWizardDialog, this);
+			DialogCheck.assertDialogTexts(fWizardDialog);
         }
     }
 
@@ -172,7 +172,7 @@ public class UINewWorkingSetWizardAuto extends UIWorkingSetWizardsAuto {
         /*
          * Check page texts
          */
-        DialogCheck.assertDialogTexts(fWizardDialog, this);
+		DialogCheck.assertDialogTexts(fWizardDialog);
     }
 }
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java
index e27fe21adc8..61ed93c7360 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIPreferencesAuto.java
@@ -57,38 +57,38 @@ public class UIPreferencesAuto extends TestCase {
 
     public void testWorkbenchPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Workbench");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testAppearancePref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Views");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testDefaultTextEditorPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.TextEditor");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testFileEditorsPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileEditors");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testLocalHistoryPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.FileStates");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testPerspectivesPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.preferencePages.Perspectives");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     //Only really checking if this opens without an exception
     public void testFontEditorsPref() {
         Dialog dialog = getPreferenceDialog("org.eclipse.ui.tests.dialogs.FontFieldEditorTestPreferencePage");
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testInfoProp() {
@@ -98,7 +98,7 @@ public class UIPreferencesAuto extends TestCase {
          * is an SWT issue.
          *
          Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.info.file");
-         DialogCheck.assertDialogTexts(dialog, this);
+         DialogCheck.assertDialogTexts(dialog);
          */
     }
 
@@ -109,7 +109,7 @@ public class UIPreferencesAuto extends TestCase {
          * is an SWT issue.
          *
          Dialog dialog = getPropertyDialog("org.eclipse.ui.propertypages.project.reference");
-         DialogCheck.assertDialogTexts(dialog, this);
+         DialogCheck.assertDialogTexts(dialog);
          */
     }
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java
index bd6b8e3a841..5b40cc091b4 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWizardsAuto.java
@@ -136,7 +136,7 @@ public class UIWizardsAuto extends TestCase {
 
     public void testExportResources() {//reference: ExportResourcesAction
         Dialog dialog = exportWizard(null);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
@@ -144,16 +144,16 @@ public class UIWizardsAuto extends TestCase {
      *
      public void testFileSystemExport() {
      Dialog dialog = exportWizard( DataTransferTestStub.newFileSystemResourceExportPage1(null) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      public void testZipFileExport() {
      Dialog dialog = exportWizard( DataTransferTestStub.newZipFileResourceExportPage1(null) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      */
     public void testImportResources() {//reference: ImportResourcesAction
         Dialog dialog = importWizard(null);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
@@ -161,11 +161,11 @@ public class UIWizardsAuto extends TestCase {
      *
      public void testFileSystemImport() {
      Dialog dialog = importWizard( DataTransferTestStub.newFileSystemResourceImportPage1(WorkbenchPlugin.getDefault().getWorkbench(), StructuredSelection.EMPTY) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      public void testZipFileImport() {
      Dialog dialog = importWizard( DataTransferTestStub.newZipFileResourceImportPage1(null) );
-     DialogCheck.assertDialogTexts(dialog, this);
+     DialogCheck.assertDialogTexts(dialog);
      }
      */
     public void testNewFile() {
@@ -177,7 +177,7 @@ public class UIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFileAction_title");
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_FILE_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     /**
@@ -210,7 +210,7 @@ public class UIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFileAction_title");
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_FILE_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewFolder() {
@@ -222,7 +222,7 @@ public class UIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFolderAction_title");
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_FOLDER_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewProjectPage1() {
@@ -238,7 +238,7 @@ public class UIWizardsAuto extends TestCase {
         dialog.getShell().setText("CreateFileAction_title");
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_PROJECT_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewProjectPage2() {
@@ -261,7 +261,7 @@ public class UIWizardsAuto extends TestCase {
         dialog.showPage(page);
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_PROJECT_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewProject() {
@@ -278,7 +278,7 @@ public class UIWizardsAuto extends TestCase {
                 SIZING_WIZARD_HEIGHT_2);
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),
                 IIDEHelpContextIds.NEW_PROJECT_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testNewResource() {
@@ -291,7 +291,7 @@ public class UIWizardsAuto extends TestCase {
                 Math.max(SIZING_WIZARD_WIDTH_2, dialog.getShell().getSize().x),
                 SIZING_WIZARD_HEIGHT_2);
         PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IWorkbenchHelpContextIds.NEW_WIZARD);
-        DialogCheck.assertDialogTexts(dialog, this);
+        DialogCheck.assertDialogTexts(dialog);
     }
 
     public void testWizardWindowTitle() {