Skip to content

Commit 2b41fe4

Browse files
committed
Fix transaction failure tests using mock
Now we have to mock Protocol#read(RedisInputStream, ClientSideCache) instead of Protocol#read(RedisInputStream).
1 parent 6d4930f commit 2b41fe4

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/test/java/redis/clients/jedis/commands/jedis/TransactionCommandsTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static org.junit.Assert.*;
44

5-
import static org.mockito.ArgumentMatchers.any;
65
import static redis.clients.jedis.Protocol.Command.INCR;
76
import static redis.clients.jedis.Protocol.Command.GET;
87
import static redis.clients.jedis.Protocol.Command.SET;
@@ -15,6 +14,7 @@
1514
import org.junit.After;
1615
import org.junit.Before;
1716
import org.junit.Test;
17+
import org.mockito.ArgumentMatchers;
1818
import org.mockito.MockedStatic;
1919
import org.mockito.Mockito;
2020

@@ -159,7 +159,9 @@ public void discardFail() {
159159
trans.set("b", "b");
160160

161161
try (MockedStatic<Protocol> protocol = Mockito.mockStatic(Protocol.class)) {
162-
protocol.when(() -> Protocol.read(any())).thenThrow(JedisConnectionException.class);
162+
//protocol.when(() -> Protocol.read(any())).thenThrow(JedisConnectionException.class);
163+
protocol.when(() -> Protocol.read(ArgumentMatchers.any(), ArgumentMatchers.isNull()))
164+
.thenThrow(JedisConnectionException.class);
163165

164166
trans.discard();
165167
fail("Should get mocked JedisConnectionException.");
@@ -179,7 +181,9 @@ public void execFail() {
179181
trans.set("b", "b");
180182

181183
try (MockedStatic<Protocol> protocol = Mockito.mockStatic(Protocol.class)) {
182-
protocol.when(() -> Protocol.read(any())).thenThrow(JedisConnectionException.class);
184+
//protocol.when(() -> Protocol.read(any())).thenThrow(JedisConnectionException.class);
185+
protocol.when(() -> Protocol.read(ArgumentMatchers.any(), ArgumentMatchers.isNull()))
186+
.thenThrow(JedisConnectionException.class);
183187

184188
trans.exec();
185189
fail("Should get mocked JedisConnectionException.");

0 commit comments

Comments
 (0)