Use loadtest4j 0.18.0 (#44)

themasterchef · web-flow · commit c7b0ddd82cef · 2018-11-17T16:43:26.000Z
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.loadtest4j</groupId>
             <artifactId>loadtest4j</artifactId>
-            <version>0.17.0</version>
+            <version>0.18.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/resources/META-INF/services/org.loadtest4j.driver.DriverFactory b/src/main/resources/META-INF/services/org.loadtest4j.driver.DriverFactory
@@ -0,0 +1 @@
+org.loadtest4j.drivers.wrk.WrkFactory
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkFactoryTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkFactoryTest.java
@@ -25,7 +25,7 @@ private DriverFactory sut() {
     }
 
     @Test
-    public void testGetMandatoryProperties() {
+    public void shouldHaveMandatoryProperties() {
         final DriverFactory sut = sut();
 
         final Set<String> mandatoryProperties = sut.getMandatoryProperties();
@@ -34,14 +34,14 @@ public void testGetMandatoryProperties() {
     }
 
     @Test(expected = UnsupportedOperationException.class)
-    public void testGetMandatoryPropertiesIsImmutable() {
+    public void shouldHaveImmutableMandatoryProperties() {
         final DriverFactory sut = sut();
 
         sut.getMandatoryProperties().add("foobarbaz123");
     }
 
     @Test
-    public void testCreate() {
+    public void shouldCreateDriver() {
         final DriverFactory sut = sut();
 
         final Map<String, String> properties = new HashMap<>();
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkParserTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkParserTest.java
@@ -29,36 +29,36 @@ private static DriverResult driverResult(String name) {
     }
 
     @Test
-    public void testValidReport() {
+    public void shouldParseValidReport() {
         assertThat(driverResult("report.json"))
                 .hasKo(0)
                 .hasOk(1143)
                 .hasResponseTimePercentile(73, Duration.ofMillis(1));
     }
 
     @Test
-    public void testReportWithStatusErrors() {
+    public void shouldParseReportWithStatusErrors() {
         assertThat(driverResult("status_errors.json"))
                 .hasKo(5)
                 .hasOk(3);
     }
 
     @Test
-    public void testReportWithSocketErrors() {
+    public void shouldParseReportWithSocketErrors() {
         assertThat(driverResult("socket_errors.json"))
                 .hasKo(4)
                 .hasOk(8);
     }
 
     @Test
-    public void testReportWithSocketAndStatusErrors() {
+    public void shouldParseReportWithSocketAndStatusErrors() {
         assertThat(driverResult("socket_and_status_errors.json"))
                 .hasKo(5)
                 .hasOk(7);
     }
 
     @Test(expected = RuntimeException.class)
-    public void testInvalidReport() {
+    public void shouldThrowExceptionForInvalidReport() {
         driverResult("invalid.json");
     }
 }
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkResponseTimeTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkResponseTimeTest.java
@@ -16,35 +16,35 @@
 public class WrkResponseTimeTest {
 
     @Test
-    public void testGetPercentile() {
+    public void shouldGetPercentile() {
         final DriverResponseTime responseTime = new WrkResponseTime(mapOf(bd("50"), 1000L));
 
         assertThat(responseTime.getPercentile(50)).isEqualTo(Duration.ofMillis(1));
     }
 
     @Test
-    public void testGetDecimalPercentile() {
+    public void shouldGetDecimalPercentile() {
         final WrkResponseTime responseTime = new WrkResponseTime(mapOf(bd("50.5"), 1000L));
 
         assertThat(responseTime.getPercentile(50.5)).isEqualTo(Duration.ofMillis(1));
     }
 
     @Test
-    public void testGetDecimalPercentileAt3DecimalPlaces() {
+    public void shouldGetDecimalPercentileAt3DecimalPlaces() {
         final WrkResponseTime responseTime = new WrkResponseTime(mapOf(bd("50.501"), 1000L));
 
         assertThat(responseTime.getPercentile(50.501)).isEqualTo(Duration.ofMillis(1));
     }
 
     @Test
-    public void testGetDecimalPercentileWithTrailingZeroes() {
+    public void shouldGetDecimalPercentileWithTrailingZeroes() {
         final WrkResponseTime responseTime = new WrkResponseTime(mapOf(bd("50.5"), 1000L, bd("50.501"), 3000L));
 
         assertThat(responseTime.getPercentile(50.500)).isEqualTo(Duration.ofMillis(1));
     }
 
     @Test
-    public void testGetDecimalPercentileBeyond3DecimalPlacesFails() {
+    public void shouldNotGetDecimalPercentileBeyond3DecimalPlaces() {
         final WrkResponseTime responseTime = new WrkResponseTime(mapOf(bd("50.000"), 1000L, bd("50.001"), 3000L));
 
         assertThatIllegalArgumentException()
@@ -53,7 +53,7 @@ public void testGetDecimalPercentileBeyond3DecimalPlacesFails() {
     }
 
     @Test
-    public void testGetMissingDecimalPercentileFails() {
+    public void shouldNotGetMissingDecimalPercentile() {
         final WrkResponseTime responseTime = new WrkResponseTime(mapOf(bd("50.4"), 1000L, bd("50.6"), 3000L));
 
         assertThatIllegalArgumentException()
@@ -62,21 +62,21 @@ public void testGetMissingDecimalPercentileFails() {
     }
 
     @Test
-    public void testGetMaxPercentile() {
+    public void shouldGetMaxPercentile() {
         final DriverResponseTime responseTime = new WrkResponseTime(mapOf(bd("100"), 1000L));
 
         assertThat(responseTime.getPercentile(100)).isEqualTo(Duration.ofMillis(1));
     }
 
     @Test
-    public void testGetMinPercentile() {
+    public void shouldGetMinPercentile() {
         final DriverResponseTime responseTime = new WrkResponseTime(mapOf(bd("0"), 1000L));
 
         assertThat(responseTime.getPercentile(0)).isEqualTo(Duration.ofMillis(1));
     }
 
     @Test
-    public void testGetTooLowPercentileFails() {
+    public void shouldNotGetTooLowPercentile() {
         final DriverResponseTime responseTime = new WrkResponseTime(mapOf(bd("-1"), 1000L));
 
         assertThatIllegalArgumentException()
@@ -85,7 +85,7 @@ public void testGetTooLowPercentileFails() {
     }
 
     @Test
-    public void testGetTooHighPercentileFails() {
+    public void shouldNotGetTooHighPercentile() {
         final DriverResponseTime responseTime = new WrkResponseTime(mapOf(bd("101"), 1000L));
 
         assertThatIllegalArgumentException()
@@ -94,7 +94,7 @@ public void testGetTooHighPercentileFails() {
     }
 
     @Test
-    public void testGetMissingPercentileFails() {
+    public void shouldNotGetMissingPercentile() {
         final DriverResponseTime responseTime = new WrkResponseTime(emptyMap());
 
         assertThatIllegalArgumentException()
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/WrkTest.java b/src/test/java/org/loadtest4j/drivers/wrk/WrkTest.java
@@ -85,7 +85,7 @@ private Driver sut() {
     }
 
     @Test
-    public void testRun()  {
+    public void shouldRun()  {
         // Given
         final Driver driver = sut();
         // And
@@ -104,7 +104,7 @@ public void testRun()  {
     }
 
     @Test
-    public void testRunWithMultipleRequests() {
+    public void shouldRunWithMultipleRequests() {
         // Given
         final Driver driver = sut();
         // And
@@ -123,7 +123,7 @@ public void testRunWithMultipleRequests() {
     }
 
     @Test
-    public void testRunWithJsonPost() {
+    public void shouldRunWithJsonPost() {
         // Given
         final Driver driver = sut();
         // And
@@ -144,7 +144,7 @@ public void testRunWithJsonPost() {
     }
 
     @Test
-    public void testRunWithPostBodyContainingEscapedDoubleQuotes() {
+    public void shouldRunWithPostBodyContainingEscapedDoubleQuotes() {
         // Given
         final Driver driver = sut();
         // And
@@ -163,7 +163,7 @@ public void testRunWithPostBodyContainingEscapedDoubleQuotes() {
     }
 
     @Test
-    public void testRunWithEdgeCaseRequest() {
+    public void shouldRunWithEdgeCaseRequest() {
         // Given
         final Driver driver = sut();
         // And
@@ -187,7 +187,7 @@ public void testRunWithEdgeCaseRequest() {
     }
 
     @Test
-    public void testRunWithErrors()  {
+    public void shouldRunAndReportKoRequests()  {
         // Given
         final Driver driver = sut();
         // And
@@ -206,7 +206,7 @@ public void testRunWithErrors()  {
     }
 
     @Test
-    public void testRunWithInvalidHost() {
+    public void shouldNotRunWithInvalidHost() {
         // Given
         final Driver driver = new Wrk(1, EXPECTED_DURATION, "wrk", 1, "http://localhost:1");
 
@@ -221,7 +221,7 @@ public void testRunWithInvalidHost() {
 
 
     @Test
-    public void testRunWithNoRequests() {
+    public void shouldNotRunWithNoRequests() {
         // Given
         final Driver driver = sut();
 
@@ -234,7 +234,7 @@ public void testRunWithNoRequests() {
     }
 
     @Test
-    public void testRunWithMultiPartFileUpload() {
+    public void shouldRunWithMultiPartFileUpload() {
         // Given
         final Driver driver = sut();
         // And
@@ -269,7 +269,7 @@ public void testRunWithMultiPartFileUpload() {
     }
 
     @Test
-    public void testRunWithMultiPartStringUpload() {
+    public void shouldRunWithMultiPartStringUpload() {
         // Given
         final Driver driver = sut();
         // And
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/script/BodyMatcherTest.java b/src/test/java/org/loadtest4j/drivers/wrk/script/BodyMatcherTest.java
@@ -4,11 +4,11 @@
 
 public abstract class BodyMatcherTest {
     @Test
-    public abstract void testString();
+    public abstract void shouldMatchOnString();
 
     @Test
-    public abstract void testStringPart();
+    public abstract void shouldMatchOnStringPart();
 
     @Test
-    public abstract void testFilePart();
+    public abstract void shouldMatchOnFilePart();
 }
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/script/WrkBodyMatcherTest.java b/src/test/java/org/loadtest4j/drivers/wrk/script/WrkBodyMatcherTest.java
@@ -12,7 +12,7 @@
 @Category(UnitTest.class)
 public class WrkBodyMatcherTest extends BodyMatcherTest {
     @Override
-    public void testString() {
+    public void shouldMatchOnString() {
         final WrkBodyMatcher matcher = new WrkBodyMatcher();
 
         final String body = Body.string("foo").match(matcher);
@@ -21,7 +21,7 @@ public void testString() {
     }
 
     @Override
-    public void testStringPart() {
+    public void shouldMatchOnStringPart() {
         final WrkBodyMatcher matcher = new WrkBodyMatcher();
 
         final String body = Body.multipart(BodyPart.string("foo", "bar")).match(matcher);
@@ -38,7 +38,7 @@ public void testStringPart() {
     }
 
     @Override
-    public void testFilePart() {
+    public void shouldMatchOnFilePart() {
         final WrkBodyMatcher matcher = new WrkBodyMatcher();
 
         final String body = Body.multipart(BodyPart.file(Paths.get("src/test/resources/fixtures/multipart/test.txt"))).match(matcher);
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/script/WrkHeadersMatcherTest.java b/src/test/java/org/loadtest4j/drivers/wrk/script/WrkHeadersMatcherTest.java
@@ -14,7 +14,7 @@
 @Category(UnitTest.class)
 public class WrkHeadersMatcherTest extends BodyMatcherTest {
     @Override
-    public void testString() {
+    public void shouldMatchOnString() {
         final WrkHeadersMatcher matcher = new WrkHeadersMatcher(Collections.emptyMap());
 
         final Map<String, String> headers = Body.string("foo").match(matcher);
@@ -23,7 +23,7 @@ public void testString() {
     }
 
     @Override
-    public void testStringPart() {
+    public void shouldMatchOnStringPart() {
         final WrkHeadersMatcher matcher = new WrkHeadersMatcher(Collections.emptyMap());
 
         final Map<String, String> headers = Body.multipart(BodyPart.string("foo", "bar")).match(matcher);
@@ -32,7 +32,7 @@ public void testStringPart() {
     }
 
     @Override
-    public void testFilePart() {
+    public void shouldMatchOnFilePart() {
         final WrkHeadersMatcher matcher = new WrkHeadersMatcher(Collections.emptyMap());
 
         final Map<String, String> headers = Body.multipart(BodyPart.file(Paths.get("/tmp/foo.txt"))).match(matcher);
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/ArgumentBuilderTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/ArgumentBuilderTest.java
@@ -11,7 +11,7 @@
 @Category(UnitTest.class)
 public class ArgumentBuilderTest {
     @Test
-    public void testAddArgument() {
+    public void shouldAddArgument() {
         final ArgumentBuilder sut = new ArgumentBuilder();
 
         final List<String> args = sut.addArgument("foo").build();
@@ -20,7 +20,7 @@ public void testAddArgument() {
     }
 
     @Test
-    public void testAddNamedArgument() {
+    public void shouldAddNamedArgument() {
         final ArgumentBuilder sut = new ArgumentBuilder();
 
         final List<String> args = sut.addNamedArgument("--foo", "bar").build();
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/CommandTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/CommandTest.java
@@ -14,17 +14,17 @@ public class CommandTest {
     private final Command command = new Command(Arrays.asList("foo", "bar"), Collections.singletonMap("foo", "bar"), "whoami");
 
     @Test
-    public void testGetLaunchPath() {
+    public void shouldHaveLaunchPath() {
         assertThat(command.getLaunchPath()).isEqualTo("whoami");
     }
 
     @Test
-    public void testGetArguments() {
+    public void shouldHaveArguments() {
         assertThat(command.getArguments()).containsExactly("foo", "bar");
     }
 
     @Test
-    public void testGetEnv() {
+    public void shouldHaveEnv() {
         assertThat(command.getEnv()).containsEntry("foo", "bar");
     }
 }
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/ContentTypesTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/ContentTypesTest.java
@@ -13,14 +13,14 @@
 @Category(IntegrationTest.class)
 public class ContentTypesTest {
     @Test
-    public void testDetectTypeOfPlainTextFile() {
+    public void shouldDetectTypeOfPlainTextFile() {
         final String type = ContentTypes.detect(Paths.get("src/test/resources/fixtures/multipart/test.txt"));
 
         assertThat(type).isEqualTo("text/plain");
     }
 
     @Test
-    public void testDetectTypeOfNonFileFails() {
+    public void shouldFailToDetectTypeOfNonFile() {
         assertThatExceptionOfType(LoadTesterException.class)
                 .isThrownBy(() -> ContentTypes.detect(Paths.get("src/test/resources/fixtures/multipart/")));
     }
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/FileUtilsTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/FileUtilsTest.java
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/JsonTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/JsonTest.java
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/QueryStringTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/QueryStringTest.java
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/ShellTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/ShellTest.java
diff --git a/src/test/java/org/loadtest4j/drivers/wrk/utils/StreamReaderTest.java b/src/test/java/org/loadtest4j/drivers/wrk/utils/StreamReaderTest.java

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ private DriverFactory sut() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Test`
`28`		`- public void testGetMandatoryProperties() {`
	`28`	`+ public void shouldHaveMandatoryProperties() {`
`29`	`29`	`final DriverFactory sut = sut();`
`30`	`30`
`31`	`31`	`final Set<String> mandatoryProperties = sut.getMandatoryProperties();`
`@@ -34,14 +34,14 @@ public void testGetMandatoryProperties() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Test(expected = UnsupportedOperationException.class)`
`37`		`- public void testGetMandatoryPropertiesIsImmutable() {`
	`37`	`+ public void shouldHaveImmutableMandatoryProperties() {`
`38`	`38`	`final DriverFactory sut = sut();`
`39`	`39`
`40`	`40`	`sut.getMandatoryProperties().add("foobarbaz123");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Test`
`44`		`- public void testCreate() {`
	`44`	`+ public void shouldCreateDriver() {`
`45`	`45`	`final DriverFactory sut = sut();`
`46`	`46`
`47`	`47`	`final Map<String, String> properties = new HashMap<>();`
Original file line number	Diff line number	Diff line change
`@@ -29,36 +29,36 @@ private static DriverResult driverResult(String name) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Test`
`32`		`- public void testValidReport() {`
	`32`	`+ public void shouldParseValidReport() {`
`33`	`33`	`assertThat(driverResult("report.json"))`
`34`	`34`	`.hasKo(0)`
`35`	`35`	`.hasOk(1143)`
`36`	`36`	`.hasResponseTimePercentile(73, Duration.ofMillis(1));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Test`
`40`		`- public void testReportWithStatusErrors() {`
	`40`	`+ public void shouldParseReportWithStatusErrors() {`
`41`	`41`	`assertThat(driverResult("status_errors.json"))`
`42`	`42`	`.hasKo(5)`
`43`	`43`	`.hasOk(3);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Test`
`47`		`- public void testReportWithSocketErrors() {`
	`47`	`+ public void shouldParseReportWithSocketErrors() {`
`48`	`48`	`assertThat(driverResult("socket_errors.json"))`
`49`	`49`	`.hasKo(4)`
`50`	`50`	`.hasOk(8);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Test`
`54`		`- public void testReportWithSocketAndStatusErrors() {`
	`54`	`+ public void shouldParseReportWithSocketAndStatusErrors() {`
`55`	`55`	`assertThat(driverResult("socket_and_status_errors.json"))`
`56`	`56`	`.hasKo(5)`
`57`	`57`	`.hasOk(7);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Test(expected = RuntimeException.class)`
`61`		`- public void testInvalidReport() {`
	`61`	`+ public void shouldThrowExceptionForInvalidReport() {`
`62`	`62`	`driverResult("invalid.json");`
`63`	`63`	`}`
`64`	`64`	`}`