From 2a72c876734abfdfa1fe12041b7d3f0e808cc4ab Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Mon, 20 Feb 2017 14:06:48 +0100
Subject: [PATCH] Move AutobahnTestsuite to extra module

Motivation:
We should move the AutobahnTestsuite to an extra module. This allows easier to run only the testsuite or only the autobahntestsuite

Modifications:

Create a new module (testsuite-autobahn)

Result:

Better project structure.
---
 pom.xml                                       |  1 +
 testsuite-autobahn/pom.xml                    | 79 +++++++++++++++++++
 .../testsuite}/autobahn/AutobahnServer.java   |  2 +-
 .../autobahn/AutobahnServerHandler.java       |  2 +-
 .../autobahn/AutobahnServerInitializer.java   |  2 +-
 .../testsuite}/autobahn/package-info.java     |  2 +-
 testsuite/pom.xml                             | 36 ---------
 7 files changed, 84 insertions(+), 40 deletions(-)
 create mode 100644 testsuite-autobahn/pom.xml
 rename {testsuite/src/main/java/io/netty/testsuite/websockets => testsuite-autobahn/src/main/java/io/netty/testsuite}/autobahn/AutobahnServer.java (97%)
 rename {testsuite/src/main/java/io/netty/testsuite/websockets => testsuite-autobahn/src/main/java/io/netty/testsuite}/autobahn/AutobahnServerHandler.java (99%)
 rename {testsuite/src/main/java/io/netty/testsuite/websockets => testsuite-autobahn/src/main/java/io/netty/testsuite}/autobahn/AutobahnServerInitializer.java (96%)
 rename {testsuite/src/main/java/io/netty/testsuite/websockets => testsuite-autobahn/src/main/java/io/netty/testsuite}/autobahn/package-info.java (98%)

diff --git a/pom.xml b/pom.xml
index 44fa35012b..2c88cb4756 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,7 @@
     <module>handler-proxy</module>
     <module>example</module>
     <module>testsuite</module>
+    <module>testsuite-autobahn</module>
     <module>testsuite-osgi</module>
     <module>microbench</module>
     <module>all</module>
diff --git a/testsuite-autobahn/pom.xml b/testsuite-autobahn/pom.xml
new file mode 100644
index 0000000000..fb3970df3b
--- /dev/null
+++ b/testsuite-autobahn/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.1.9.Final-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>netty-testsuite-autobahn</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Testsuite/Autobahn</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>skipTests</id>
+      <activation>
+        <property>
+          <name>skipTests</name>
+        </property>
+      </activation>
+      <properties>
+        <skipAutobahnTestsuite>true</skipAutobahnTestsuite>
+      </properties>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>me.normanmaurer.maven.autobahntestsuite</groupId>
+        <artifactId>autobahntestsuite-maven-plugin</artifactId>
+        <version>0.1.4</version>
+        <configuration>
+          <mainClass>io.netty.testsuite.autobahn.AutobahnServer</mainClass>
+          <cases>
+            <case>*</case>
+          </cases>
+          <excludeCases />
+          <failOnNonStrict>false</failOnNonStrict>
+          <skip>${skipAutobahnTestsuite}</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>test</phase>
+            <goals>
+              <goal>fuzzingclient</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServer.java
similarity index 97%
rename from testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java
rename to testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServer.java
index 3be31b974f..19d0a2582b 100644
--- a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServer.java
+++ b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.testsuite.websockets.autobahn;
+package io.netty.testsuite.autobahn;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
diff --git a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServerHandler.java
similarity index 99%
rename from testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java
rename to testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServerHandler.java
index 329d43918c..75f40621e4 100644
--- a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerHandler.java
+++ b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServerHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.testsuite.websockets.autobahn;
+package io.netty.testsuite.autobahn;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
diff --git a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServerInitializer.java
similarity index 96%
rename from testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
rename to testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServerInitializer.java
index d54a8ea26b..586460cd8a 100644
--- a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
+++ b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/AutobahnServerInitializer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.testsuite.websockets.autobahn;
+package io.netty.testsuite.autobahn;
 
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
diff --git a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/package-info.java b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/package-info.java
similarity index 98%
rename from testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/package-info.java
rename to testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/package-info.java
index 6d46688865..42b1a36b55 100644
--- a/testsuite/src/main/java/io/netty/testsuite/websockets/autobahn/package-info.java
+++ b/testsuite-autobahn/src/main/java/io/netty/testsuite/autobahn/package-info.java
@@ -60,5 +60,5 @@
  *
  * <p>10. See the results in <tt>./reports/servers/index.html</tt>
  */
-package io.netty.testsuite.websockets.autobahn;
+package io.netty.testsuite.autobahn;
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index f52e49338e..5d6b1f73c6 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -91,20 +91,6 @@
     <argLine.java9.extras>--add-exports java.base/sun.security.x509=ALL-UNNAMED</argLine.java9.extras>
   </properties>
 
-  <profiles>
-    <profile>
-      <id>skipTests</id>
-      <activation>
-        <property>
-          <name>skipTests</name>
-        </property>
-      </activation>
-      <properties>
-        <skipAutobahnTestsuite>true</skipAutobahnTestsuite>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
@@ -114,28 +100,6 @@
           <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>me.normanmaurer.maven.autobahntestsuite</groupId>
-        <artifactId>autobahntestsuite-maven-plugin</artifactId>
-        <version>0.1.4</version>
-        <configuration>
-          <mainClass>io.netty.testsuite.websockets.autobahn.AutobahnServer</mainClass>
-          <cases>
-            <case>*</case>
-          </cases>
-          <excludeCases />
-          <failOnNonStrict>false</failOnNonStrict>
-          <skip>${skipAutobahnTestsuite}</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>test</phase>
-            <goals>
-              <goal>fuzzingclient</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>