projects
/
xudocci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move reply mocking into its own helper class.
[xudocci.git]
/
src
/
test
/
java
/
net
/
pterodactylus
/
irc
/
connection
/
ChannelNotJoinedHandlerTest.java
diff --git
a/src/test/java/net/pterodactylus/irc/connection/ChannelNotJoinedHandlerTest.java
b/src/test/java/net/pterodactylus/irc/connection/ChannelNotJoinedHandlerTest.java
index
3c27ebc
..
0a7ef98
100644
(file)
--- a/
src/test/java/net/pterodactylus/irc/connection/ChannelNotJoinedHandlerTest.java
+++ b/
src/test/java/net/pterodactylus/irc/connection/ChannelNotJoinedHandlerTest.java
@@
-1,6
+1,7
@@
package net.pterodactylus.irc.connection;
import static java.util.Arrays.asList;
package net.pterodactylus.irc.connection;
import static java.util.Arrays.asList;
+import static net.pterodactylus.irc.connection.Replies.createReply;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.badChannelKey;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.inviteOnly;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.badChannelKey;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.inviteOnly;
@@
-10,10
+11,8
@@
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentCaptor.forClass;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.ArgumentCaptor.forClass;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
import net.pterodactylus.irc.Connection;
import net.pterodactylus.irc.Connection;
-import net.pterodactylus.irc.Reply;
import net.pterodactylus.irc.event.ChannelNotJoined;
import net.pterodactylus.irc.event.ChannelNotJoined.Reason;
import net.pterodactylus.irc.event.ChannelNotJoined;
import net.pterodactylus.irc.event.ChannelNotJoined.Reason;
@@
-48,11
+47,6
@@
public class ChannelNotJoinedHandlerTest {
}
}
}
}
- private Reply createReply(String command) {
- Reply reply = mock(Reply.class);
- return when(reply.command()).thenReturn(command).getMock();
- }
-
@Test
public void bannedChannelNotJoinedIsRecognizedCorrectly() {
handler.handleReply(createReply("474", "#test"));
@Test
public void bannedChannelNotJoinedIsRecognizedCorrectly() {
handler.handleReply(createReply("474", "#test"));
@@
-86,11
+80,4
@@
public class ChannelNotJoinedHandlerTest {
verifyReasonIs(registeredNicknamesOnly);
}
verifyReasonIs(registeredNicknamesOnly);
}
- private Reply createReply(String command, String channel) {
- final Reply reply = mock(Reply.class);
- when(reply.command()).thenReturn(command);
- when(reply.parameters()).thenReturn(asList(":some.server", channel));
- return reply;
- }
-
}
}