From de5abdeb489d08b2ebd60f6dc6e176fd9eb74767 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 9 Jan 2014 18:43:13 +0900 Subject: [PATCH] Move the reusable classes in netty-testsuite to main/java/src and deploy them --- pom.xml | 37 ++++++++++++++++--- testsuite/pom.xml | 36 ++++++++++++------ .../transport/sctp/AbstractSctpTest.java | 5 +-- .../transport/sctp/SctpTestPermutation.java | 0 .../transport/sctp/package-info.java | 20 ++++++++++ .../socket/AbstractClientSocketTest.java | 3 +- .../socket/AbstractDatagramTest.java | 5 +-- .../socket/AbstractServerSocketTest.java | 6 +-- .../transport/socket/AbstractSocketTest.java | 10 ++--- .../socket/SocketTestPermutation.java | 0 .../transport/socket/package-info.java | 20 ++++++++++ .../netty/testsuite/util/BogusKeyStore.java | 0 .../util/BogusSslContextFactory.java | 0 .../util/BogusTrustManagerFactory.java | 0 .../io/netty/testsuite/util/TestUtils.java | 13 +++++++ .../io/netty/testsuite/util/package-info.java | 2 +- 16 files changed, 121 insertions(+), 36 deletions(-) rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java (93%) rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java (100%) create mode 100644 testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java (95%) rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java (93%) rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java (91%) rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java (86%) rename testsuite/src/{test => main}/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java (100%) create mode 100644 testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java rename testsuite/src/{test => main}/java/io/netty/testsuite/util/BogusKeyStore.java (100%) rename testsuite/src/{test => main}/java/io/netty/testsuite/util/BogusSslContextFactory.java (100%) rename testsuite/src/{test => main}/java/io/netty/testsuite/util/BogusTrustManagerFactory.java (100%) rename testsuite/src/{test => main}/java/io/netty/testsuite/util/TestUtils.java (90%) rename testsuite/src/{test => main}/java/io/netty/testsuite/util/package-info.java (91%) diff --git a/pom.xml b/pom.xml index ae50c3013e..79f11381c4 100644 --- a/pom.xml +++ b/pom.xml @@ -213,6 +213,38 @@ 2.2.0 + + + junit + junit + 4.11 + test + + + org.easymock + easymock + 3.2 + test + + + org.easymock + easymockclassextension + 3.2 + test + + + org.jmock + jmock-junit4 + 2.6.0 + test + + + ch.qos.logback + logback-classic + 1.0.13 + test + + org.jboss.marshalling @@ -249,31 +281,26 @@ junit junit - 4.11 test org.easymock easymock - 3.2 test org.easymock easymockclassextension - 3.2 test org.jmock jmock-junit4 - 2.6.0 test ch.qos.logback logback-classic - 1.0.13 test diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 88dcf422a2..fc93086d24 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -29,6 +29,31 @@ Netty/Testsuite + + junit + junit + compile + + + org.easymock + easymock + compile + + + org.easymock + easymockclassextension + compile + + + org.jmock + jmock-junit4 + compile + + + ch.qos.logback + logback-classic + compile + ${project.groupId} netty-transport-sctp @@ -50,16 +75,5 @@ ${project.version} - - - - - maven-deploy-plugin - - true - - - - diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java similarity index 93% rename from testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java rename to testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java index ff977ee53e..51a09ef963 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java @@ -57,8 +57,7 @@ public abstract class AbstractSctpTest { currentBootstrap = e.getValue(); sb = e.getKey().newInstance(); cb = e.getValue().newInstance(); - addr = new InetSocketAddress( - NetUtil.LOCALHOST, TestUtils.getFreePort()); + addr = new InetSocketAddress(NetUtil.LOCALHOST, TestUtils.getFreePort()); sb.localAddress(addr); sb.option(ChannelOption.ALLOCATOR, allocator); sb.childOption(ChannelOption.ALLOCATOR, allocator); @@ -69,7 +68,7 @@ public abstract class AbstractSctpTest { testName.getMethodName(), ++ i, COMBO.size(), sb, cb, StringUtil.simpleClassName(allocator))); try { Method m = getClass().getDeclaredMethod( - testName.getMethodName(), ServerBootstrap.class, Bootstrap.class); + TestUtils.testMethodName(testName), ServerBootstrap.class, Bootstrap.class); m.invoke(this, sb, cb); } catch (InvocationTargetException ex) { throw ex.getCause(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java similarity index 100% rename from testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java rename to testsuite/src/main/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java new file mode 100644 index 0000000000..1b9e3c1ea7 --- /dev/null +++ b/testsuite/src/main/java/io/netty/testsuite/transport/sctp/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012 The Netty Project + * + * The Netty Project 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. + */ + +/** + * Reusable classes that help testing the code that uses SCTP transport. + */ +package io.netty.testsuite.transport.sctp; diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java similarity index 95% rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java index 9ffd7d0d12..32b311912a 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java @@ -57,8 +57,7 @@ public abstract class AbstractClientSocketTest { "Running: %s %d of %d with %s", testName.getMethodName(), ++ i, COMBO.size(), StringUtil.simpleClassName(allocator))); try { - Method m = getClass().getDeclaredMethod( - testName.getMethodName(), Bootstrap.class); + Method m = getClass().getDeclaredMethod(TestUtils.testMethodName(testName), Bootstrap.class); m.invoke(this, cb); } catch (InvocationTargetException ex) { throw ex.getCause(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java similarity index 93% rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java index db7389b37f..7c35b6ba3c 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java @@ -53,8 +53,7 @@ public abstract class AbstractDatagramTest { for (Entry, Factory> e: COMBO) { sb = e.getKey().newInstance(); cb = e.getValue().newInstance(); - addr = new InetSocketAddress( - NetUtil.LOCALHOST4, TestUtils.getFreePort()); + addr = new InetSocketAddress(NetUtil.LOCALHOST4, TestUtils.getFreePort()); sb.localAddress(addr); sb.option(ChannelOption.ALLOCATOR, allocator); cb.localAddress(0).remoteAddress(addr); @@ -64,7 +63,7 @@ public abstract class AbstractDatagramTest { testName.getMethodName(), ++ i, COMBO.size(), sb, cb, StringUtil.simpleClassName(allocator))); try { Method m = getClass().getDeclaredMethod( - testName.getMethodName(), Bootstrap.class, Bootstrap.class); + TestUtils.testMethodName(testName), Bootstrap.class, Bootstrap.class); m.invoke(this, sb, cb); } catch (InvocationTargetException ex) { throw ex.getCause(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java similarity index 91% rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java index 59e922eae4..54ca4e0e4b 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java @@ -50,8 +50,7 @@ public abstract class AbstractServerSocketTest { int i = 0; for (Factory e: COMBO) { sb = e.newInstance(); - addr = new InetSocketAddress( - NetUtil.LOCALHOST, TestUtils.getFreePort()); + addr = new InetSocketAddress(NetUtil.LOCALHOST, TestUtils.getFreePort()); sb.localAddress(addr); sb.option(ChannelOption.ALLOCATOR, allocator); sb.childOption(ChannelOption.ALLOCATOR, allocator); @@ -60,8 +59,7 @@ public abstract class AbstractServerSocketTest { "Running: %s %d of %d (%s) with %s", testName.getMethodName(), ++ i, COMBO.size(), sb, StringUtil.simpleClassName(allocator))); try { - Method m = getClass().getDeclaredMethod( - testName.getMethodName(), ServerBootstrap.class); + Method m = getClass().getDeclaredMethod(TestUtils.testMethodName(testName), ServerBootstrap.class); m.invoke(this, sb); } catch (InvocationTargetException ex) { throw ex.getCause(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java similarity index 86% rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java index d267f67ccf..b9883de6eb 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java @@ -58,8 +58,7 @@ public abstract class AbstractSocketTest { currentBootstrap = e.getValue(); sb = e.getKey().newInstance(); cb = e.getValue().newInstance(); - addr = new InetSocketAddress( - NetUtil.LOCALHOST, TestUtils.getFreePort()); + addr = new InetSocketAddress(NetUtil.LOCALHOST, TestUtils.getFreePort()); sb.localAddress(addr); sb.option(ChannelOption.ALLOCATOR, allocator); sb.childOption(ChannelOption.ALLOCATOR, allocator); @@ -70,11 +69,8 @@ public abstract class AbstractSocketTest { "Running: %s %d of %d (%s + %s) with %s", testName.getMethodName(), ++ i, COMBO.size(), sb, cb, StringUtil.simpleClassName(allocator))); try { - String testMethodName = testName.getMethodName(); - if (testMethodName.contains("[")) { - testMethodName = testMethodName.substring(0, testMethodName.indexOf('[')); - } - Method m = getClass().getDeclaredMethod(testMethodName, ServerBootstrap.class, Bootstrap.class); + Method m = getClass().getDeclaredMethod( + TestUtils.testMethodName(testName), ServerBootstrap.class, Bootstrap.class); m.invoke(this, sb, cb); } catch (InvocationTargetException ex) { throw ex.getCause(); diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java similarity index 100% rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java rename to testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java diff --git a/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java b/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java new file mode 100644 index 0000000000..6f2f8cfd48 --- /dev/null +++ b/testsuite/src/main/java/io/netty/testsuite/transport/socket/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012 The Netty Project + * + * The Netty Project 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. + */ + +/** + * Reusable classes that help testing the code that uses socket and datagram transport. + */ +package io.netty.testsuite.transport.socket; diff --git a/testsuite/src/test/java/io/netty/testsuite/util/BogusKeyStore.java b/testsuite/src/main/java/io/netty/testsuite/util/BogusKeyStore.java similarity index 100% rename from testsuite/src/test/java/io/netty/testsuite/util/BogusKeyStore.java rename to testsuite/src/main/java/io/netty/testsuite/util/BogusKeyStore.java diff --git a/testsuite/src/test/java/io/netty/testsuite/util/BogusSslContextFactory.java b/testsuite/src/main/java/io/netty/testsuite/util/BogusSslContextFactory.java similarity index 100% rename from testsuite/src/test/java/io/netty/testsuite/util/BogusSslContextFactory.java rename to testsuite/src/main/java/io/netty/testsuite/util/BogusSslContextFactory.java diff --git a/testsuite/src/test/java/io/netty/testsuite/util/BogusTrustManagerFactory.java b/testsuite/src/main/java/io/netty/testsuite/util/BogusTrustManagerFactory.java similarity index 100% rename from testsuite/src/test/java/io/netty/testsuite/util/BogusTrustManagerFactory.java rename to testsuite/src/main/java/io/netty/testsuite/util/BogusTrustManagerFactory.java diff --git a/testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java b/testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java similarity index 90% rename from testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java rename to testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java index 7afb9889ce..d323152f62 100644 --- a/testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java +++ b/testsuite/src/main/java/io/netty/testsuite/util/TestUtils.java @@ -16,6 +16,8 @@ package io.netty.testsuite.util; import io.netty.util.NetUtil; +import org.junit.rules.TestName; + import java.io.IOException; import java.net.InetSocketAddress; import java.net.ServerSocket; @@ -111,5 +113,16 @@ public final class TestUtils { return false; } + /** + * Returns the method name of the current test. + */ + public static String testMethodName(TestName testName) { + String testMethodName = testName.getMethodName(); + if (testMethodName.contains("[")) { + testMethodName = testMethodName.substring(0, testMethodName.indexOf('[')); + } + return testMethodName; + } + private TestUtils() { } } diff --git a/testsuite/src/test/java/io/netty/testsuite/util/package-info.java b/testsuite/src/main/java/io/netty/testsuite/util/package-info.java similarity index 91% rename from testsuite/src/test/java/io/netty/testsuite/util/package-info.java rename to testsuite/src/main/java/io/netty/testsuite/util/package-info.java index b3bf1e3843..a090ecb9d1 100644 --- a/testsuite/src/test/java/io/netty/testsuite/util/package-info.java +++ b/testsuite/src/main/java/io/netty/testsuite/util/package-info.java @@ -15,6 +15,6 @@ */ /** - * Util Test suite classes + * Utility classes that help testing a network application. */ package io.netty.testsuite.util;