|
@@ -23,18 +23,23 @@
|
23
|
23
|
package com.dmdirc.parser.irc.processors;
|
24
|
24
|
|
25
|
25
|
import com.dmdirc.harness.parser.TestParser;
|
26
|
|
-import com.dmdirc.parser.common.ParserError;
|
27
|
|
-import com.dmdirc.parser.interfaces.ClientInfo;
|
28
|
|
-import com.dmdirc.parser.interfaces.Parser;
|
|
26
|
+import com.dmdirc.parser.common.CallbackNotFoundException;
|
|
27
|
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
|
29
|
28
|
import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
|
30
|
29
|
import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
|
31
|
|
-import com.dmdirc.parser.common.CallbackNotFoundException;
|
32
|
|
-import com.dmdirc.parser.irc.IRCChannelClientInfo;
|
33
|
30
|
|
34
|
|
-import java.util.Date;
|
35
|
31
|
import org.junit.Test;
|
36
|
|
-import static org.junit.Assert.*;
|
37
|
|
-import static org.mockito.Mockito.*;
|
|
32
|
+
|
|
33
|
+import static org.junit.Assert.assertEquals;
|
|
34
|
+import static org.junit.Assert.assertFalse;
|
|
35
|
+import static org.junit.Assert.assertNotNull;
|
|
36
|
+import static org.mockito.Mockito.anyObject;
|
|
37
|
+import static org.mockito.Mockito.anyString;
|
|
38
|
+import static org.mockito.Mockito.eq;
|
|
39
|
+import static org.mockito.Mockito.mock;
|
|
40
|
+import static org.mockito.Mockito.never;
|
|
41
|
+import static org.mockito.Mockito.same;
|
|
42
|
+import static org.mockito.Mockito.verify;
|
38
|
43
|
|
39
|
44
|
public class ProcessNickTest {
|
40
|
45
|
|
|
@@ -55,11 +60,11 @@ public class ProcessNickTest {
|
55
|
60
|
assertNotNull(parser.getClient("LUSER"));
|
56
|
61
|
assertEquals(1, parser.getClient("LUSER").getChannelClients().size());
|
57
|
62
|
|
58
|
|
- final IRCChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
|
|
63
|
+ final ChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
|
59
|
64
|
assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
|
60
|
65
|
assertEquals("+", cci.getAllModesPrefix());
|
61
|
66
|
|
62
|
|
- verify(tinc).onNickChanged(same(parser), (Date) anyObject(),
|
|
67
|
+ verify(tinc).onNickChanged(same(parser), anyObject(),
|
63
|
68
|
same(parser.getClient("LUSER")), eq("luser"));
|
64
|
69
|
}
|
65
|
70
|
|
|
@@ -77,7 +82,7 @@ public class ProcessNickTest {
|
77
|
82
|
assertFalse(parser.isKnownClient("luser"));
|
78
|
83
|
assertEquals(1, parser.getClient("foobar").getChannelClients().size());
|
79
|
84
|
|
80
|
|
- final IRCChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
|
|
85
|
+ final ChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
|
81
|
86
|
assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
|
82
|
87
|
assertEquals("+", cci.getAllModesPrefix());
|
83
|
88
|
}
|
|
@@ -94,7 +99,7 @@ public class ProcessNickTest {
|
94
|
99
|
parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
|
95
|
100
|
parser.injectLine(":luser!lu@ser.com NICK nick3");
|
96
|
101
|
|
97
|
|
- verify(info).onErrorInfo(same(parser), (Date) anyObject(), (ParserError) anyObject());
|
|
102
|
+ verify(info).onErrorInfo(same(parser), anyObject(), anyObject());
|
98
|
103
|
}
|
99
|
104
|
|
100
|
105
|
@Test
|
|
@@ -107,8 +112,7 @@ public class ProcessNickTest {
|
107
|
112
|
parser.injectConnectionStrings();
|
108
|
113
|
parser.injectLine(":random!lu@ser NICK rand");
|
109
|
114
|
|
110
|
|
- verify(tinc, never()).onNickChanged((Parser) anyObject(),
|
111
|
|
- (Date) anyObject(), (ClientInfo) anyObject(), anyString());
|
|
115
|
+ verify(tinc, never()).onNickChanged(anyObject(), anyObject(), anyObject(), anyString());
|
112
|
116
|
}
|
113
|
117
|
|
114
|
118
|
}
|