FISH-1352 Fixes exploded war test case

payara · Aug 10, 2021 · be508aa · be508aa
1 parent 8a13c38
commit be508aa
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 /payara-micro-gradle-plugin/.nb-gradle/
 /payara-micro-gradle-plugin/build/
 /payara-micro-gradle-plugin/.gradle/
-/.gradle
+/.gradle
+/payara-micro-gradle-plugin/src/test/resources/sample/.nb-gradle/
+/payara-micro-gradle-plugin/src/test/resources/sample/build/
+/payara-micro-gradle-plugin/src/test/resources/sample/.gradle/
+/payara-micro-gradle-plugin/src/test/resources/sample/userHome/
diff --git a/payara-micro-gradle-plugin/src/test/java/fish/payara/gradle/plugins/micro/BaseTest.java b/payara-micro-gradle-plugin/src/test/java/fish/payara/gradle/plugins/micro/BaseTest.java
@@ -42,6 +42,9 @@
 import static fish.payara.gradle.plugins.micro.ExplodeWarTask.EXPLODE_TASK_NAME;
 import static fish.payara.gradle.plugins.micro.StartTask.START_TASK_NAME;
 import static fish.payara.gradle.plugins.micro.StopTask.STOP_TASK_NAME;
+import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.awaitility.Awaitility;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -82,6 +85,7 @@ public abstract class BaseTest {
     protected Project buildProject() {
         project = ProjectBuilder.builder()
                 .withName(MOCK_PROJECT_NAME)
+                .withProjectDir(new File("src/test/resources/sample").getAbsoluteFile())
                 .build();
         project.setGroup(MOCK_PROJECT_GROUP_ID);
         project.setVersion(MOCK_PROJECT_VERSION);

diff --git a/payara-micro-gradle-plugin/src/test/resources/sample/src/main/webapp/WEB-INF/web.xml b/payara-micro-gradle-plugin/src/test/resources/sample/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+	 version="4.0">
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+</web-app>
diff --git a/payara-micro-gradle-plugin/src/test/resources/sample/src/main/webapp/index.html b/payara-micro-gradle-plugin/src/test/resources/sample/src/main/webapp/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Start Page</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h1>Hello from Payara!</h1>
+    </body>
+</html>