Use PortAuthority for LoadCSV tests

craigtaverner · SaschaPeukert · commit c62079e10faa · 2018-11-19T10:41:33.000+01:00
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/HttpServerTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/HttpServerTestSupport.scala
@@ -23,28 +23,24 @@ import com.sun.net.httpserver.{HttpExchange, HttpHandler, HttpServer}
 import java.net.{InetAddress, InetSocketAddress}
 import java.io.IOException
 import java.util.concurrent.Executors
+
+import org.neo4j.ports.allocation.PortAuthority
+
 import scala.collection.mutable
 
 trait HttpServerTestSupport {
   def boundInfo: InetSocketAddress
   def start()
-  def restart()
   def stop()
 }
 
 class HttpServerTestSupportBuilder {
-  val ASK_OS_TO_PROVIDE_A_PORT = 0
-  private var port = ASK_OS_TO_PROVIDE_A_PORT
+  private val port = PortAuthority.allocatePort
   private var allowedMethods: Set[String] = Set()
   private val mapping = new mutable.HashMap[String, (HttpExchange => Unit)]()
   private val filters = new mutable.HashMap[String, (HttpExchange => Boolean)]()
   private val transformations = new mutable.HashMap[String, (HttpExchange => HttpExchange)]()
 
-  def withPort(newPort: Int) {
-    assert(newPort >= 0 && newPort < 65536)
-    port = newPort
-  }
-
   def onPathReplyWithData(path: String, data: Array[Byte]) {
     assert(path != null && !path.isEmpty)
     assert(data != null)
@@ -108,7 +104,7 @@ class HttpServerTestSupportBuilder {
 
           val path = exchange.getRequestURI.getPath
           if (mapping.contains(path)) {
-            if (filters.getOrElse(path, {_: HttpExchange => true})(exchange)) {
+            if (filters.getOrElse(path, { _: HttpExchange => true })(exchange)) {
               val reply = transformations.getOrElse(path, identity[HttpExchange](_))(exchange)
               mapping(path)(reply)
             }
@@ -122,11 +118,6 @@ class HttpServerTestSupportBuilder {
       server.start()
     }
 
-    def restart(): Unit = {
-      stop()
-      start()
-    }
-
     def stop() {
       optServer.foreach(server => server.stop(0))
     }
