fix jetty port

pandafw · Jul 22, 2023 · 4f811db · 4f811db
1 parent d7d29e0
commit 4f811db
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 53 deletions.
diff --git a/panda-gear/src/test/java/panda/mvc/testapp/BaseWebappTest.java b/panda-gear/src/test/java/panda/mvc/testapp/BaseWebappTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.Map;
 
 import org.junit.Before;
@@ -28,49 +27,24 @@ public abstract class BaseWebappTest {
 
 	private static Thread server;
 	private static Throwable error;
-	
+
 	protected static HttpResponse resp;
 
 	@Before
 	public void startServer() throws Throwable {
 		if (server != null) {
 			return;
 		}
-		
+
 		if (error != null) {
 			throw error;
 		}
-		
+
 		try {
-			server = Threads.start(new Runnable() {
-				@Override
-				public void run() {
-					String xml = "WEB-INF/web.xml";
-					URL url = BaseWebappTest.class.getResource(xml);
-					String path = url.toExternalForm();
-					String war = path.substring(0, path.length() - xml.length());
-					war = Strings.removeStart(war, "file:");
-					System.out.println("-------------------------------------");
-					System.out.println(" WAR: " + war);
-					System.out.println("-------------------------------------");
-					try {
-						System.setProperty("tomcat.util.http.parser.HttpParser.requestTargetAllow", "|{}&");
-						webapp.runner.launch.Main.main(new String[] { 
-								"--port", "9999", 
-								"--path", CONTEXT, 
-								"-ArelaxedPathChars=[]|{}&",
-								"-ArelaxedQueryChars=[]|{}&",
-								"--temp-directory", "out/tomcat",
-								war });
-					}
-					catch (Exception e) {
-						error = e;
-					}
-				}
-			});
+			server = startTomcat();
+
 			Threads.safeSleep(10000);
-		}
-		catch (Throwable e) {
+		} catch (Throwable e) {
 			server = null;
 			error = e;
 		}
@@ -80,14 +54,43 @@ public void run() {
 		}
 	}
 
+	private Thread startTomcat() {
+		return Threads.start(new Runnable() {
+			@Override
+			public void run() {
+				String xml = "WEB-INF/web.xml";
+				String path = BaseWebappTest.class.getResource(xml).toExternalForm();
+				String war = path.substring(0, path.length() - xml.length());
+				war = Strings.removeStart(war, "file:");
+				System.out.println("-------------------------------------");
+				System.out.println(" WAR: " + war);
+				System.out.println("-------------------------------------");
+				try {
+					System.setProperty("tomcat.util.http.parser.HttpParser.requestTargetAllow", "|{}&");
+					webapp.runner.launch.Main.main(new String[] { 
+							"--port", "9999", 
+							"--path", CONTEXT, 
+							"-ArelaxedPathChars=[]|{}&",
+							"-ArelaxedQueryChars=[]|{}&",
+							"--temp-directory", "out/tomcat",
+							war });
+				}
+				catch (Exception e) {
+					error = e;
+				}
+			}
+		});
+	}
+
+
 	public String getContextPath() {
 		return CONTEXT;
 	}
 
 	public String getServerURL() {
 		return SERVER_URL;
 	}
-	
+
 	public String getBaseURL() {
 		return SERVER_URL + getContextPath();
 	}
@@ -100,12 +103,11 @@ public HttpResponse get(String path, boolean redirect) {
 		try {
 			HttpRequest hr = HttpRequest.create(getBaseURL() + path, HttpMethod.GET);
 			hr.asWindowsChrome();
-			
+
 			HttpClient hc = new HttpClient(hr);
 			hc.setAutoRedirect(redirect);
 			resp = hc.send();
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			throw Exceptions.wrapThrow(e);
 		}
 		assertNotNull(resp);
@@ -115,8 +117,7 @@ public HttpResponse get(String path, boolean redirect) {
 	public HttpResponse post(String path, Map<String, Object> params) {
 		try {
 			resp = HttpClient.post(getBaseURL() + path, params);
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			throw Exceptions.wrapThrow(e);
 		}
 		assertNotNull(resp);
@@ -126,7 +127,7 @@ public HttpResponse post(String path, Map<String, Object> params) {
 	public HttpResponse post(String path, String data) {
 		return post(path, data, MimeTypes.APP_STREAM);
 	}
-	
+
 	public HttpResponse post(String path, String data, String contentType) {
 		try {
 			HttpRequest hr = HttpRequest.create(getBaseURL() + path, HttpMethod.POST);
@@ -138,8 +139,7 @@ public HttpResponse post(String path, String data, String contentType) {
 			HttpClient hc = new HttpClient(hr);
 
 			resp = hc.send();
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			throw Exceptions.wrapThrow(e);
 		}
 		assertNotNull(resp);
@@ -149,8 +149,7 @@ public HttpResponse post(String path, String data, String contentType) {
 	public HttpResponse post(String path, byte[] data) {
 		try {
 			resp = HttpClient.post(getBaseURL() + path, data);
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			throw Exceptions.wrapThrow(e);
 		}
 		assertNotNull(resp);

diff --git a/panda-gear/src/test/java/panda/mvc/testapp/views/JspViewTest.java b/panda-gear/src/test/java/panda/mvc/testapp/views/JspViewTest.java
@@ -15,22 +15,28 @@ public class JspViewTest extends BaseWebappTest {
 
 	@Test
 	public void test_jsp2() throws IOException {
-		get("/views/jsp2");
-		System.out.println("2: " + resp.getContentText());
-		assertEquals("2", resp.getContentText());
+		if ("true".equalsIgnoreCase(System.getProperty("JSP_ENABLED"))) {
+			get("/views/jsp2");
+			System.out.println("2: " + resp.getContentText());
+			assertEquals("2", resp.getContentText());
+		}
 	}
 
 	@Test
 	public void test_jsp3() throws IOException {
-		get("/views/jsp3");
-		System.out.println("3: " + resp.getContentText());
-		assertEquals("3", resp.getContentText());
+		if ("true".equalsIgnoreCase(System.getProperty("JSP_ENABLED"))) {
+			get("/views/jsp3");
+			System.out.println("3: " + resp.getContentText());
+			assertEquals("3", resp.getContentText());
+		}
 	}
 
 	@Test
 	public void test_jsp4() throws IOException {
-		get("/views/jsp4");
-		System.out.println("4: " + resp.getContentText());
-		assertEquals("4", resp.getContentText());
+		if ("true".equalsIgnoreCase(System.getProperty("JSP_ENABLED"))) {
+			get("/views/jsp4");
+			System.out.println("4: " + resp.getContentText());
+			assertEquals("4", resp.getContentText());
+		}
 	}
 }
diff --git a/panda-gems/src/main/java/panda/app/JettyLauncher.java b/panda-gems/src/main/java/panda/app/JettyLauncher.java
@@ -143,7 +143,7 @@ public static void main(String[] args) throws Exception {
 			return;
 		}
 
-		Server server = new Server(8080);
+		Server server = new Server(clas.port);
 
 		WebAppContext webapp = new WebAppContext();
 		webapp.setContextPath(clas.contextPath);