From 2cdc48e97f21b26dca49be8965cb739806706e7d Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 21 Aug 2014 15:18:10 +0200
Subject: [PATCH] Moved NPNModuleTest to module 'jetty-npn-server'.

This follows where npn module files have been moved to.
---
 jetty-npn/jetty-npn-server/pom.xml                |  6 ++++++
 .../eclipse/jetty/npn}/server/NPNModuleTest.java  | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 rename {jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy => jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn}/server/NPNModuleTest.java (94%)

diff --git a/jetty-npn/jetty-npn-server/pom.xml b/jetty-npn/jetty-npn-server/pom.xml
index 3c606d34a27..7f0590f14a6 100644
--- a/jetty-npn/jetty-npn-server/pom.xml
+++ b/jetty-npn/jetty-npn-server/pom.xml
@@ -39,6 +39,12 @@
       <version>${npn.api.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-start</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-test-helper</artifactId>
diff --git a/jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/NPNModuleTest.java b/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java
similarity index 94%
rename from jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/NPNModuleTest.java
rename to jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java
index b9c74a63ce5..f1c8b1a2a56 100644
--- a/jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/NPNModuleTest.java
+++ b/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java
@@ -16,10 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.spdy.server;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+package org.eclipse.jetty.npn.server;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -47,6 +44,12 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 @RunWith(Parameterized.class)
 public class NPNModuleTest
 {
@@ -69,7 +72,7 @@ public class NPNModuleTest
     @Parameters(name = "{index}: mod:{0}")
     public static List<Object[]> data()
     {
-        File npnBootModDir = MavenTestingUtils.getProjectDir("../spdy-http-server/src/main/config/modules/protonego-impl");
+        File npnBootModDir = MavenTestingUtils.getProjectDir("src/main/config/modules/protonego-impl");
         List<Object[]> data = new ArrayList<>();
         for (File file : npnBootModDir.listFiles())
         {
@@ -89,7 +92,7 @@ public class NPNModuleTest
     @BeforeClass
     public static void initBaseHome() throws IOException
     {
-        File homeDir = MavenTestingUtils.getProjectDir("../spdy-http-server/src/main/config");
+        File homeDir = MavenTestingUtils.getProjectDir("src/main/config");
         File baseDir = MavenTestingUtils.getTargetTestingDir(NPNModuleTest.class.getName());
         FS.ensureEmpty(baseDir);