Skip to content

Commit a6565c2

Browse files
arteamjoschi
authored andcommitted
Evaluate CircleCI (dropwizard#1883)
* Increase read timeouts for end-to-end tests * Evaluate CircleCI Add support for running tests on CircleCI. The idea is too have an additional CI server for running tests on the Linux environment, because in recent times we have had some issues with Travis CI.
1 parent 09875fa commit a6565c2

File tree

3 files changed

+37
-3
lines changed

3 files changed

+37
-3
lines changed

circle.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
machine:
2+
timezone: UTC
3+
java:
4+
version: oraclejdk8
5+
environment:
6+
_JAVA_OPTIONS: '-Xms512m -Xmx2g'
7+
dependencies:
8+
override:
9+
- mvn dependency:go-offline --fail-never
10+
compile:
11+
override:
12+
- mvn compile
13+
test:
14+
override:
15+
- mvn test
16+
post:
17+
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
18+
- find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

dropwizard-e2e/src/test/java/com/example/forms/FormsAppTest.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
import io.dropwizard.client.JerseyClientConfiguration;
66
import io.dropwizard.jersey.errors.ErrorMessage;
77
import io.dropwizard.testing.junit.DropwizardAppRule;
8+
import io.dropwizard.util.Duration;
89
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
910
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
1011
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
1112
import org.glassfish.jersey.media.multipart.MultiPart;
1213
import org.glassfish.jersey.media.multipart.MultiPartFeature;
14+
import org.junit.Before;
1315
import org.junit.ClassRule;
1416
import org.junit.Test;
1517

@@ -23,9 +25,15 @@ public class FormsAppTest {
2325
@ClassRule
2426
public static final DropwizardAppRule<Configuration> RULE = new DropwizardAppRule<>(FormsApp.class);
2527

28+
private final JerseyClientConfiguration config = new JerseyClientConfiguration();
29+
30+
@Before
31+
public void setUp() throws Exception {
32+
config.setTimeout(Duration.seconds(2));
33+
}
34+
2635
@Test
2736
public void canSubmitFormAndReceiveResponse() {
28-
final JerseyClientConfiguration config = new JerseyClientConfiguration();
2937
config.setChunkedEncodingEnabled(false);
3038

3139
final Client client = new JerseyClientBuilder(RULE.getEnvironment())
@@ -47,7 +55,9 @@ public void canSubmitFormAndReceiveResponse() {
4755
* behavior. For more info, see issues #1013 and #1094 */
4856
@Test
4957
public void failOnNoChunkedEncoding() {
50-
final Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test client 2");
58+
final Client client = new JerseyClientBuilder(RULE.getEnvironment())
59+
.using(config)
60+
.build("test client 2");
5161

5262
final MultiPart mp = new FormDataMultiPart()
5363
.bodyPart(new FormDataBodyPart(

dropwizard-e2e/src/test/java/com/example/request_log/AbstractRequestLogPatternIntegrationTest.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
import io.dropwizard.Application;
77
import io.dropwizard.Configuration;
88
import io.dropwizard.client.JerseyClientBuilder;
9+
import io.dropwizard.client.JerseyClientConfiguration;
910
import io.dropwizard.setup.Environment;
1011
import io.dropwizard.testing.ConfigOverride;
1112
import io.dropwizard.testing.ResourceHelpers;
1213
import io.dropwizard.testing.junit.DropwizardAppRule;
14+
import io.dropwizard.util.Duration;
1315
import org.junit.After;
1416
import org.junit.Before;
1517
import org.junit.Rule;
@@ -74,7 +76,11 @@ protected List<ConfigOverride> configOverrides() {
7476

7577
@Before
7678
public void setUp() throws Exception {
77-
client = new JerseyClientBuilder(dropwizardAppRule.getEnvironment()).build("test-request-logs");
79+
final JerseyClientConfiguration configuration = new JerseyClientConfiguration();
80+
configuration.setTimeout(Duration.seconds(2));
81+
client = new JerseyClientBuilder(dropwizardAppRule.getEnvironment())
82+
.using(configuration)
83+
.build("test-request-logs");
7884
}
7985

8086
@After

0 commit comments

Comments
 (0)