Merge pull request #238 from kelnos/jersey-test-container-random-port

Force the Grizzly Jersey test container to use a random port
guardrail-dev · Apr 16, 2019 · 569195b · 569195b
2 parents 80b437b + 1af29ab
commit 569195b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 45 deletions.
diff --git a/modules/sample-dropwizard/src/test/java/core/Dropwizard/DropwizardMultiPartTest.java b/modules/sample-dropwizard/src/test/java/core/Dropwizard/DropwizardMultiPartTest.java
@@ -1,13 +1,13 @@
 package core.Dropwizard;
 
-import helpers.JerseyTestHelpers;
 import io.dropwizard.testing.junit.ResourceTestRule;
 import multipartFormData.server.dropwizard.GuardrailJerseySupport;
 import multipartFormData.server.dropwizard.definitions.Foo;
 import multipartFormData.server.dropwizard.foo.FooHandler;
 import multipartFormData.server.dropwizard.foo.FooResource;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.test.TestProperties;
 import org.glassfish.jersey.test.grizzly.GrizzlyTestContainerFactory;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -23,7 +23,7 @@
 
 public class DropwizardMultiPartTest {
     static {
-        JerseyTestHelpers.setRandomJerseyTestContainerPort();
+        System.setProperty(TestProperties.CONTAINER_PORT, "0");
     }
 
     private static final FooHandler fooHandler = new FooHandler() {

diff --git a/modules/sample-dropwizard/src/test/java/core/Dropwizard/DropwizardResourceTest.java b/modules/sample-dropwizard/src/test/java/core/Dropwizard/DropwizardResourceTest.java
@@ -6,8 +6,8 @@
 import examples.server.dropwizard.user.UserHandler.GetUserByNameResponse;
 import examples.server.dropwizard.user.UserHandler.LoginUserResponse;
 import examples.server.dropwizard.user.UserResource;
-import helpers.JerseyTestHelpers;
 import io.dropwizard.testing.junit.ResourceTestRule;
+import org.glassfish.jersey.test.TestProperties;
 import org.glassfish.jersey.test.grizzly.GrizzlyTestContainerFactory;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -27,7 +27,7 @@
 
 public class DropwizardResourceTest {
     static {
-        JerseyTestHelpers.setRandomJerseyTestContainerPort();
+        System.setProperty(TestProperties.CONTAINER_PORT, "0");
     }
 
     private static final String USERNAME = "foobar";

diff --git a/modules/sample-dropwizard/src/test/java/helpers/JerseyTestHelpers.java b/modules/sample-dropwizard/src/test/java/helpers/JerseyTestHelpers.java