You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2015/02/04 17:28:17 UTC
[4/4] directory-kerberos git commit: Use random ports for kerby-event
tests. Switch to use "int" instead of "short" for the ports,
as short is inadequate
Use random ports for kerby-event tests. Switch to use "int" instead of "short" for the ports, as short is inadequate
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/cacd2837
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/cacd2837
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/cacd2837
Branch: refs/heads/master
Commit: cacd2837965fe8fc58274b3f719282afc5b85e76
Parents: fe44b27
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 4 16:27:49 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 4 16:27:49 2015 +0000
----------------------------------------------------------------------
.../org/apache/kerby/transport/Acceptor.java | 2 +-
.../org/apache/kerby/transport/Connector.java | 2 +-
.../org/apache/kerby/transport/Network.java | 8 ++++----
.../kerby/event/network/TestNetworkBase.java | 4 ++--
.../kerby/event/network/TestNetworkClient.java | 4 ++++
.../kerby/event/network/TestNetworkServer.java | 11 ++++++++++
.../org/apache/kerby/event/tcp/TestTcpBase.java | 2 +-
.../apache/kerby/event/tcp/TestTcpClient.java | 6 ++++--
.../apache/kerby/event/tcp/TestTcpServer.java | 21 ++++++++++++--------
.../org/apache/kerby/event/udp/TestUdpBase.java | 2 +-
.../apache/kerby/event/udp/TestUdpClient.java | 2 ++
.../apache/kerby/event/udp/TestUdpServer.java | 5 +++++
12 files changed, 49 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/main/java/org/apache/kerby/transport/Acceptor.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Acceptor.java b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Acceptor.java
index 8fa25d7..efa827a 100644
--- a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Acceptor.java
+++ b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Acceptor.java
@@ -27,7 +27,7 @@ public abstract class Acceptor extends TransportSelector {
super(transportHandler);
}
- public void listen(String address, short listenPort) {
+ public void listen(String address, int listenPort) {
InetSocketAddress socketAddress = new InetSocketAddress(address, listenPort);
doListen(socketAddress);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/main/java/org/apache/kerby/transport/Connector.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Connector.java b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Connector.java
index ece171f..720f481 100644
--- a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Connector.java
+++ b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Connector.java
@@ -27,7 +27,7 @@ public abstract class Connector extends TransportSelector {
super(transportHandler);
}
- public void connect(String serverAddress, short serverPort) {
+ public void connect(String serverAddress, int serverPort) {
InetSocketAddress sa = new InetSocketAddress(serverAddress, serverPort);
doConnect(sa);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
index 4cf346e..707b3a0 100644
--- a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
+++ b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
@@ -102,7 +102,7 @@ public class Network extends LongRunningEventHandler {
* @param serverAddress
* @param serverPort
*/
- public void tcpConnect(String serverAddress, short serverPort) {
+ public void tcpConnect(String serverAddress, int serverPort) {
InetSocketAddress sa = new InetSocketAddress(serverAddress, serverPort);
checkTcpTransportHandler();
doTcpConnect(sa);
@@ -114,7 +114,7 @@ public class Network extends LongRunningEventHandler {
* @param serverAddress
* @param serverPort
*/
- public void udpConnect(String serverAddress, short serverPort) {
+ public void udpConnect(String serverAddress, int serverPort) {
InetSocketAddress sa = new InetSocketAddress(serverAddress, serverPort);
checkUdpTransportHandler();
doUdpConnect(sa);
@@ -126,7 +126,7 @@ public class Network extends LongRunningEventHandler {
* @param serverAddress
* @param serverPort
*/
- public void tcpListen(String serverAddress, short serverPort) {
+ public void tcpListen(String serverAddress, int serverPort) {
InetSocketAddress sa = new InetSocketAddress(serverAddress, serverPort);
checkTcpTransportHandler();
doTcpListen(sa);
@@ -138,7 +138,7 @@ public class Network extends LongRunningEventHandler {
* @param serverAddress
* @param serverPort
*/
- public void udpListen(String serverAddress, short serverPort) {
+ public void udpListen(String serverAddress, int serverPort) {
InetSocketAddress sa = new InetSocketAddress(serverAddress, serverPort);
checkUdpTransportHandler();
doUdpListen(sa);
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkBase.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkBase.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkBase.java
index 7526658..04a15a9 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkBase.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkBase.java
@@ -27,8 +27,8 @@ import java.nio.ByteBuffer;
public class TestNetworkBase {
protected String serverHost = "127.0.0.1";
- protected short tcpPort = 8183;
- protected short udpPort = 8184;
+ protected int tcpPort = 0;
+ protected int udpPort = 0;
protected String TEST_MESSAGE = "Hello world!";
protected String clientRecvedMessage;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
index b52a18d..54dc6a9 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkClient.java
@@ -86,6 +86,8 @@ public class TestNetworkClient extends TestNetworkBase {
ServerSocket serverSocket = serverSocketChannel.socket();
serverSocket.bind(new InetSocketAddress(tcpPort));
serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);
+
+ tcpPort = serverSocket.getLocalPort();
SocketChannel socketChannel;
while (true) {
@@ -130,6 +132,8 @@ public class TestNetworkClient extends TestNetworkBase {
DatagramSocket serverSocket = serverSocketChannel.socket();
serverSocket.bind(new InetSocketAddress(udpPort));
serverSocketChannel.register(selector, SelectionKey.OP_READ);
+
+ udpPort = serverSocket.getLocalPort();
while (true) {
if (selector.selectNow() > 0) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
index 09a8f0e..b22c1d3 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/network/TestNetworkServer.java
@@ -31,6 +31,7 @@ import org.junit.Test;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.net.ServerSocket;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
@@ -65,7 +66,17 @@ public class TestNetworkServer extends TestNetworkBase {
eventHub.register(network);
eventHub.start();
+
+ ServerSocket serverSocket = new ServerSocket(0);
+ tcpPort = serverSocket.getLocalPort();
+ serverSocket.close();
+
network.tcpListen(serverHost, tcpPort);
+
+ serverSocket = new ServerSocket(0);
+ udpPort = serverSocket.getLocalPort();
+ serverSocket.close();
+
network.udpListen(serverHost, udpPort);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpBase.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpBase.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpBase.java
index 263b7fc..8949733 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpBase.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpBase.java
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
public class TestTcpBase {
protected String serverHost = "127.0.0.1";
- protected short serverPort = 8181;
+ protected int serverPort = 0;
protected String TEST_MESSAGE = "Hello world!";
protected String clientRecvedMessage;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
index 1e895b6..106c3c7 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpClient.java
@@ -73,11 +73,13 @@ public class TestTcpClient extends TestTcpBase {
private void doRunServer() throws IOException {
Selector selector = Selector.open();
- ServerSocketChannel serverSocketChannel = ServerSocketChannel .open();
+ ServerSocketChannel serverSocketChannel = ServerSocketChannel.open();
serverSocketChannel.configureBlocking(false);
ServerSocket serverSocket = serverSocketChannel.socket();
- serverSocket.bind(new InetSocketAddress(serverPort));
+ serverSocket.bind(new InetSocketAddress(0));
serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);
+
+ serverPort = serverSocket.getLocalPort();
SocketChannel socketChannel;
while (true) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
index 3fe791a..66a2df3 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/tcp/TestTcpServer.java
@@ -19,6 +19,15 @@
*/
package org.apache.kerby.event.tcp;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+
import org.apache.kerby.event.EventHandler;
import org.apache.kerby.event.EventHub;
import org.apache.kerby.transport.Acceptor;
@@ -30,14 +39,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
public class TestTcpServer extends TestTcpBase {
private EventHub eventHub;
@@ -62,6 +63,10 @@ public class TestTcpServer extends TestTcpBase {
Acceptor acceptor = new TcpAcceptor(createStreamingDecoder());
eventHub.register(acceptor);
+
+ ServerSocket serverSocket = new ServerSocket(0);
+ serverPort = serverSocket.getLocalPort();
+ serverSocket.close();
eventHub.start();
acceptor.listen(serverHost, serverPort);
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpBase.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpBase.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpBase.java
index 63d71ac..f4d3ed1 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpBase.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpBase.java
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
public class TestUdpBase {
protected String serverHost = "127.0.0.1";
- protected short serverPort = 8181;
+ protected int serverPort = 0;
protected String TEST_MESSAGE = "Hello world!";
protected String clientRecvedMessage;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
index d8d5086..60001f4 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpClient.java
@@ -77,6 +77,8 @@ public class TestUdpClient extends TestUdpBase {
DatagramSocket serverSocket = serverSocketChannel.socket();
serverSocket.bind(new InetSocketAddress(serverPort));
serverSocketChannel.register(selector, SelectionKey.OP_READ);
+
+ serverPort = serverSocket.getLocalPort();
while (true) {
if (selector.selectNow() > 0) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/cacd2837/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
index 188e6de..b525a55 100644
--- a/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
+++ b/lib/kerby-event/src/test/java/org/apache/kerby/event/udp/TestUdpServer.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.net.ServerSocket;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
@@ -62,6 +63,10 @@ public class TestUdpServer extends TestUdpBase {
Acceptor acceptor = new UdpAcceptor();
eventHub.register(acceptor);
+
+ ServerSocket serverSocket = new ServerSocket(0);
+ serverPort = serverSocket.getLocalPort();
+ serverSocket.close();
eventHub.start();
acceptor.listen(serverHost, serverPort);