提交 e124acfe 编写于 作者: N Nikita Koksharov

tests fixed

上级 56ab865c
...@@ -21,7 +21,7 @@ public class RedissonBucketTest extends BaseTest { ...@@ -21,7 +21,7 @@ public class RedissonBucketTest extends BaseTest {
public void testSizeInMemory() { public void testSizeInMemory() {
RBucket<Integer> al = redisson.getBucket("test"); RBucket<Integer> al = redisson.getBucket("test");
al.set(1234); al.set(1234);
assertThat(al.sizeInMemory()).isEqualTo(49); assertThat(al.sizeInMemory()).isEqualTo(55);
} }
@Test @Test
......
...@@ -19,6 +19,7 @@ import org.junit.Assert; ...@@ -19,6 +19,7 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.redisson.api.RLock; import org.redisson.api.RLock;
import org.redisson.api.RScript; import org.redisson.api.RScript;
import org.redisson.client.codec.LongCodec;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -96,7 +97,7 @@ public class RedissonFairLockTest extends BaseConcurrentTest { ...@@ -96,7 +97,7 @@ public class RedissonFairLockTest extends BaseConcurrentTest {
Assert.fail("Lock should have been unlocked by now"); Assert.fail("Lock should have been unlocked by now");
} }
//check the timeout scores - they should all be within a reasonable amount of time from now //check the timeout scores - they should all be within a reasonable amount of time from now
List<Long> queue = redisson.getScript().eval(RScript.Mode.READ_ONLY, List<Long> queue = redisson.getScript(LongCodec.INSTANCE).eval(RScript.Mode.READ_ONLY,
"local result = {}; " + "local result = {}; " +
"local timeouts = redis.call('zrange', KEYS[1], 0, 99, 'WITHSCORES'); " + "local timeouts = redis.call('zrange', KEYS[1], 0, 99, 'WITHSCORES'); " +
"for i=1,#timeouts,2 do " + "for i=1,#timeouts,2 do " +
......
...@@ -52,16 +52,16 @@ public class RedissonScriptTest extends BaseTest { ...@@ -52,16 +52,16 @@ public class RedissonScriptTest extends BaseTest {
@Test @Test
public void testEval() { public void testEval() {
RScript script = redisson.getScript(); RScript script = redisson.getScript(StringCodec.INSTANCE);
List<Object> res = script.eval(RScript.Mode.READ_ONLY, "return {1,2,3.3333,'\"foo\"',nil,'bar'}", RScript.ReturnType.MULTI, Collections.emptyList()); List<Object> res = script.eval(RScript.Mode.READ_ONLY, "return {'1','2','3.3333','foo',nil,'bar'}", RScript.ReturnType.MULTI, Collections.emptyList());
assertThat(res).containsExactly(1L, 2L, 3L, "foo"); assertThat(res).containsExactly("1", "2", "3.3333", "foo");
} }
@Test @Test
public void testEvalAsync() { public void testEvalAsync() {
RScript script = redisson.getScript(); RScript script = redisson.getScript(StringCodec.INSTANCE);
RFuture<List<Object>> res = script.evalAsync(RScript.Mode.READ_ONLY, "return {1,2,3.3333,'\"foo\"',nil,'bar'}", RScript.ReturnType.MULTI, Collections.emptyList()); RFuture<List<Object>> res = script.evalAsync(RScript.Mode.READ_ONLY, "return {'1','2','3.3333','foo',nil,'bar'}", RScript.ReturnType.MULTI, Collections.emptyList());
assertThat(res.awaitUninterruptibly().getNow()).containsExactly(1L, 2L, 3L, "foo"); assertThat(res.awaitUninterruptibly().getNow()).containsExactly("1", "2", "3.3333", "foo");
} }
@Test @Test
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
public class CallableTask implements Callable<String> { public class CallableTask implements Callable<String>, Serializable {
public static final String RESULT = "callable"; public static final String RESULT = "callable";
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import org.redisson.api.RAtomicLong; import org.redisson.api.RAtomicLong;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RInject; import org.redisson.api.annotation.RInject;
public class DelayedTask implements Callable<Object> { public class DelayedTask implements Callable<Object>, Serializable {
@RInject @RInject
private RedissonClient redisson; private RedissonClient redisson;
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RInject; import org.redisson.api.annotation.RInject;
public class IncrementCallableTask implements Callable<String> { public class IncrementCallableTask implements Callable<String>, Serializable {
private String counterName; private String counterName;
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RInject; import org.redisson.api.annotation.RInject;
public class IncrementRunnableTask implements Runnable { public class IncrementRunnableTask implements Runnable, Serializable {
private String counterName; private String counterName;
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
public class ParameterizedTask implements Callable<String> { public class ParameterizedTask implements Callable<String>, Serializable {
private String param; private String param;
......
...@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await; import static org.awaitility.Awaitility.await;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -515,7 +516,7 @@ public class RedissonExecutorServiceTest extends BaseTest { ...@@ -515,7 +516,7 @@ public class RedissonExecutorServiceTest extends BaseTest {
redisson.getExecutorService("test").submit(new TaskCallableClass()); redisson.getExecutorService("test").submit(new TaskCallableClass());
} }
public static class TaskStaticCallableClass implements Callable<String> { public static class TaskStaticCallableClass implements Callable<String>, Serializable {
@Override @Override
public String call() throws Exception { public String call() throws Exception {
...@@ -530,7 +531,7 @@ public class RedissonExecutorServiceTest extends BaseTest { ...@@ -530,7 +531,7 @@ public class RedissonExecutorServiceTest extends BaseTest {
assertThat(res).isEqualTo("123"); assertThat(res).isEqualTo("123");
} }
public class TaskRunnableClass implements Runnable { public class TaskRunnableClass implements Runnable, Serializable {
@Override @Override
public void run() { public void run() {
...@@ -543,7 +544,7 @@ public class RedissonExecutorServiceTest extends BaseTest { ...@@ -543,7 +544,7 @@ public class RedissonExecutorServiceTest extends BaseTest {
redisson.getExecutorService("test").submit(new TaskRunnableClass()); redisson.getExecutorService("test").submit(new TaskRunnableClass());
} }
public static class TaskStaticRunnableClass implements Runnable { public static class TaskStaticRunnableClass implements Runnable, Serializable {
@Override @Override
public void run() { public void run() {
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RInject; import org.redisson.api.annotation.RInject;
public class RunnableRedissonTask implements Runnable { public class RunnableRedissonTask implements Runnable, Serializable {
@RInject @RInject
private RedissonClient redissonClient; private RedissonClient redissonClient;
......
package org.redisson.executor; package org.redisson.executor;
public class RunnableTask implements Runnable { import java.io.Serializable;
public class RunnableTask implements Runnable, Serializable {
@Override @Override
public void run() { public void run() {
......
...@@ -2,7 +2,7 @@ package org.redisson.executor; ...@@ -2,7 +2,7 @@ package org.redisson.executor;
import java.io.Serializable; import java.io.Serializable;
public class RunnableTask2 implements Runnable { public class RunnableTask2 implements Runnable, Serializable {
private static final long serialVersionUID = 2105094575950438867L; private static final long serialVersionUID = 2105094575950438867L;
......
package org.redisson.executor; package org.redisson.executor;
import java.io.Serializable;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.api.annotation.RInject; import org.redisson.api.annotation.RInject;
public class ScheduledLongRunnableTask implements Runnable { public class ScheduledLongRunnableTask implements Runnable, Serializable {
@RInject @RInject
private RedissonClient redisson; private RedissonClient redisson;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册