Let ExpectationServer support specified port

Author: ligangty

core/src/main/java/org/commonjava/test/http/expect/ExpectationServer.java

@@ -32,6 +32,7 @@
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.BindException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
@@ -56,11 +57,25 @@ public ExpectationServer()
         this( null );
     }
 
+    public ExpectationServer( final int port )
+    {
+        this( null, port );
+    }
+
     public ExpectationServer( final String baseResource )
     {
         servlet = new ExpectationServlet( baseResource );
     }
 
+    public ExpectationServer( final String baseResource, final int port )
+    {
+        servlet = new ExpectationServlet( baseResource );
+        if ( port >= 80 )
+        {
+            this.port = port;
+        }
+    }
+
     public int getPort()
     {
         return port;
@@ -92,25 +107,42 @@ public ExpectationServer start()
         final DeploymentManager dm = Servlets.defaultContainer().addDeployment( di );
         dm.deploy();
 
-        final AtomicReference<Integer> foundPort = new AtomicReference<>();
-        server = PortFinder.findPortFor( 16, p -> {
-            foundPort.set( p );
+        boolean started = false;
+        if ( this.port != null && this.port >= 80 )
+        {
             try
             {
-                Undertow s = Undertow.builder().setHandler( dm.start() ).addHttpListener( p, "127.0.0.1" ).build();
-                s.start();
-
-                return s;
+                server = Undertow.builder().setHandler( dm.start() ).addHttpListener( this.port, "127.0.0.1" ).build();
+                server.start();
+                started = true;
             }
-            catch ( ServletException e )
+            catch ( Exception e )
             {
-                throw new IOException( "Failed to start: " + e.getMessage(), e );
+                logger.warn( "The port {} is occupied, will find another port to try!", this.port );
             }
-        } );
-
-        this.port = foundPort.get();
+        }
+        if ( !started )
+        {
+            final AtomicReference<Integer> foundPort = new AtomicReference<>();
+            server = PortFinder.findPortFor( 16, p -> {
+                foundPort.set( p );
+                try
+                {
+                    Undertow s = Undertow.builder().setHandler( dm.start() ).addHttpListener( p, "127.0.0.1" ).build();
+                    s.start();
+
+                    return s;
+                }
+                catch ( ServletException e )
+                {
+                    throw new IOException( "Failed to start: " + e.getMessage(), e );
+                }
+            } );
+
+            this.port = foundPort.get();
+        }
 
-        logger.info( "STARTED Test HTTP Server on 127.0.0.1:" + port );
+        logger.info( "STARTED Test HTTP Server on 127.0.0.1:{}", port );
 
         return this;
     }

junit5/src/main/java/org/commonjava/test/http/junit5/annotations/Expected.java

@@ -28,4 +28,6 @@
 public @interface Expected
 {
     String base() default "";
+
+    int port() default 0;
 }

junit5/src/main/java/org/commonjava/test/http/junit5/expect/ExpectationServerExtension.java

@@ -21,12 +21,16 @@
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Field;
 
 public class ExpectationServerExtension
         implements AfterEachCallback, BeforeEachCallback, TestInstancePostProcessor
 {
+    private final Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private ExpectationServer server;
 
     @SuppressWarnings( "unused" )
@@ -67,10 +71,13 @@ public void postProcessTestInstance( Object testInstance, ExtensionContext conte
             {
                 Expected expected = field.getAnnotation( Expected.class );
                 String base = expected.base();
-                this.server = new ExpectationServer( base );
+                int port = expected.port();
+                logger.debug( "Found field with @Expected annotation, base resource is {}, port is {}", base, port );
+                this.server = new ExpectationServer( base, port );
                 field.setAccessible( true );
                 if ( field.getType().equals( ExpectationServer.class ) )
                 {
+                    logger.debug( "Injecting the field {} with server instance", field.getName() );
                     field.set( testInstance, this.server );
                     return;
                 }

junit5/src/test/java/org/commonjava/test/http/junit5/TestHttpServerExtendWithTest.java

@@ -38,14 +38,13 @@
 public class TestHttpServerExtendWithTest
 {
     //    @RegisterExtension
-    @Expected( base = "repos" )
+    @Expected( base = "repos", port = 9090)
     private ExpectationServer server;
 
     @Test
     public void simpleDownload()
             throws Exception
     {
-        // final ExpectationServer server = expected.getServer();
         final String subPath = "/path/to/something.txt";
         final String content = "this is the content";
         final String url = server.formatUrl( subPath );