Fix tests after mockito upgrade.

Mockito now errors if a mock is unnecessary, plus a few other minor
API changes.

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

@@ -61,7 +61,6 @@ public class ServerManagerTest {
     @Mock private IdentityFactory identityFactory;
     @Mock private ConfigProviderMigrator configProviderMigrator;
     @Mock private Profile profile;
-    @Mock private AggregateConfigProvider configProvider;
     @Mock private WindowManager windowManager;
     @Mock private ServerFactoryImpl serverFactoryImpl;
     @Mock private Server server;
@@ -79,14 +78,11 @@ public class ServerManagerTest {
         serverManager = new ServerManager(profileManager, identityFactory, windowManager, serverFactoryImpl, eventBus);
 
         when(server.getState()).thenReturn(ServerState.DISCONNECTED);
-        when(server.getGroupChatManager()).thenReturn(groupChatManager);
         when(server.getWindowModel()).thenReturn(windowModel);
 
-        when(profileManager.getProfiles()).thenReturn(Collections.singletonList(profile));
         when(profileManager.getDefault()).thenReturn(profile);
         when(identityFactory.createMigratableConfig(anyString(), anyString(), anyString(),
                 anyString())).thenReturn(configProviderMigrator);
-        when(configProviderMigrator.getConfigProvider()).thenReturn(configProvider);
 
         when(serverFactoryImpl.getServer(eq(configProviderMigrator),
                 any(ScheduledExecutorService.class), uriCaptor.capture(), eq(profile)))
@@ -194,7 +190,6 @@ public class ServerManagerTest {
 
         final Server serverB = mock(Server.class);
         when(serverB.isNetwork("Quakenet")).thenReturn(false);
-        when(serverB.getState()).thenReturn(ServerState.CONNECTED);
 
         serverManager.registerServer(serverA);
         serverManager.registerServer(serverB);

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

@@ -55,7 +55,6 @@ public class AliasCommandHandlerTest {
     @Mock private CommandController commandController;
     @Mock private CommandParser commandParser;
     @Mock private CommandContext context;
-    @Mock private CommandInfo commandInfo;
     @Mock private EventBus eventbus;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
 
@@ -65,8 +64,6 @@ public class AliasCommandHandlerTest {
         when(inputModel.getCommandParser()).thenReturn(commandParser);
         when(commandController.getCommandChar()).thenReturn('#');
         when(commandController.getSilenceChar()).thenReturn('/');
-        when(context.getSource()).thenReturn(container);
-        when(context.getCommandInfo()).thenReturn(commandInfo);
         when(container.getEventBus()).thenReturn(eventbus);
     }
 

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

@@ -32,8 +32,6 @@ import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.parser.interfaces.ChannelInfo;
 
 import java.util.Optional;
 
@@ -61,20 +59,14 @@ public class KickReasonTest {
     @Mock private CommandController controller;
     @Mock private WindowModel container;
     @Mock private EventBus eventbus;
-    @Mock private ChannelInfo channelInfo;
-    @Mock private AggregateConfigProvider configProvider;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
     private KickReason command;
 
     @Before
     public void setup() {
-        when(container.getConfigManager()).thenReturn(configProvider);
-        when(configProvider.getOption("general", "kickmessage")).thenReturn("KICKREASON");
-        when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channel.getConnection()).thenReturn(Optional.of(connection));
         when(connection.getUser("user")).thenReturn(user1);
         when(connection.getUser("user1")).thenReturn(user2);
-        when(groupChatUser.getHostname()).thenReturn(Optional.of("HOSTNAME"));
         when(channel.getUser(user1)).thenReturn(Optional.of(groupChatUser));
         when(channel.getUser(user2)).thenReturn(Optional.empty());
         when(controller.getCommandChar()).thenReturn('/');

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

@@ -46,7 +46,6 @@ import static org.mockito.Mockito.when;
 public class NamesTest {
 
     @Mock private CommandController controller;
-    @Mock private ChannelInfo channelinfo;
     @Mock private Channel channel;
     @Mock private Connection connection;
     @Mock private Parser parser;
@@ -57,7 +56,6 @@ public class NamesTest {
     public void setUp() throws InvalidIdentityFileException {
         when(channel.getConnection()).thenReturn(Optional.of(connection));
         when(connection.getParser()).thenReturn(Optional.of(parser));
-        when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channel.getName()).thenReturn("#chan");
 
         command = new Names(controller);

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

@@ -50,7 +50,6 @@ public class MeTest {
 
     @Before
     public void setUp() {
-        when(chat.getWindowModel()).thenReturn(frameContainer);
         when(frameContainer.getEventBus()).thenReturn(eventbus);
         command = new Me(controller);
     }

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

@@ -44,6 +44,7 @@ import org.junit.runner.RunWith;
 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.eq;
 import static org.mockito.Matchers.isA;
@@ -56,7 +57,6 @@ public class NewServerTest {
     @Mock private EventBus eventBus;
     @Mock private CommandController controller;
     @Mock private ProfileManager profileManager;
-    @Mock private Profile identity;
     @Mock private WindowModel container;
     @Mock private ServiceManager serviceManager;
     @Mock private ConnectionFactory factory;
@@ -66,9 +66,7 @@ public class NewServerTest {
     @Before
     public void setup() {
         when(container.getEventBus()).thenReturn(eventBus);
-        when(factory.createServer(any(URI.class), any(Profile.class))).thenReturn(connection);
-        when(profileManager.getProfiles()).thenReturn(
-                Collections.singletonList(identity));
+        when(factory.createServer(any(URI.class), isNull())).thenReturn(connection);
         command = new NewServer(controller, factory, serviceManager, profileManager, new URIParser());
     }
 
@@ -77,7 +75,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo irc.foo.com"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(factory).createServer(eq(new URI("irc://irc.foo.com")), any(Profile.class));
+        verify(factory).createServer(eq(new URI("irc://irc.foo.com")), isNull());
         verify(connection).connect();
     }
 
@@ -86,7 +84,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo irc.foo.com:1234"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), any(Profile.class));
+        verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), isNull());
         verify(connection).connect();
     }
 
@@ -95,7 +93,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo otheruri://foo.com:123/blah"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(factory).createServer(eq(new URI("otheruri://foo.com:123/blah")), any(Profile.class));
+        verify(factory).createServer(eq(new URI("otheruri://foo.com:123/blah")), isNull());
         verify(connection).connect();
     }
 

src/test/java/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -81,7 +81,6 @@ public class CommandParserTest {
         when(container.getConnection()).thenReturn(Optional.of(connection));
         when(connection.getGroupChatManager()).thenReturn(groupChatManager);
         when(groupChatManager.isValidChannelName("#channel1")).thenReturn(true);
-        when(groupChatManager.isValidChannelName("#channel2")).thenReturn(true);
         when(groupChatManager.getChannel("#channel1")).thenReturn(Optional.of(channel));
 
         commandParser = new TestCommandParser(configProvider, commandController, eventBus);

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

@@ -65,8 +65,6 @@ public class ConfigValueRetrieverTest {
 
     @Test
     public void testRetrievesStringWithFallback() {
-        when(configProvider.getOptionString(DOMAIN, KEY, true,
-                ReadOnlyConfigProvider.PERMISSIVE_VALIDATOR)).thenReturn(null);
         when(configProvider.getOptionString(
                 DOMAIN, KEY, true, ReadOnlyConfigProvider.PERMISSIVE_VALIDATOR,
                 FALLBACK_DOMAIN, FALLBACK_KEY))
@@ -80,16 +78,12 @@ public class ConfigValueRetrieverTest {
     public void testRetrievesStringWithRequiresFalse() {
         when(configProvider.getOptionString(DOMAIN, KEY, false,
                 ReadOnlyConfigProvider.PERMISSIVE_VALIDATOR)).thenReturn(null);
-        when(configProvider.getOptionString(DOMAIN, KEY, true,
-                ReadOnlyConfigProvider.PERMISSIVE_VALIDATOR)).thenReturn("value!");
 
         assertNull(retriever.getValue(String.class, DOMAIN, KEY, false));
     }
 
     @Test
     public void testRetrievesStringWithRequiresTrue() {
-        when(configProvider.getOptionString(DOMAIN, KEY, false,
-                ReadOnlyConfigProvider.PERMISSIVE_VALIDATOR)).thenReturn(null);
         when(configProvider.getOptionString(DOMAIN, KEY, true,
                 ReadOnlyConfigProvider.PERMISSIVE_VALIDATOR)).thenReturn("value!");
 

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

@@ -66,7 +66,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testDefaults() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         assertNotNull(pm.getCategory("General"));
@@ -82,7 +81,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testDismiss() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesCategory category = mock(PreferencesCategory.class);
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
@@ -97,8 +95,6 @@ public class PreferencesDialogModelTest {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(false);
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
-
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         pm.addCategory(category);
@@ -112,8 +108,6 @@ public class PreferencesDialogModelTest {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(true);
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
-
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         pm.addCategory(category);
@@ -125,8 +119,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testGetCategory() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
-
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         assertNull(pm.getCategory("unittest123"));
@@ -135,8 +127,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testGetCategories() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
-
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         assertNotNull(pm.getCategories());
@@ -150,8 +140,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testSaveListener() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
-
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         final PreferencesInterface tpi = mock(PreferencesInterface.class);
@@ -164,7 +152,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testOpenAction() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         new PreferencesDialogModel(null, null, null, null, cm, null, serviceManager, eventBus);
 
@@ -174,7 +161,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testCloseAction() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         pm.close();
@@ -185,8 +171,6 @@ public class PreferencesDialogModelTest {
     @Test
     public void testCategoryObjectSaveListeners() {
         final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
-        when(cm.getOption("domain", "option")).thenReturn("fallback");
-
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, serviceManager, eventBus);
         final PreferencesCategory category = mock(PreferencesCategory.class);

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

@@ -56,7 +56,6 @@ public class IdentitiesProfileMigratorTest {
         instance = new IdentitiesProfileMigrator(identityManager, profileManager);
         when(configProvider1.getName()).thenReturn("name1");
         when(configProvider1.getOption("profile", "realname")).thenReturn("realname1");
-        when(configProvider1.hasOptionString("profile", "ident1")).thenReturn(false);
         when(configProvider1.getOptionList("profile", "nicknames")).thenReturn(
                 Lists.newArrayList("nickname1")
         );

src/test/java/com/dmdirc/harness/CommandArgsMatcher.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness;
-
-import com.dmdirc.commandparser.CommandArguments;
-
-import org.hamcrest.Description;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mockito;
-
-public class CommandArgsMatcher extends ArgumentMatcher<CommandArguments> {
-
-    private final String text;
-
-    public CommandArgsMatcher(final String text) {
-        this.text = text;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean matches(final Object item) {
-        return text.equals(((CommandArguments) item).getLine());
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void describeTo(final Description description) {
-        description.appendText("eqLine(\"" + text + "\")");
-    }
-
-    public static CommandArguments eqLine(final String line) {
-        return Mockito.argThat(new CommandArgsMatcher(line));
-    }
-}

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

@@ -62,7 +62,6 @@ public class DiskLoggingErrorManagerTest {
     public void setUp() throws Exception {
         when(error.getTimestamp()).thenReturn(LocalDateTime.now());
         when(error.getError()).thenReturn(programError);
-        when(programError.getThrowable()).thenReturn(Optional.of(new IllegalArgumentException()));
         when(programError.getThrowableAsString()).thenReturn(Optional.of("test"));
         when(programError.getLevel()).thenReturn(ErrorLevel.MEDIUM);
         when(config.getBinder()).thenReturn(configBinder);

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

@@ -38,6 +38,7 @@ import org.junit.runner.RunWith;
 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;
@@ -77,8 +78,7 @@ public class SentryLoggingErrorManagerTest {
     @Test
     public void testHandleErrorEvent() throws Exception {
         instance.handleErrorEvent(appErrorEvent);
-        verify(sentryErrorReporter).sendException(anyString(), any(ErrorLevel.class),
-                any(LocalDateTime.class), any());
+        verify(sentryErrorReporter).sendException(isNull(), isNull(), isNull(), any());
     }
 
     @Test
@@ -120,8 +120,7 @@ public class SentryLoggingErrorManagerTest {
         instance.handleSubmitErrors(true);
         instance.handleNoErrorReporting(false);
         instance.handleErrorEvent(appErrorEvent);
-        verify(sentryErrorReporter).sendException(anyString(), any(ErrorLevel.class),
-                any(LocalDateTime.class), any());
+        verify(sentryErrorReporter).sendException(isNull(), isNull(), isNull(), any());
     }
 
     @Test

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

@@ -252,7 +252,6 @@ public class WindowManagerTest {
         final CustomWindow customContainer = mock(CustomWindow.class);
         final CustomWindow customChild = mock(CustomWindow.class);
 
-        when(customContainer.getName()).thenReturn("test");
         when(customChild.getName()).thenReturn("test1");
 
         manager.addWindow(customContainer);
@@ -266,7 +265,6 @@ public class WindowManagerTest {
         final CustomWindow customContainer = mock(CustomWindow.class);
         final CustomWindow customChild = mock(CustomWindow.class);
 
-        when(customContainer.getName()).thenReturn("test");
         when(customChild.getName()).thenReturn("test1");
 
         manager.addWindow(customContainer);

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

@@ -66,7 +66,6 @@ public class CoreAliasDialogModelTest {
     @Before
     public void setupAliases() {
         aliases = new HashSet<>();
-        when(commandController.getCommandChar()).thenReturn('/');
     }
 
     @Before

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

@@ -56,7 +56,6 @@ public class RenameAliasValidatorTest {
     @Test
     public void testRenameSelected() {
         when(model.getSelectedAlias()).thenReturn(Optional.ofNullable(alias1));
-        when(model.getSelectedAliasName()).thenReturn("alias1");
         final RenameAliasValidator instance = new RenameAliasValidator(model);
         assertFalse(instance.validate("alias1").isFailure());
         assertTrue(instance.validate("alias2").isFailure());
@@ -67,7 +66,6 @@ public class RenameAliasValidatorTest {
     @Test
     public void testRenameNonSelected() {
         when(model.getSelectedAlias()).thenReturn(Optional.<Alias>empty());
-        when(model.getSelectedAliasName()).thenReturn(null);
         final RenameAliasValidator instance = new RenameAliasValidator(model);
         assertTrue(instance.validate("alias1").isFailure());
         assertTrue(instance.validate("alias2").isFailure());

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

@@ -47,7 +47,6 @@ public class CoreFeedbackDialogModelTest {
     private static final String FEEDBACK = "DMDirc Rocks.";
 
     @Mock private FeedbackSenderFactory feedbackSenderFactory;
-    @Mock private FeedbackSender feedbackSender;
     @Mock private FeedbackDialogModelListener listener;
     @Mock private FeedbackHelper feedbackHelper;
 
@@ -56,29 +55,27 @@ public class CoreFeedbackDialogModelTest {
     @Before
     public void setup() {
         instance = new CoreFeedbackDialogModel(feedbackSenderFactory, feedbackHelper);
-        when(feedbackSenderFactory.getFeedbackSender(anyString(), anyString(), anyString(),
-                anyString(), anyString(), anyString())).thenReturn(feedbackSender);
     }
 
     @Test
     public void testName() {
         assertEquals("testName", Optional.<String>empty(), instance.getName());
-        instance.setName(Optional.ofNullable(NAME));
-        assertEquals("testName", Optional.ofNullable(NAME), instance.getName());
+        instance.setName(Optional.of(NAME));
+        assertEquals("testName", Optional.of(NAME), instance.getName());
     }
 
     @Test
     public void testEmail() {
         assertEquals("testEmail", Optional.<String>empty(), instance.getEmail());
-        instance.setEmail(Optional.ofNullable(EMAIL));
-        assertEquals("testEmail", Optional.ofNullable(EMAIL), instance.getEmail());
+        instance.setEmail(Optional.of(EMAIL));
+        assertEquals("testEmail", Optional.of(EMAIL), instance.getEmail());
     }
 
     @Test
     public void testFeedback() {
         assertEquals("testFeedback", Optional.<String>empty(), instance.getFeedback());
-        instance.setFeedback(Optional.ofNullable(FEEDBACK));
-        assertEquals("testFeedback", Optional.ofNullable(FEEDBACK), instance.getFeedback());
+        instance.setFeedback(Optional.of(FEEDBACK));
+        assertEquals("testFeedback", Optional.of(FEEDBACK), instance.getFeedback());
     }
 
     @Test
@@ -99,9 +96,9 @@ public class CoreFeedbackDialogModelTest {
     public void testSaveWithoutServerWithoutDMDirc() {
         instance.setIncludeDMDircInfo(false);
         instance.setIncludeServerInfo(false);
-        instance.setName(Optional.ofNullable(NAME));
-        instance.setEmail(Optional.ofNullable(EMAIL));
-        instance.setFeedback(Optional.ofNullable(FEEDBACK));
+        instance.setName(Optional.of(NAME));
+        instance.setEmail(Optional.of(EMAIL));
+        instance.setFeedback(Optional.of(FEEDBACK));
         instance.save();
         verify(feedbackSenderFactory).getFeedbackSender(NAME, EMAIL, FEEDBACK,
                 feedbackHelper.getVersion(), "", "");
@@ -111,9 +108,9 @@ public class CoreFeedbackDialogModelTest {
     public void testSaveWithoutServerWithDMDirc() {
         instance.setIncludeDMDircInfo(true);
         instance.setIncludeServerInfo(false);
-        instance.setName(Optional.ofNullable(NAME));
-        instance.setEmail(Optional.ofNullable(EMAIL));
-        instance.setFeedback(Optional.ofNullable(FEEDBACK));
+        instance.setName(Optional.of(NAME));
+        instance.setEmail(Optional.of(EMAIL));
+        instance.setFeedback(Optional.of(FEEDBACK));
         instance.save();
         verify(feedbackSenderFactory).getFeedbackSender(NAME, EMAIL, FEEDBACK,
                 feedbackHelper.getVersion(), "", feedbackHelper.getDMDircInfo());
@@ -123,9 +120,9 @@ public class CoreFeedbackDialogModelTest {
     public void testSaveWithoutDMDircWithServer() {
         instance.setIncludeDMDircInfo(false);
         instance.setIncludeServerInfo(true);
-        instance.setName(Optional.ofNullable(NAME));
-        instance.setEmail(Optional.ofNullable(EMAIL));
-        instance.setFeedback(Optional.ofNullable(FEEDBACK));
+        instance.setName(Optional.of(NAME));
+        instance.setEmail(Optional.of(EMAIL));
+        instance.setFeedback(Optional.of(FEEDBACK));
         instance.save();
         verify(feedbackSenderFactory).getFeedbackSender(NAME, EMAIL, FEEDBACK,
                 feedbackHelper.getVersion(), feedbackHelper.getServerInfo(), "");
@@ -135,9 +132,9 @@ public class CoreFeedbackDialogModelTest {
     public void testSaveWithServerWithDMDirc() {
         instance.setIncludeDMDircInfo(true);
         instance.setIncludeServerInfo(true);
-        instance.setName(Optional.ofNullable(NAME));
-        instance.setEmail(Optional.ofNullable(EMAIL));
-        instance.setFeedback(Optional.ofNullable(FEEDBACK));
+        instance.setName(Optional.of(NAME));
+        instance.setEmail(Optional.of(EMAIL));
+        instance.setFeedback(Optional.of(FEEDBACK));
         instance.save();
         verify(feedbackSenderFactory).getFeedbackSender(NAME, EMAIL, FEEDBACK,
                 feedbackHelper.getVersion(), feedbackHelper.getServerInfo(),
@@ -147,22 +144,22 @@ public class CoreFeedbackDialogModelTest {
     @Test
     public void testNameListener() {
         instance.addListener(listener);
-        instance.setName(Optional.ofNullable(NAME));
-        verify(listener).nameChanged(Optional.ofNullable(NAME));
+        instance.setName(Optional.of(NAME));
+        verify(listener).nameChanged(Optional.of(NAME));
     }
 
     @Test
     public void testEmailListener() {
         instance.addListener(listener);
-        instance.setEmail(Optional.ofNullable(EMAIL));
-        verify(listener).emailChanged(Optional.ofNullable(EMAIL));
+        instance.setEmail(Optional.of(EMAIL));
+        verify(listener).emailChanged(Optional.of(EMAIL));
     }
 
     @Test
     public void testFeedbackListener() {
         instance.addListener(listener);
-        instance.setFeedback(Optional.ofNullable(FEEDBACK));
-        verify(listener).feedbackChanged(Optional.ofNullable(FEEDBACK));
+        instance.setFeedback(Optional.of(FEEDBACK));
+        verify(listener).feedbackChanged(Optional.of(FEEDBACK));
     }
 
     @Test

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

@@ -52,9 +52,7 @@ public class AddNicknameValidatorTest {
         when(model.getSelectedProfile())
                 .thenReturn(Optional.ofNullable(profile));
         when(model.getSelectedProfileNicknames())
-                .thenReturn(Optional.ofNullable(nicknames));
-        when(model.getSelectedProfileSelectedNickname())
-                .thenReturn(Optional.ofNullable("nickname2"));
+                .thenReturn(Optional.of(nicknames));
     }
 
     @Test

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

@@ -52,7 +52,6 @@ public class EditSelectedProfileNameValidatorTest {
     public void setupModel() {
         final List<MutableProfile> profiles = Lists.newArrayList(profile1, profile2, profile3);
         when(profile1.getName()).thenReturn("profile1");
-        when(profile2.getName()).thenReturn("profile2");
         when(profile3.getName()).thenReturn("profile3");
         when(model.getProfileList()).thenReturn(profiles);
         when(model.getSelectedProfile()).thenReturn(Optional.ofNullable(profile2));

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

@@ -55,7 +55,6 @@ public class NewProfileNameValidatorTest {
         when(profile2.getName()).thenReturn("profile2");
         when(profile3.getName()).thenReturn("profile3");
         when(model.getProfileList()).thenReturn(profiles);
-        when(model.getSelectedProfile()).thenReturn(Optional.ofNullable(profile2));
     }
 
     @Test

src/test/java/com/dmdirc/updater/manager/UpdateManagerImplTest.java

@@ -111,7 +111,6 @@ public class UpdateManagerImplTest {
     @Test
     public void testGetNoRetrievalStrategy() {
         // Given a retrieval strategies that can handle a specific check result
-        when(strategy1.canHandle(checkResult1)).thenReturn(true);
         manager.addRetrievalStrategy(strategy1);
 
         // Then null is returned for other check results