pull-request-144688

build-test-batch.xml

@@ -1608,7 +1608,8 @@ app.server.type=@{app.server.type}]]></echo>
 		<attribute default="true" name="setup.proxy" />
 		<attribute default="true" name="setup.testable.jboss" />
 		<attribute default="true" name="setup.testable.tomcat" />
-		<attribute default="false" name="startup.testing" />
+		<attribute default="false" name="startup.testing.cold" />
+		<attribute default="false" name="startup.testing.warm" />
 		<attribute default="" name="test.build.fix.pack.zip.url" />
 		<attribute default="" name="test.fix.pack.base.url" />
 		<attribute default="" name="test.legacy.database.dump" />
@@ -1674,6 +1675,7 @@ app.server.type=@{app.server.type}]]></echo>
 										<ant antfile="build-test-${app.server.type}.xml" inheritAll="false" target="run-selenium-${app.server.type}">
 											<property name="app.server.start.executable.arg.line" value="${test.batch.app.server.start.executable.arg.line}" />
 											<property name="database.type" value="@{database.type}" />
+											<property name="startup.testing.warm" value="@{startup.testing.warm}" />
 											<property name="functional.test.type" value="@{functional.test.type}" />
 											<property name="liferay.portal.bundle" value="@{test.portal.bundle.version}" />
 											<property name="test.build.plugins.war.zip.url" value="@{test.plugins.war.zip.url}" />
@@ -1696,7 +1698,7 @@ app.server.type=@{app.server.type}]]></echo>
 										</if>
 
 										<if>
-											<equals arg1="@{startup.testing}" arg2="true" />
+											<equals arg1="@{startup.testing.cold}" arg2="true" />
 											<then>
 												<antcall inheritall="false" target="stop-app-server" />
 
@@ -5092,8 +5094,20 @@ information. Make sure to commit in all format-javadoc results.
 		<run-functional-test app.server.type="jboss" app.server.version="7.4.0" database.type="mysql" database.version="5.7" test.portal.log.assert="true" />
 	</target>
 
-	<target name="functional-smoke-startup-tomcat90-mysql57-jdk8">
-		<run-functional-test app.server.type="tomcat" database.type="mysql" database.version="5.7" startup.testing="true" test.portal.log.assert="true" />
+	<target name="functional-smoke-startup-cold-tomcat90-hypersonic20-jdk8">
+		<run-functional-test app.server.type="tomcat" database.type="hypersonic" startup.testing.cold="true" test.portal.log.assert="true" />
+	</target>
+
+	<target name="functional-smoke-startup-cold-tomcat90-mysql57-jdk8">
+		<run-functional-test app.server.type="tomcat" database.type="mysql" database.version="5.7" startup.testing.cold="true" test.portal.log.assert="true" />
+	</target>
+
+	<target name="functional-smoke-startup-warm-tomcat90-hypersonic20-jdk8">
+		<run-functional-test app.server.type="tomcat" database.type="hypersonic" startup.testing.warm="true" test.portal.log.assert="true" />
+	</target>
+
+	<target name="functional-smoke-startup-warm-tomcat90-mysql57-jdk8">
+		<run-functional-test app.server.type="tomcat" database.type="mysql" database.version="5.7" startup.testing.warm="true" test.portal.log.assert="true" />
 	</target>
 
 	<target name="functional-smoke-tcserver40-mysql57-jdk8">
@@ -7196,6 +7210,53 @@ ${output.content}</echo>
 		</run-batch-test>
 	</target>
 
+	<target name="playwright-js-tomcat90-mysql57-jdk8">
+		<run-batch-test>
+			<test-action>
+				<database-test-run-test database.type="mysql" stop.app.server="true">
+					<test-action>
+						<delete dir="${liferay.home}/work" />
+
+						<antcall inheritAll="false" target="prepare-log4j-ext-xml" />
+
+						<antcall if:set="env.JENKINS_HOME" inheritAll="false" target="prepare-portal-ext-properties" />
+
+						<antcall inheritall="false" target="start-app-server" />
+
+						<waitfor maxwait="${timeout.app.server.wait}" maxwaitunit="second">
+							<http url="http://localhost:8080/web/guest" />
+						</waitfor>
+
+						<trycatch>
+							<try>
+								<start-docker-playwright />
+
+								<gradle-execute dir="${playwright.dir}" task="npmInstall" />
+
+								<docker-execute container="${playwright.docker.host}">
+									cd ${playwright.dir}
+
+									npx playwright test
+								</docker-execute>
+							</try>
+							<finally>
+								<stop-docker-playwright />
+
+								<antcall target="stop-app-server" />
+
+								<split-testsuites-junit-report test.suites.report.filepath="${playwright.dir}/test-results/TEST-playwright.xml" />
+							</finally>
+						</trycatch>
+					</test-action>
+				</database-test-run-test>
+			</test-action>
+
+			<test-set-up>
+				<setup-test-environment />
+			</test-set-up>
+		</run-batch-test>
+	</target>
+
 	<target name="plugins-compile-jdk8">
 		<run-batch-test>
 			<test-action>

build-test-elasticsearch7.xml

@@ -95,13 +95,21 @@
 		<attribute name="elasticsearch.java.home" />
 
 		<sequential>
-			<replace
-				file="${elasticsearch.dir}/bin/elasticsearch-env"
-			>
-				<replacetoken><![CDATA[#!/bin/bash]]></replacetoken>
-				<replacevalue><![CDATA[#!/bin/bash
-ES_JAVA_HOME=@{elasticsearch.java.home}]]></replacevalue>
-			</replace>
+			<if>
+				<isset property="env.JENKINS_HOME" />
+				<then>
+					<replace
+						file="${elasticsearch.dir}/bin/elasticsearch-env"
+					>
+						<replacetoken><![CDATA[#!/bin/bash]]></replacetoken>
+						<replacevalue><![CDATA[#!/bin/bash
+		ES_JAVA_HOME=@{elasticsearch.java.home}]]></replacevalue>
+					</replace>
+				</then>
+				<else>
+					<echo>Set ${elasticsearch.dir}/bin/elasticsearch-env manually.</echo>
+				</else>
+			</if>
 		</sequential>
 	</macrodef>
 

build-test-oauth2.xml

@@ -4,39 +4,36 @@
 	<import file="build-test.xml" />
 
 	<target name="prepare-oauth2-osgi-configuration">
-		<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies" />
-
 		<if>
-			<isset property="bundle.id" />
+			<available file="${project.dir}/portal-web/test/functional/com/liferay/portalweb/tests/coreinfrastructure/security/oauth2/dependencies/${osgi.config.file.name}" />
 			<then>
-				<copy
-					file="${osgi.dependency.dir}/${osgi.config.file.name}"
-					todir="${liferay.home}-${bundle.id}"
-				/>
+				<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/tests/coreinfrastructure/security/oauth2/dependencies" />
+			</then>
+			<else>
+				<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies" />
+			</else>
+		</if>
 
-				<replace
-					file="${liferay.home}-${bundle.id}/${osgi.config.file.name}"
-					token="companyId=L&quot;20098&quot;"
-					value="companyId=L&quot;${companyId}&quot;"
-				/>
+		<copy
+			file="${osgi.dependency.dir}/${osgi.config.file.name}"
+			todir="${liferay.home}"
+		/>
+
+		<replace
+			file="${liferay.home}/${osgi.config.file.name}"
+			token="companyId=L&quot;20098&quot;"
+			value="companyId=L&quot;${companyId}&quot;"
+		/>
 
+		<if>
+			<isset property="bundle.id" />
+			<then>
 				<move
-					file="${liferay.home}-${bundle.id}/${osgi.config.file.name}"
+					file="${liferay.home}/${osgi.config.file.name}"
 					todir="${liferay.home}-${bundle.id}/osgi/configs"
 				/>
 			</then>
 			<else>
-				<copy
-					file="${osgi.dependency.dir}/${osgi.config.file.name}"
-					todir="${liferay.home}"
-				/>
-
-				<replace
-					file="${liferay.home}/${osgi.config.file.name}"
-					token="companyId=L&quot;20098&quot;"
-					value="companyId=L&quot;${companyId}&quot;"
-				/>
-
 				<move
 					file="${liferay.home}/${osgi.config.file.name}"
 					todir="${liferay.home}/osgi/configs"

build-test-saml.xml

@@ -3,10 +3,58 @@
 <project basedir="." name="portal-test-saml" xmlns:antelope="antlib:ise.antelope.tasks">
 	<import file="build-test.xml" />
 
+	<target name="check-keystore-path">
+		<property name="keystoreDirectoryPattern" value="${liferay.home}/data/document_library" />
+
+		<dirset
+			dir="${keystoreDirectoryPattern}"
+			id="keystoreDirSet"
+			includes="*/0/saml/keystore.jks"
+		/>
+
+		<condition property="keystoreDirectoryExists">
+			<resourcecount count="0" refid="keystoreDirSet" when="greater" />
+		</condition>
+
+		<if>
+			<equals arg1="${keystoreDirectoryExists}" arg2="true" />
+			<then>
+				<echo file="${liferay.home}/result.txt">
+				The certificate file is saved to DL root folder.
+				</echo>
+			</then>
+			<else>
+				<echo file="${liferay.home}/result.txt">
+				The certificate file isn't saved to DL root folder.
+				</echo>
+			</else>
+		</if>
+	</target>
+
 	<target name="deploy-keystore-file">
 		<copy
 			file="${project.dir}/portal-web/test/functional/com/liferay/portalweb/tests/coreinfrastructureee/security/dependencies/keystore.jks"
 			todir="${liferay.home}/data"
 		/>
 	</target>
+
+	<target name="prepare-saml-keystore-osgi-configuration">
+		<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/tests/coreinfrastructureee/security/dependencies" />
+
+		<copy
+			file="${osgi.dependency.dir}/${osgi.config.file.name}"
+			todir="${liferay.home}"
+		/>
+
+		<replace
+			file="${liferay.home}/${osgi.config.file.name}"
+			token="FileSystemKeyStoreManagerImpl"
+			value="DLKeyStoreManagerImpl"
+		/>
+
+		<move
+			file="${liferay.home}/${osgi.config.file.name}"
+			todir="${liferay.home}/osgi/configs"
+		/>
+	</target>
 </project>

build-test-tomcat.xml

@@ -47,7 +47,9 @@
 	<target name="run-tomcat">
 		<lstopwatch action="start" name="run.tomcat" />
 
-		<antcall target="run-simple-server" />
+		<antcall target="run-simple-server">
+			<param name="startup.testing.cold" value="${startup.testing.cold}" />
+		</antcall>
 
 		<lstopwatch action="total" name="run.tomcat" />
 	</target>