You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/12/11 02:01:48 UTC
[3/6] incubator-edgent git commit: fix port override test class name
fix port override test class name
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/1ac18e4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/1ac18e4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/1ac18e4d
Branch: refs/heads/develop
Commit: 1ac18e4de70678412bfc1a3b83825ce711b33ba4
Parents: 123fd3a
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Sun Dec 10 19:28:57 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Sun Dec 10 19:28:57 2017 -0500
----------------------------------------------------------------------
.../test/console/server/HttpServerPortTest.java | 58 ++++++++++++++++++++
.../test/console/server/HttpServerTestPort.java | 58 --------------------
2 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/1ac18e4d/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerPortTest.java
----------------------------------------------------------------------
diff --git a/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerPortTest.java b/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerPortTest.java
new file mode 100644
index 0000000..64e8b22
--- /dev/null
+++ b/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerPortTest.java
@@ -0,0 +1,58 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.edgent.test.console.server;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
+
+import java.io.IOException;
+import java.net.Socket;
+
+import org.apache.edgent.console.server.HttpServer;
+import org.junit.Test;
+
+/**
+ * This is a separate test because the HttpServer implementation
+ * precludes changing the console port within a jvm instance.
+ */
+public class HttpServerPortTest {
+
+ int getAvailablePort() throws IOException {
+ try (Socket s = new Socket()) {
+ s.bind(null);
+ return s.getLocalPort();
+ }
+ }
+
+ @Test
+ public void testOverridePortNumber() throws Exception {
+ // count on the OS not immediately reusing an available local port.
+ int port = getAvailablePort();
+ int port2 = getAvailablePort();
+ assumeTrue(port != port2);
+
+ System.setProperty("edgent.console.port", String.valueOf(port));
+ HttpServer myHttpServer = HttpServer.getInstance();
+ myHttpServer.startServer();
+
+ int portNum = myHttpServer.getConsolePortNumber();
+ assertEquals(port, portNum);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/1ac18e4d/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerTestPort.java
----------------------------------------------------------------------
diff --git a/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerTestPort.java b/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerTestPort.java
deleted file mode 100644
index 95778bc..0000000
--- a/console/server/src/test/java/org/apache/edgent/test/console/server/HttpServerTestPort.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package org.apache.edgent.test.console.server;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.edgent.console.server.HttpServer;
-import org.junit.Test;
-
-/**
- * This is a separate test because the HttpServer implementation
- * precludes changing the console port within a jvm instance.
- */
-public class HttpServerTestPort {
-
- int getAvailablePort() throws IOException {
- try (Socket s = new Socket()) {
- s.bind(null);
- return s.getLocalPort();
- }
- }
-
- @Test
- public void overridePortNumber() throws Exception {
- // count on the OS not immediately reusing an available local port.
- int port = getAvailablePort();
- int port2 = getAvailablePort();
- assumeTrue(port != port2);
-
- System.setProperty("edgent.console.port", String.valueOf(port));
- HttpServer myHttpServer = HttpServer.getInstance();
- myHttpServer.startServer();
-
- int portNum = myHttpServer.getConsolePortNumber();
- assertEquals(port, portNum);
- }
-
-}