Merge pull request #13 from lchayoun/addMissingTests

added spring data tests

Author: marcosbarbero

spring-cloud-zuul-ratelimit-core/src/test/java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/BaseRateLimitFilterTest.java

@@ -1,13 +1,21 @@
 package com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.filters;
 
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS;
+
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimiter;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.properties.Policy;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.properties.RateLimitProperties;
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.InMemoryRateLimiter;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.filters.commons.TestRouteLocator;
 import com.netflix.zuul.context.RequestContext;
 import com.netflix.zuul.monitoring.CounterFactory;
-
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.cloud.netflix.zuul.filters.Route;
@@ -16,30 +24,19 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS;
-
 /**
  * @author Marcos Barbero
  * @since 2017-06-30
  */
-public class BaseRateLimitFilterTest {
+public abstract class BaseRateLimitFilterTest {
 
     RateLimitFilter filter;
 
     MockHttpServletRequest request;
     MockHttpServletResponse response;
 
-    private RequestContext context = RequestContext.getCurrentContext();
-    private RateLimiter rateLimiter = new InMemoryRateLimiter();
+    private RequestContext context;
+    private RateLimiter rateLimiter;
 
     private Route createRoute(String id, String path) {
         return new Route(id, path, null, null, false, Collections.emptySet());
@@ -78,6 +75,8 @@ public void setUp() {
         this.request = new MockHttpServletRequest();
         this.response = new MockHttpServletResponse();
         this.filter = new RateLimitFilter(this.rateLimiter, this.properties(), this.routeLocator());
+        this.context = new RequestContext();
+        RequestContext.testSetCurrentContext(this.context);
         this.context.clear();
         this.context.setRequest(this.request);
         this.context.setResponse(this.response);
@@ -97,7 +96,7 @@ public void testRateLimit() throws Exception {
         String remaining = this.response.getHeader(RateLimitFilter.Headers.REMAINING);
         assertEquals("0", remaining);
 
-        TimeUnit.SECONDS.sleep(2);
+        TimeUnit.SECONDS.sleep(3);
 
         this.filter.run();
         remaining = this.response.getHeader(RateLimitFilter.Headers.REMAINING);

spring-cloud-zuul-ratelimit-core/src/test/java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/ConsulRateLimitFilterTest.java

@@ -24,7 +24,7 @@
  */
 public class ConsulRateLimitFilterTest extends BaseRateLimitFilterTest {
 
-    private ConsulClient consulClient = mock(ConsulClient.class);
+    private ConsulClient consulClient;
     private ObjectMapper objectMapper = new ObjectMapper();
 
     private Rate rate(long remaining) {
@@ -34,6 +34,7 @@ private Rate rate(long remaining) {
     @Before
     @Override
     public void setUp() {
+        consulClient = mock(ConsulClient.class);
         this.setRateLimiter(new ConsulRateLimiter(this.consulClient, this.objectMapper));
         super.setUp();
     }

spring-cloud-zuul-ratelimit-core/src/test/java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/InMemoryRateLimitFilterTest.java

@@ -13,8 +13,8 @@ public class InMemoryRateLimitFilterTest extends BaseRateLimitFilterTest {
     @Before
     @Override
     public void setUp() {
-        this.setRateLimiter(new InMemoryRateLimiter());
+        InMemoryRateLimiter rateLimiter = new InMemoryRateLimiter();
+        this.setRateLimiter(rateLimiter);
         super.setUp();
     }
-
 }

spring-cloud-zuul-ratelimit-core/src/test/java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/RedisRateLimitFilterTest.java

@@ -1,32 +1,31 @@
 package com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.filters;
 
-import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.RedisRateLimiter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.data.redis.core.BoundValueOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import java.util.concurrent.TimeUnit;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.RedisRateLimiter;
+import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+
 /**
  * @author Marcos Barbero
  * @since 2017-06-30
  */
 public class RedisRateLimitFilterTest extends BaseRateLimitFilterTest {
 
-    private RedisTemplate redisTemplate = mock(RedisTemplate.class);
+    private RedisTemplate redisTemplate;
 
     @Before
     @Override
     public void setUp() {
+        redisTemplate = mock(RedisTemplate.class);
         this.setRateLimiter(new RedisRateLimiter(this.redisTemplate));
         super.setUp();
     }

spring-cloud-zuul-ratelimit-core/src/test/java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/SpringDataLimitFilterTest.java

@@ -0,0 +1,37 @@
+package com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.filters;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.Rate;
+import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.springdata.IRateLimiterRepository;
+import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.springdata.SpringDataRateLimiter;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.junit.Before;
+
+/**
+ * @author Marcos Barbero
+ * @since 2017-06-30
+ */
+public class SpringDataLimitFilterTest extends BaseRateLimitFilterTest {
+
+    @Before
+    @Override
+    public void setUp() {
+        Map<String, Rate> repository = new ConcurrentHashMap<>();
+        IRateLimiterRepository rateLimiterRepository = mock(IRateLimiterRepository.class);
+        when(rateLimiterRepository.save(any(Rate.class))).thenAnswer(invocationOnMock -> {
+            Rate rate = invocationOnMock.getArgument(0);
+            repository.put(rate.getKey(), rate);
+            return rate;
+        });
+        when(rateLimiterRepository.findOne(any())).thenAnswer(invocationOnMock -> {
+            String key = invocationOnMock.getArgument(0);
+            return repository.get(key);
+        });
+        this.setRateLimiter(new SpringDataRateLimiter(rateLimiterRepository));
+        super.setUp();
+    }
+}