Browse Source

Fix redirect command test.

pull/240/head
Chris Smith 9 years ago
parent
commit
19ebf872cc
1 changed files with 10 additions and 12 deletions
  1. 10
    12
      redirect/test/com/dmdirc/addons/redirect/RedirectCommandTest.java

+ 10
- 12
redirect/test/com/dmdirc/addons/redirect/RedirectCommandTest.java View File

29
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
29
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
30
 import com.dmdirc.commandparser.commands.global.Echo;
30
 import com.dmdirc.commandparser.commands.global.Echo;
31
 import com.dmdirc.commandparser.parsers.CommandParser;
31
 import com.dmdirc.commandparser.parsers.CommandParser;
32
+import com.dmdirc.config.ConfigBinder;
32
 import com.dmdirc.interfaces.CommandController;
33
 import com.dmdirc.interfaces.CommandController;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
34
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
34
 import com.dmdirc.interfaces.ui.InputWindow;
35
 import com.dmdirc.interfaces.ui.InputWindow;
35
 import com.dmdirc.ui.WindowManager;
36
 import com.dmdirc.ui.WindowManager;
36
-import com.dmdirc.ui.messages.BackBufferFactory;
37
 import com.dmdirc.ui.input.TabCompleter;
37
 import com.dmdirc.ui.input.TabCompleter;
38
 import com.dmdirc.ui.input.TabCompleterUtils;
38
 import com.dmdirc.ui.input.TabCompleterUtils;
39
+import com.dmdirc.ui.messages.BackBufferFactory;
39
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
40
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
40
 import com.dmdirc.util.URLBuilder;
41
 import com.dmdirc.util.URLBuilder;
41
 
42
 
45
 import org.junit.Test;
46
 import org.junit.Test;
46
 import org.junit.runner.RunWith;
47
 import org.junit.runner.RunWith;
47
 import org.mockito.Mock;
48
 import org.mockito.Mock;
48
-import org.mockito.invocation.InvocationOnMock;
49
 import org.mockito.runners.MockitoJUnitRunner;
49
 import org.mockito.runners.MockitoJUnitRunner;
50
-import org.mockito.stubbing.Answer;
51
 
50
 
52
 import static org.mockito.Matchers.any;
51
 import static org.mockito.Matchers.any;
53
 import static org.mockito.Matchers.eq;
52
 import static org.mockito.Matchers.eq;
63
     @Mock private CommandController commandController;
62
     @Mock private CommandController commandController;
64
     @Mock private FrameContainer frameContainer;
63
     @Mock private FrameContainer frameContainer;
65
     @Mock private AggregateConfigProvider configProvider;
64
     @Mock private AggregateConfigProvider configProvider;
65
+    @Mock private ConfigBinder configBinder;
66
     @Mock private CommandParser commandParser;
66
     @Mock private CommandParser commandParser;
67
     @Mock private TabCompleter tabCompleter;
67
     @Mock private TabCompleter tabCompleter;
68
     @Mock private MessageSinkManager messageSinkManager;
68
     @Mock private MessageSinkManager messageSinkManager;
83
         when(target.getTabCompleter()).thenReturn(tabCompleter);
83
         when(target.getTabCompleter()).thenReturn(tabCompleter);
84
         when(configProvider.hasOptionString("formatter", "commandOutput")).thenReturn(true);
84
         when(configProvider.hasOptionString("formatter", "commandOutput")).thenReturn(true);
85
         when(configProvider.getOption("formatter", "commandOutput")).thenReturn("%1$s");
85
         when(configProvider.getOption("formatter", "commandOutput")).thenReturn("%1$s");
86
-        doAnswer(new Answer<Void>() {
87
-            @Override
88
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
89
-                new Echo(commandController, windowManager).execute(
90
-                        (FrameContainer) invocation.getArguments()[0],
91
-                        new CommandArguments(commandController, "/echo test"),
92
-                        null);
93
-                return null;
94
-            }
86
+        when(configProvider.getBinder()).thenReturn(configBinder);
87
+        doAnswer(invocation -> {
88
+            new Echo(commandController, windowManager).execute(
89
+                    (FrameContainer) invocation.getArguments()[0],
90
+                    new CommandArguments(commandController, "/echo test"),
91
+                    null);
92
+            return null;
95
         }).when(commandParser).parseCommand(any(FrameContainer.class), eq("/echo test"));
93
         }).when(commandParser).parseCommand(any(FrameContainer.class), eq("/echo test"));
96
     }
94
     }
97
 
95
 

Loading…
Cancel
Save