Merge pull request ReactiveX#111 from drmaas/master

closes ReactiveX#109
jihoonson · Apr 21, 2017 · b5358af · b5358af
2 parents ceddbc7 + c339049
commit b5358af
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 51 deletions.
diff --git a/resilience4j-ratpack/build.gradle b/resilience4j-ratpack/build.gradle
@@ -7,4 +7,8 @@ dependencies {
     compile project(':resilience4j-retry')
     testCompile ( libraries.ratpack_test )
     testCompile ( libraries.spock )
+}
+
+test {
+    maxParallelForks = 16
 }
diff --git a/...-ratpack/src/test/groovy/io/github/resilience4j/ratpack/RatelimiterTransformerSpec.groovy b/...-ratpack/src/test/groovy/io/github/resilience4j/ratpack/RatelimiterTransformerSpec.groovy
@@ -17,67 +17,64 @@ package io.github.resilience4j.ratpack
 
 import io.github.resilience4j.ratelimiter.RateLimiter
 import io.github.resilience4j.ratelimiter.RateLimiterConfig
-import ratpack.exec.Blocking
+import ratpack.exec.Promise
 import ratpack.test.exec.ExecHarness
-import spock.lang.Ignore
 import spock.lang.Specification
 
 import java.time.Duration
 
 class RatelimiterTransformerSpec extends Specification {
 
-  @Ignore
-  def "can ratelimit promise then throw exception when limit is exceeded"() {
-    given:
-    RateLimiter rateLimiter = buildRatelimiter()
-    RateLimiterTransformer<Integer> transformer = RateLimiterTransformer.of(rateLimiter)
-    Set<Integer> values = [].toSet()
-    Set<Integer> expected = (0..9).toSet()
+    def "can ratelimit promise then throw exception when limit is exceeded"() {
+        given:
+        RateLimiter rateLimiter = buildRatelimiter()
+        RateLimiterTransformer<Integer> transformer = RateLimiterTransformer.of(rateLimiter)
+        Set<Integer> values = [].toSet()
+        Set<Integer> expected = (0..9).toSet()
 
-    when:
-    for (int i = 0 ; i <= 10; i++) {
-      def r =  ExecHarness.yieldSingle {
-        Blocking.<Integer> get {
-          i
-        }.transform(transformer)
-      }
-      if (r.success) values << r.value
+        when:
+        for (int i = 0; i <= 10; i++) {
+            def r = ExecHarness.yieldSingle {
+                Promise.async {
+                    it.success(i)
+                }.transform(transformer)
+            }
+            if (r.success) values << r.value
+        }
+
+        then:
+        values == expected
     }
 
-    then:
-    values == expected
-  }
+    def "can ratelimit promise then throw exception when limit is exceeded then call recover"() {
+        given:
+        String failure = "failure"
+        RateLimiter rateLimiter = buildRatelimiter()
+        RateLimiterTransformer<Integer> transformer = RateLimiterTransformer.of(rateLimiter).recover { t -> failure }
+        Set<Integer> values = [].toSet()
+        Set<Integer> expected = (0..9).toSet()
 
-  @Ignore
-  def "can ratelimit promise then throw exception when limit is exceeded then call recover"() {
-    given:
-    String failure = "failure"
-    RateLimiter rateLimiter = buildRatelimiter()
-    RateLimiterTransformer<Integer> transformer = RateLimiterTransformer.of(rateLimiter).recover { t -> failure }
-    Set<Integer> values = [].toSet()
-    Set<Integer> expected = (0..9).toSet()
+        when:
+        for (int i = 0; i <= 10; i++) {
+            def r = ExecHarness.yieldSingle {
+                Promise.async {
+                    it.success(i)
+                }.transform(transformer)
+            }
+            if (r.success) values << r.value
+        }
 
-    when:
-    for (int i = 0 ; i <= 10; i++) {
-      def r =  ExecHarness.yieldSingle {
-        Blocking.<Integer> get {
-          i
-        }.transform(transformer)
-      }
-      if (r.success) values << r.value
+        then:
+        values == expected << failure
     }
 
-    then:
-    values == expected << failure
-  }
-
-  // 10 events / 10 s
-  def buildRatelimiter() {
-    RateLimiterConfig config = RateLimiterConfig.custom()
-      .limitRefreshPeriod(Duration.ofSeconds(10))
-      .limitForPeriod(10)
-      .timeoutDuration(Duration.ofMillis(100))
-      .build()
-    RateLimiter.of("test", config)
-  }
+    // 10 events / 1 minute
+    def buildRatelimiter() {
+        RateLimiterConfig config = RateLimiterConfig.custom()
+                .limitRefreshPeriod(Duration.ofSeconds(60))
+                .limitForPeriod(10)
+                .timeoutDuration(Duration.ofMillis(100))
+                .build()
+        RateLimiter.of("test", config)
+    }
 }
diff --git a/...-ratpack/src/test/groovy/io/github/resilience4j/ratpack/annotation/RateLimiterSpec.groovy b/...-ratpack/src/test/groovy/io/github/resilience4j/ratpack/annotation/RateLimiterSpec.groovy
@@ -268,10 +268,10 @@ class RateLimiterSpec extends Specification {
         'normal'     | 'test'
     }
 
-    // 10 events / 10 s
+    // 10 events / 1 minute
     def buildConfig() {
         RateLimiterConfig.custom()
-                .limitRefreshPeriod(Duration.ofSeconds(10))
+                .limitRefreshPeriod(Duration.ofSeconds(60))
                 .limitForPeriod(10)
                 .timeoutDuration(Duration.ofMillis(100))
                 .build()