Fixing bug in ratelimiter when rampUp period is 0 (#47)

noconnor · May 23, 2019 · 1464151 · 1464151
1 parent 433d407
commit 1464151
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'jacoco'
 group = 'com.github.noconnor'
 sourceCompatibility = 1.8
 // http://semver.org/
-version = '1.13.0'
+version = '1.13.1'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/com/github/noconnor/junitperf/statements/PerformanceEvaluationStatement.java b/src/main/java/com/github/noconnor/junitperf/statements/PerformanceEvaluationStatement.java
@@ -1,16 +1,16 @@
 package com.github.noconnor.junitperf.statements;
 
-import com.github.noconnor.junitperf.data.EvaluationContext;
-import com.github.noconnor.junitperf.statistics.StatisticsCalculator;
-import com.github.noconnor.junitperf.statistics.providers.NoOpStatisticsCollector;
-import com.google.common.util.concurrent.RateLimiter;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.Builder;
-import org.junit.runners.model.Statement;
 
 import java.util.List;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.Consumer;
+import org.junit.runners.model.Statement;
+import com.github.noconnor.junitperf.data.EvaluationContext;
+import com.github.noconnor.junitperf.statistics.StatisticsCalculator;
+import com.github.noconnor.junitperf.statistics.providers.NoOpStatisticsCollector;
+import com.google.common.util.concurrent.RateLimiter;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.util.concurrent.RateLimiter.create;
@@ -85,7 +85,9 @@ private void assertThresholdsMet() {
   }
 
   private RateLimiter createRateLimiter(final EvaluationContext context) {
-    return create(context.getConfiguredRateLimit(), context.getConfiguredRampUpPeriodMs(), MILLISECONDS);
+    int rampUp = context.getConfiguredRampUpPeriodMs();
+    int rateLimit = context.getConfiguredRateLimit();
+    return rampUp > 0 ? create(rateLimit, rampUp, MILLISECONDS) : create(rateLimit);
   }