Adding quota tests

marcosbarbero · Sep 21, 2017 · a61ec84 · a61ec84
1 parent 107fe7d
commit a61ec84
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...cosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/pre/BaseRateLimitPreFilterTest.java b/...cosbarbero/cloud/autoconfigure/zuul/ratelimit/filters/pre/BaseRateLimitPreFilterTest.java
@@ -21,11 +21,15 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.springframework.cloud.netflix.zuul.filters.Route;
 import org.springframework.cloud.netflix.zuul.filters.RouteLocator;
 import org.springframework.cloud.netflix.zuul.metrics.EmptyCounterFactory;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.util.UrlPathHelper;
 
 /**
@@ -36,6 +40,9 @@ public abstract class BaseRateLimitPreFilterTest {
 
     RateLimitPreFilter filter;
 
+    @Mock
+    RequestAttributes requestAttributes;
+
     MockHttpServletRequest request;
     MockHttpServletResponse response;
 
@@ -56,6 +63,7 @@ private RateLimitProperties properties() {
 
         Policy policy = new Policy();
         policy.setLimit(2L);
+        policy.setQuota(2L);
         policy.setRefreshInterval(2L);
         policy.setType(asList(Policy.Type.ORIGIN, Policy.Type.URL, Policy.Type.USER));
 
@@ -76,6 +84,7 @@ void setRateLimiter(RateLimiter rateLimiter) {
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         CounterFactory.initialize(new EmptyCounterFactory());
         this.request = new MockHttpServletRequest();
         this.response = new MockHttpServletResponse();
@@ -84,6 +93,7 @@ public void setUp() {
         this.filter = new RateLimitPreFilter(this.properties(), this.routeLocator(), urlPathHelper, this.rateLimiter, this.rateLimitKeyGenerator);
         this.context = new RequestContext();
         RequestContext.testSetCurrentContext(this.context);
+        RequestContextHolder.setRequestAttributes(requestAttributes);
         this.context.clear();
         this.context.setRequest(this.request);
         this.context.setResponse(this.response);

diff --git a/...sbarbero/cloud/autoconfigure/zuul/ratelimit/filters/pre/ConsulRateLimitPreFilterTest.java b/...sbarbero/cloud/autoconfigure/zuul/ratelimit/filters/pre/ConsulRateLimitPreFilterTest.java
@@ -29,7 +29,7 @@ public class ConsulRateLimitPreFilterTest extends BaseRateLimitPreFilterTest {
     private ObjectMapper objectMapper = new ObjectMapper();
 
     private Rate rate(long remaining) {
-        return new Rate("key", remaining, null, 100L, new Date(System.currentTimeMillis() + SECONDS.toMillis(2)));
+        return new Rate("key", remaining, 2000L, 100L, new Date(System.currentTimeMillis() + SECONDS.toMillis(2)));
     }
 
     @Before