Bug 538923 - Update of Mockito broke some testsI20180912-0210I20180911-1400

Fix instantiation errors.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
index de37ecb89ac..6d98e184d33 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2015 IBM Corporation and others.
+ * Copyright (c) 2013, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -16,7 +16,7 @@ package org.eclipse.e4.ui.workbench.renderers.swt;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -188,7 +188,7 @@ public class ThemeDefinitionChangedHandlerTest {
 		verify(resource2, never()).dispose();
 	}
 
-	protected static class ThemeDefinitionChangedHandlerTestable extends
+	public static class ThemeDefinitionChangedHandlerTestable extends
 			ThemeDefinitionChangedHandler {
 		List<Object> processedRemovedResources;
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java
index 736c44c9e66..a6790cad6e9 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java
@@ -1,7 +1,7 @@
 package org.eclipse.ui.tests.themes;
 
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -119,7 +119,7 @@ public class StylingPreferencesHandlerTest extends TestCase {
 		verify(handler, times(1)).resetOverriddenPreferences();
 	}
 
-	protected static class StylingPreferencesHandlerTestable extends StylingPreferencesHandler {
+	public static class StylingPreferencesHandlerTestable extends StylingPreferencesHandler {
 		public StylingPreferencesHandlerTestable(Display display) {
 			super(display);
 		}