You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2017/04/24 07:22:50 UTC
directory-kerby git commit: DIRKRB-624 KdcServerTest failed with
exception.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk e20049373 -> 698664421
DIRKRB-624 KdcServerTest failed with exception.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/69866442
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/69866442
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/69866442
Branch: refs/heads/trunk
Commit: 698664421500b5314e10c10fb890437b546ab064
Parents: e200493
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Apr 24 15:29:59 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Apr 24 15:29:59 2017 +0800
----------------------------------------------------------------------
.../kerberos/kerb/server/KdcServerTest.java | 9 +--
.../kerberos/kerb/SimpleKdcServerTest.java | 75 --------------------
.../kerberos/kerb/SimpleKdcServerTest.java | 74 +++++++++++++++++++
3 files changed, 76 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/69866442/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
index 3918ae7..14394c9 100644
--- a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
+++ b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
@@ -21,6 +21,7 @@ package org.apache.kerby.kerberos.kerb.server;
import org.apache.kerby.util.NetworkUtil;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -57,13 +58,7 @@ public class KdcServerTest {
SocketAddress sa = new InetSocketAddress(serverHost, serverPort);
socketChannel.connect(sa);
- String badKrbMessage = "Hello World!";
- ByteBuffer writeBuffer = ByteBuffer.allocate(4 + badKrbMessage.getBytes().length);
- writeBuffer.putInt(badKrbMessage.getBytes().length);
- writeBuffer.put(badKrbMessage.getBytes());
- writeBuffer.flip();
-
- socketChannel.write(writeBuffer);
+ Assert.assertTrue(socketChannel.isConnected());
}
@After
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/69866442/kerby-kerb/kerb-simplekdc/src/main/test/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/test/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java b/kerby-kerb/kerb-simplekdc/src/main/test/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java
deleted file mode 100644
index cb26513..0000000
--- a/kerby-kerb/kerb-simplekdc/src/main/test/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java
+++ /dev/null
@@ -1,75 +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.kerby.kerberos.kerb;
-
-import org.apache.kerby.kerberos.kerb.server.KdcServer;
-import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer;
-import org.apache.kerby.util.NetworkUtil;
-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;
-
-public class SimpleKdcServerTest {
- private String serverHost = "localhost";
- private int serverPort = -1;
-
- private KdcServer kdcServer;
-
- @Before
- public void setUp() throws Exception {
- kdcServer = new SimpleKdcServer();
- kdcServer.setKdcHost(serverHost);
- kdcServer.setAllowUdp(false);
- kdcServer.setAllowTcp(true);
- serverPort = NetworkUtil.getServerPort();
- kdcServer.setKdcTcpPort(serverPort);
- kdcServer.init();
- kdcServer.start();
- }
-
- @Test
- public void testKdc() throws IOException, InterruptedException {
- Thread.sleep(15);
-
- SocketChannel socketChannel = SocketChannel.open();
- socketChannel.configureBlocking(true);
- SocketAddress sa = new InetSocketAddress(serverHost, serverPort);
- socketChannel.connect(sa);
-
- String badKrbMessage = "Hello World!";
- ByteBuffer writeBuffer = ByteBuffer.allocate(4 + badKrbMessage.getBytes().length);
- writeBuffer.putInt(badKrbMessage.getBytes().length);
- writeBuffer.put(badKrbMessage.getBytes());
- writeBuffer.flip();
-
- socketChannel.write(writeBuffer);
- }
-
- @After
- public void tearDown() throws Exception {
- kdcServer.stop();
- }
-}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/69866442/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java b/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java
new file mode 100644
index 0000000..45e08e1
--- /dev/null
+++ b/kerby-kerb/kerb-simplekdc/src/test/java/org/apache/kerby/kerberos/kerb/SimpleKdcServerTest.java
@@ -0,0 +1,74 @@
+/**
+ * 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.kerby.kerberos.kerb;
+
+import org.apache.kerby.kerberos.kerb.server.KdcServer;
+import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer;
+import org.apache.kerby.util.NetworkUtil;
+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;
+
+public class SimpleKdcServerTest {
+ private String serverHost = "localhost";
+ private int serverPort = -1;
+
+ private KdcServer kdcServer;
+
+ @Before
+ public void setUp() throws Exception {
+ kdcServer = new SimpleKdcServer();
+ kdcServer.setKdcHost(serverHost);
+ kdcServer.setAllowUdp(false);
+ kdcServer.setAllowTcp(true);
+ serverPort = NetworkUtil.getServerPort();
+ kdcServer.setKdcTcpPort(serverPort);
+ kdcServer.init();
+ kdcServer.start();
+ }
+
+ @Test
+ public void testKdc() throws IOException, InterruptedException {
+ SocketChannel socketChannel = SocketChannel.open();
+ socketChannel.configureBlocking(true);
+ SocketAddress sa = new InetSocketAddress(serverHost, serverPort);
+ socketChannel.connect(sa);
+
+
+ String badKrbMessage = "Hello World!";
+ ByteBuffer writeBuffer = ByteBuffer.allocate(4 + badKrbMessage.getBytes().length);
+ writeBuffer.putInt(badKrbMessage.getBytes().length);
+ writeBuffer.put(badKrbMessage.getBytes());
+ writeBuffer.flip();
+
+ socketChannel.write(writeBuffer);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ kdcServer.stop();
+ }
+}