From bc7e1d1ae54a2eb39990d651c4db49ada7660063 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Mon, 2 Mar 2020 14:38:51 +0300 Subject: [PATCH] tests fixed --- .../java/org/redisson/RedissonBatchTest.java | 20 +++++++++---------- .../org/redisson/rx/RedissonBatchRxTest.java | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/redisson/src/test/java/org/redisson/RedissonBatchTest.java b/redisson/src/test/java/org/redisson/RedissonBatchTest.java index 83630cf5e..a08b88712 100644 --- a/redisson/src/test/java/org/redisson/RedissonBatchTest.java +++ b/redisson/src/test/java/org/redisson/RedissonBatchTest.java @@ -105,11 +105,11 @@ public class RedissonBatchTest extends BaseTest { RedissonClient redisson = Redisson.create(config); ExecutorService executorService = Executors.newFixedThreadPool(5); - AtomicInteger counter = new AtomicInteger(5*100); + AtomicInteger counter = new AtomicInteger(5*150); AtomicBoolean hasErrors = new AtomicBoolean(); for (int i = 0; i < 5; i++) { executorService.submit(() -> { - for (int j = 0 ; j < 100; j++) { + for (int j = 0 ; j < 150; j++) { executeBatch(redisson).whenComplete((r, e) -> { counter.decrementAndGet(); if (e != null) { @@ -120,7 +120,7 @@ public class RedissonBatchTest extends BaseTest { }); } - Awaitility.await().atMost(5, TimeUnit.SECONDS).until(() -> counter.get() == 0); + Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> counter.get() == 0); Assertions.assertThat(hasErrors).isTrue(); executeBatch(redisson).syncUninterruptibly(); @@ -187,15 +187,15 @@ public class RedissonBatchTest extends BaseTest { public void testConnectionLeakAfterError() throws InterruptedException { Config config = createConfig(); config.useSingleServer() - .setRetryInterval(1500) - .setTimeout(3000) + .setRetryInterval(100) + .setTimeout(200) .setConnectionMinimumIdleSize(1).setConnectionPoolSize(1); RedissonClient redisson = Redisson.create(config); BatchOptions batchOptions = BatchOptions.defaults().executionMode(ExecutionMode.REDIS_WRITE_ATOMIC); RBatch batch = redisson.createBatch(batchOptions); - for (int i = 0; i < 300000; i++) { + for (int i = 0; i < 25000; i++) { batch.getBucket("test").setAsync(123); } @@ -281,12 +281,12 @@ public class RedissonBatchTest extends BaseTest { @Test public void testWriteTimeout() { Config config = createConfig(); - config.useSingleServer().setTimeout(3000); + config.useSingleServer().setRetryInterval(700).setTimeout(1500); RedissonClient redisson = Redisson.create(config); RBatch batch = redisson.createBatch(batchOptions); RMapCacheAsync map = batch.getMapCache("test"); - int total = 200000; + int total = 10000; for (int i = 0; i < total; i++) { RFuture f = map.putAsync("" + i, "" + i, 5, TimeUnit.MINUTES); if (batchOptions.getExecutionMode() == ExecutionMode.REDIS_WRITE_ATOMIC) { @@ -298,9 +298,9 @@ public class RedissonBatchTest extends BaseTest { batch.execute(); long executionTime = System.currentTimeMillis() - s; if (batchOptions.getExecutionMode() == ExecutionMode.IN_MEMORY) { - assertThat(executionTime).isLessThan(22000); + assertThat(executionTime).isLessThan(1000); } else { - assertThat(executionTime).isLessThan(3500); + assertThat(executionTime).isLessThan(300); } assertThat(redisson.getMapCache("test").size()).isEqualTo(total); redisson.shutdown(); diff --git a/redisson/src/test/java/org/redisson/rx/RedissonBatchRxTest.java b/redisson/src/test/java/org/redisson/rx/RedissonBatchRxTest.java index 46bfb04b5..482448f77 100644 --- a/redisson/src/test/java/org/redisson/rx/RedissonBatchRxTest.java +++ b/redisson/src/test/java/org/redisson/rx/RedissonBatchRxTest.java @@ -132,15 +132,15 @@ public class RedissonBatchRxTest extends BaseRxTest { public void testConnectionLeakAfterError() throws InterruptedException { Config config = BaseTest.createConfig(); config.useSingleServer() - .setRetryInterval(1500) - .setTimeout(3000) + .setRetryInterval(100) + .setTimeout(200) .setConnectionMinimumIdleSize(1).setConnectionPoolSize(1); RedissonRxClient redisson = Redisson.createRx(config); BatchOptions batchOptions = BatchOptions.defaults().executionMode(ExecutionMode.REDIS_WRITE_ATOMIC); RBatchRx batch = redisson.createBatch(batchOptions); - for (int i = 0; i < 300000; i++) { + for (int i = 0; i < 25000; i++) { batch.getBucket("test").set(123); } @@ -226,12 +226,12 @@ public class RedissonBatchRxTest extends BaseRxTest { @Test public void testWriteTimeout() throws InterruptedException { Config config = BaseTest.createConfig(); - config.useSingleServer().setTimeout(3000); + config.useSingleServer().setRetryInterval(700).setTimeout(1500); RedissonRxClient redisson = Redisson.createRx(config); RBatchRx batch = redisson.createBatch(batchOptions); RMapCacheRx map = batch.getMapCache("test"); - int total = 200000; + int total = 10000; for (int i = 0; i < total; i++) { map.put("" + i, "" + i, 5, TimeUnit.MINUTES); if (batchOptions.getExecutionMode() == ExecutionMode.REDIS_WRITE_ATOMIC) { @@ -245,9 +245,9 @@ public class RedissonBatchRxTest extends BaseRxTest { sync(batch.execute()); long executionTime = System.currentTimeMillis() - s; if (batchOptions.getExecutionMode() == ExecutionMode.IN_MEMORY) { - assertThat(executionTime).isLessThan(27000); + assertThat(executionTime).isLessThan(1000); } else { - assertThat(executionTime).isLessThan(3500); + assertThat(executionTime).isLessThan(300); } assertThat(sync(redisson.getMapCache("test").size())).isEqualTo(total); redisson.shutdown();