You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by js...@apache.org on 2017/09/18 17:25:38 UTC
[geode] branch develop updated: GEODE-3426: Ignore
RestServersJUnitTest when default port is unavailable.
This is an automated email from the ASF dual-hosted git repository.
jstewart pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 0965a4c GEODE-3426: Ignore RestServersJUnitTest when default port is unavailable.
0965a4c is described below
commit 0965a4c4b7541df0b0bcf283858a56359f81a0cc
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Tue Sep 12 11:42:52 2017 -0700
GEODE-3426: Ignore RestServersJUnitTest when default port is unavailable.
---
.../geode/rest/internal/web/GeodeRestClient.java | 2 +-
.../rest/internal/web/RestServersJUnitTest.java | 28 ++++++++++++++--------
.../geode/test/junit/categories/RestAPITest.java | 2 +-
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index 1671e53..1f2ec73 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -50,7 +50,7 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
public class GeodeRestClient {
- public final static String CONTEXT = "/geode/v1";
+ public static final String CONTEXT = "/geode/v1";
private int restPort = 0;
private String bindAddress = null;
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
index 172a840..0c2765a 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -15,46 +15,54 @@
package org.apache.geode.rest.internal.web;
+import static org.apache.geode.distributed.internal.DistributionConfig.DEFAULT_HTTP_SERVICE_PORT;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.dunit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
import org.json.JSONArray;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
+
@Category({IntegrationTest.class, RestAPITest.class})
public class RestServersJUnitTest {
@ClassRule
- public static ServerStarterRule serverStarter =
- new ServerStarterRule().withRestService(true).withAutoStart();
+ public static ServerStarterRule serverStarter = new ServerStarterRule().withRestService(true);
+
private static GeodeRestClient restClient;
@BeforeClass
public static void before() throws Exception {
- assertThat(serverStarter.getHttpPort()).isEqualTo(DistributionConfig.DEFAULT_HTTP_SERVICE_PORT);
+ assumeTrue(
+ "Default port was unavailable for testing. Please ensure the testing environment is clean.",
+ AvailablePort.isPortAvailable(DEFAULT_HTTP_SERVICE_PORT, AvailablePort.SOCKET));
+ serverStarter.startServer();
+ assertThat(serverStarter.getHttpPort()).isEqualTo(DEFAULT_HTTP_SERVICE_PORT);
restClient = new GeodeRestClient("localhost", serverStarter.getHttpPort());
}
@Test
public void testGet() throws Exception {
HttpResponse response = restClient.doGet("/", null, null);
- assertThat(GeodeRestClient.getCode(response)).isEqualTo(200);
+ assertThat(GeodeRestClient.getCode(response)).isEqualTo(HttpStatus.SC_OK);
}
@Test
public void testServerStartedOnDefaultPort() throws Exception {
HttpResponse response = restClient.doGet("/servers", null, null);
+ assertThat(GeodeRestClient.getCode(response)).isEqualTo(HttpStatus.SC_OK);
JSONArray body = GeodeRestClient.getJsonArray(response);
assertThat(body.length()).isEqualTo(1);
- assertThat(body.getString(0))
- .isEqualTo("http://localhost:" + DistributionConfig.DEFAULT_HTTP_SERVICE_PORT);
+ assertThat(body.getString(0)).isEqualTo("http://localhost:" + DEFAULT_HTTP_SERVICE_PORT);
}
}
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
index 6b488b4..38ff513 100755
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
@@ -15,7 +15,7 @@
package org.apache.geode.test.junit.categories;
/**
- * A categor for REST API tests
+ * A category for REST API tests
*/
public interface RestAPITest {
}
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].