Merge pull request #718 from csmith/test-deps

Fix test deprecations.

src/test/java/com/dmdirc/ServerManagerTest.java

@@ -27,17 +27,13 @@ import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
-
 import java.net.URI;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,9 +43,9 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/commandparser/aliases/AliasLoaderTest.java

@@ -23,16 +23,14 @@
 package com.dmdirc.commandparser.aliases;
 
 import com.google.common.collect.Sets;
-
 import java.util.Set;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.anySetOf;
+import static org.mockito.ArgumentMatchers.anySetOf;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/commandparser/aliases/AliasManagerTest.java

@@ -36,8 +36,8 @@ import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 @RunWith(MockitoJUnitRunner.class)

src/test/java/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -44,7 +44,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -35,9 +35,7 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.colours.Colour;
-
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,8 +45,8 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

src/test/java/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -37,7 +37,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -40,7 +40,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -23,7 +23,6 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
@@ -33,21 +32,18 @@ import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.util.URIParser;
-
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -41,9 +41,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/config/ConfigBinderImplTest.java

@@ -31,9 +31,9 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)

src/test/java/com/dmdirc/config/ConfigFileBackedConfigProviderTest.java

@@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 

src/test/java/com/dmdirc/config/prefs/PreferencesDialogModelTest.java

@@ -42,7 +42,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.verify;
 
 @RunWith(MockitoJUnitRunner.class)

src/test/java/com/dmdirc/config/profiles/ProfileManagerTest.java

@@ -40,7 +40,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/logger/SentryErrorReporterTest.java

@@ -23,31 +23,27 @@
 package com.dmdirc.logger;
 
 import com.dmdirc.util.ClientInfo;
-
+import com.getsentry.raven.Raven;
+import com.getsentry.raven.RavenFactory;
+import com.getsentry.raven.event.Event;
+import com.getsentry.raven.event.interfaces.ExceptionInterface;
+import com.getsentry.raven.event.interfaces.SentryInterface;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.getsentry.raven.Raven;
-import com.getsentry.raven.RavenFactory;
-import com.getsentry.raven.dsn.Dsn;
-import com.getsentry.raven.event.Event;
-import com.getsentry.raven.event.interfaces.ExceptionInterface;
-import com.getsentry.raven.event.interfaces.SentryInterface;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -71,7 +67,7 @@ public class SentryErrorReporterTest {
 
     @Before
     public void setUp() {
-        when(ravenFactory.createRavenInstance(Matchers.<Dsn>anyObject())).thenReturn(raven);
+        when(ravenFactory.createRavenInstance(any())).thenReturn(raven);
         throwable = Optional.of(new IllegalArgumentException());
         sentryErrorReporter = new SentryErrorReporter(clientInfo);
     }

src/test/java/com/dmdirc/logger/SentryLoggingErrorManagerTest.java

@@ -39,9 +39,9 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/ui/WindowManagerTest.java

@@ -43,10 +43,11 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -133,9 +134,9 @@ public class WindowManagerTest {
 
         manager.removeWindow(child);
 
-        verify(frameListener, never()).addWindow(anyObject(), anyBoolean());
-        verify(frameListener, never()).addWindow(anyObject(), anyObject(), anyBoolean());
-        verify(frameListener, never()).delWindow(anyObject());
+        verify(frameListener, never()).addWindow(any(), anyBoolean());
+        verify(frameListener, never()).addWindow(any(), any(), anyBoolean());
+        verify(frameListener, never()).delWindow(any());
         verify(frameListener).delWindow(same(container), same(child));
     }
 
@@ -146,10 +147,10 @@ public class WindowManagerTest {
         manager.removeListener(frameListener);
         manager.addWindow(container, child);
 
-        verify(frameListener, never()).addWindow(anyObject(), anyBoolean());
-        verify(frameListener, never()).addWindow(anyObject(), anyObject(), anyBoolean());
-        verify(frameListener, never()).delWindow(anyObject());
-        verify(frameListener, never()).delWindow(anyObject(), anyObject());
+        verify(frameListener, never()).addWindow(any(), anyBoolean());
+        verify(frameListener, never()).addWindow(any(), any(), anyBoolean());
+        verify(frameListener, never()).delWindow(any());
+        verify(frameListener, never()).delWindow(any(), any());
     }
 
     @Test

src/test/java/com/dmdirc/ui/core/aliases/CoreAliasDialogModelTest.java

@@ -44,8 +44,8 @@ import org.mockito.stubbing.Answer;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/ui/core/autocommands/CoreGlobalAutoCommandsDialogModelTest.java

@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/dmdirc/ui/core/feedback/CoreFeedbackDialogModelTest.java

@@ -23,9 +23,7 @@
 package com.dmdirc.ui.core.feedback;
 
 import com.dmdirc.interfaces.ui.FeedbackDialogModelListener;
-
 import java.util.Optional;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,9 +33,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CoreFeedbackDialogModelTest {

src/test/java/com/dmdirc/ui/core/feedback/FeedbackSenderTest.java

@@ -26,14 +26,11 @@ import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.io.Downloader;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import java.io.IOException;
 import java.util.Map;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,8 +40,8 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static junit.framework.TestCase.assertEquals;
-import static org.mockito.Matchers.anyMapOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -70,8 +67,7 @@ public class FeedbackSenderTest {
     @Before
     public void setUp() throws Exception {
         feedbackSenderFactory = new FeedbackSenderFactory(config, downloader, eventBus);
-        when(downloader.getPage(anyString(), anyMapOf(String.class, String.class)))
-                .thenReturn(Lists.newArrayList("Success."));
+        when(downloader.getPage(anyString(), anyMap())).thenReturn(Lists.newArrayList("Success."));
         expectedInfo = Maps.newHashMap(ImmutableMap.<String, String>builder()
                 .put("name", NAME).put("email", EMAIL)
                 .put("feedback", FEEDBACK)
@@ -159,8 +155,7 @@ public class FeedbackSenderTest {
 
     @Test
     public void testRun_WithFail() throws Exception {
-        when(downloader.getPage(anyString(), anyMapOf(String.class, String.class)))
-                .thenReturn(Lists.newArrayList());
+        when(downloader.getPage(anyString(), anyMap())).thenReturn(Lists.newArrayList());
         feedbackSender = feedbackSenderFactory.getFeedbackSender(NAME, EMAIL, FEEDBACK, VERSION,
                 SERVER_INFO, DMDIRC_INFO);
         feedbackSender.run();
@@ -172,8 +167,7 @@ public class FeedbackSenderTest {
 
     @Test
     public void testRun_WithException() throws Exception {
-        when(downloader.getPage(anyString(), anyMapOf(String.class, String.class)))
-                .thenThrow(new IOException("Fail."));
+        when(downloader.getPage(anyString(), anyMap())).thenThrow(new IOException("Fail."));
         feedbackSender = feedbackSenderFactory.getFeedbackSender(NAME, EMAIL, FEEDBACK, VERSION,
                 SERVER_INFO, DMDIRC_INFO);
         feedbackSender.run();

src/test/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModelTest.java

@@ -47,7 +47,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/dmdirc/ui/core/profiles/CoreProfilesDialogModelTest.java

@@ -42,7 +42,7 @@ import static java.util.Comparator.comparing;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -56,7 +56,6 @@ public class CoreProfilesDialogModelTest {
     private MutableProfile mutableProfile1;
     private MutableProfile mutableProfile2;
     private MutableProfile mutableProfile3;
-    private MutableProfile mutableProfile4;
     private List<MutableProfile> mutableProfiles;
     private CoreProfilesDialogModel instance;
 
@@ -71,7 +70,6 @@ public class CoreProfilesDialogModelTest {
         mutableProfile1 = new MutableProfile(profile1);
         mutableProfile2 = new MutableProfile(profile2);
         mutableProfile3 = new MutableProfile(profile3);
-        mutableProfile4 = new MutableProfile(profile4);
         mutableProfiles = Lists.newArrayList(mutableProfile1, mutableProfile2, mutableProfile3);
         Collections.sort(mutableProfiles, comparing(MutableProfile::getName));
         when(profileManager.getProfiles()).thenReturn(profiles);
@@ -196,9 +194,9 @@ public class CoreProfilesDialogModelTest {
         instance.setSelectedProfile(instance.getProfile("profile1"));
         assertEquals("testSetSelectedProfileSelectedNickname", Optional.<String>empty(),
                 instance.getSelectedProfileSelectedNickname());
-        instance.setSelectedProfileSelectedNickname(Optional.ofNullable("nickname12"));
+        instance.setSelectedProfileSelectedNickname(Optional.of("nickname12"));
         verify(listener).selectedNicknameChanged(Optional.of("nickname12"));
-        assertEquals("testSetSelectedProfileSelectedNickname", Optional.ofNullable("nickname12"),
+        assertEquals("testSetSelectedProfileSelectedNickname", Optional.of("nickname12"),
                 instance.getSelectedProfileSelectedNickname());
     }
 
@@ -206,11 +204,10 @@ public class CoreProfilesDialogModelTest {
     public void testSetSelectedProfileDetails() {
         instance.setSelectedProfile(instance.getProfile("profile2"));
         verify(listener).profileSelectionChanged(Optional.of(mutableProfile2));
-        instance.setSelectedProfileName(Optional.ofNullable("testName"));
-        instance.setSelectedProfileIdent(Optional.ofNullable("testIdent"));
-        instance.setSelectedProfileRealname(Optional.ofNullable("testRealname"));
-        instance.setSelectedProfileNicknames(Optional.ofNullable((List<String>) Lists.
-                newArrayList("testNickname")));
+        instance.setSelectedProfileName(Optional.of("testName"));
+        instance.setSelectedProfileIdent(Optional.of("testIdent"));
+        instance.setSelectedProfileRealname(Optional.of("testRealname"));
+        instance.setSelectedProfileNicknames(Optional.of(Lists.newArrayList("testNickname")));
         assertEquals("testGetSelectedProfileDetails", "testName",
                 instance.getSelectedProfileName().get());
         assertEquals("testGetSelectedProfileDetails", "testIdent",
@@ -251,9 +248,9 @@ public class CoreProfilesDialogModelTest {
     @Test
     public void testEditSelectedProfileSelectedNickname() {
         instance.setSelectedProfile(instance.getProfile("profile1"));
-        instance.setSelectedProfileSelectedNickname(Optional.ofNullable("nickname12"));
+        instance.setSelectedProfileSelectedNickname(Optional.of("nickname12"));
         assertEquals("testSetSelectedProfileSelectedNickname",
-                Optional.ofNullable("nickname12"),
+                Optional.of("nickname12"),
                 instance.getSelectedProfileSelectedNickname());
         instance.editSelectedProfileNickname("nickname12", "nickname4");
         verify(listener).selectedProfileNicknameEdited("nickname12", "nickname4");
@@ -275,7 +272,7 @@ public class CoreProfilesDialogModelTest {
         final MutableProfile profile4 = instance.getProfile("profile4").get();
         verify(listener).profileAdded(profile4);
         instance.removeListener(listener);
-        instance.setSelectedProfile(Optional.ofNullable(profile4));
+        instance.setSelectedProfile(Optional.of(profile4));
         verify(listener, never()).profileRemoved(profile4);
     }
 

src/test/java/com/dmdirc/ui/messages/FormatterTest.java

@@ -22,7 +22,6 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,9 +30,10 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.startsWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.startsWith;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)

src/test/java/com/dmdirc/ui/messages/HighlightManagerTest.java

@@ -47,7 +47,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.only;
 import static org.mockito.Mockito.verify;

src/test/java/com/dmdirc/updater/checking/NightlyCheckerTest.java

@@ -45,7 +45,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)

src/test/java/com/dmdirc/updater/installing/LegacyInstallationStrategyTest.java

@@ -30,8 +30,8 @@ import java.nio.file.Path;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Matchers;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -85,7 +85,7 @@ public class LegacyInstallationStrategyTest {
         when(file.toString()).thenReturn("path");
         when(file.toAbsolutePath()).thenReturn(absoluteFile);
         when(absoluteFile.toString()).thenReturn("/my/path");
-        when(component.doInstall(Matchers.<Path>anyObject())).thenThrow(new IOException());
+        when(component.doInstall(any())).thenThrow(new IOException());
         strategy.addUpdateInstallationListener(listener);
         strategy.installImpl(component, result);
         verify(listener).installFailed(component);

src/test/java/com/dmdirc/util/URLBuilderTest.java

@@ -39,10 +39,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -62,7 +62,7 @@ public class URLBuilderTest {
     public void setup() throws MalformedURLException {
         when(pluginManagerProvider.get()).thenReturn(pluginManager);
         when(themeManagerProvider.get()).thenReturn(themeManager);
-        when(pluginManager.getPluginInfoByName(Matchers.anyString())).thenReturn(pluginInfo);
+        when(pluginManager.getPluginInfoByName(anyString())).thenReturn(pluginInfo);
         when(themeManager.getDirectory()).thenReturn("/themes/");
         when(pluginInfo.getMetaData()).thenReturn(pluginMetaData);
         when(pluginMetaData.getPluginPath()).thenReturn(jimFsRule.getPath("file://testPlugin"));