From e130ca38d8a18f8f387e8232c47679a41a7d5aa9 Mon Sep 17 00:00:00 2001
From: Kwang Lee <kwang.lee@liferay.com>
Date: Fri, 2 May 2014 11:52:42 -0700
Subject: [PATCH] LPS-46481 - implement ways to override "mobile.device.type"
 property in poshi

---
 build-test-geronimo.xml          |  2 ++
 build-test-glassfish.xml         |  2 ++
 build-test-jboss-eap.xml         |  2 ++
 build-test-jboss.xml             |  2 ++
 build-test-jetty.xml             |  2 ++
 build-test-jonas.xml             |  2 ++
 build-test-resin.xml             |  2 ++
 build-test-tcserver.xml          |  2 ++
 build-test-tomcat-oracle.xml     |  2 ++
 build-test-tomcat-postgresql.xml |  2 ++
 build-test-tomcat.xml            |  2 ++
 build-test-weblogic.xml          |  2 ++
 build-test-websphere.xml         |  2 ++
 build-test.xml                   | 20 ++++++++++++++------
 14 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/build-test-geronimo.xml b/build-test-geronimo.xml
index d52860a2d2a012..c8b049fa17b58b 100644
--- a/build-test-geronimo.xml
+++ b/build-test-geronimo.xml
@@ -29,6 +29,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-glassfish.xml b/build-test-glassfish.xml
index 042f12c363795b..cd3ab42bc064f1 100644
--- a/build-test-glassfish.xml
+++ b/build-test-glassfish.xml
@@ -40,6 +40,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-jboss-eap.xml b/build-test-jboss-eap.xml
index d8edd3553d0530..d7177197fe9385 100644
--- a/build-test-jboss-eap.xml
+++ b/build-test-jboss-eap.xml
@@ -32,6 +32,8 @@ app.server.jboss.zip.name=jboss-eap-${app.server.jboss.version}.zip</echo>
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-jboss.xml b/build-test-jboss.xml
index 3f0d329033978c..5d44bec89bc90c 100644
--- a/build-test-jboss.xml
+++ b/build-test-jboss.xml
@@ -29,6 +29,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-jetty.xml b/build-test-jetty.xml
index 20fb2aedd09c8d..e174fd08ffe5be 100644
--- a/build-test-jetty.xml
+++ b/build-test-jetty.xml
@@ -65,6 +65,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-jonas.xml b/build-test-jonas.xml
index 32660ec192b81e..51230cc38cb2db 100644
--- a/build-test-jonas.xml
+++ b/build-test-jonas.xml
@@ -40,6 +40,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-resin.xml b/build-test-resin.xml
index 72b626b09ae226..e779095e062caf 100644
--- a/build-test-resin.xml
+++ b/build-test-resin.xml
@@ -53,6 +53,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-virtual-host-name-properties" />
 
 		<antcall target="start-selenium" />
diff --git a/build-test-tcserver.xml b/build-test-tcserver.xml
index fad395636a709b..3f5aeed267b510 100644
--- a/build-test-tcserver.xml
+++ b/build-test-tcserver.xml
@@ -61,6 +61,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<if>
 			<isset property="vm.host" />
 			<then>
diff --git a/build-test-tomcat-oracle.xml b/build-test-tomcat-oracle.xml
index c6d089b4198761..d2f2dbd684d766 100644
--- a/build-test-tomcat-oracle.xml
+++ b/build-test-tomcat-oracle.xml
@@ -19,6 +19,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<if>
 			<isset property="vm.host" />
 			<then>
diff --git a/build-test-tomcat-postgresql.xml b/build-test-tomcat-postgresql.xml
index 6aed5aea5f07fe..a450cfa6c3fe06 100644
--- a/build-test-tomcat-postgresql.xml
+++ b/build-test-tomcat-postgresql.xml
@@ -19,6 +19,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<if>
 			<isset property="vm.host" />
 			<then>
diff --git a/build-test-tomcat.xml b/build-test-tomcat.xml
index a71933c8285404..9b9c6068c11a64 100644
--- a/build-test-tomcat.xml
+++ b/build-test-tomcat.xml
@@ -17,6 +17,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<if>
 			<isset property="vm.host" />
 			<then>
diff --git a/build-test-weblogic.xml b/build-test-weblogic.xml
index 0afe42e342e270..8872bb4739acde 100644
--- a/build-test-weblogic.xml
+++ b/build-test-weblogic.xml
@@ -19,6 +19,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-selenium">
 			<param name="test.class" value="${test.name}" />
 		</antcall>
diff --git a/build-test-websphere.xml b/build-test-websphere.xml
index 17d7424b8e60bc..3088f3f6b0f9ce 100644
--- a/build-test-websphere.xml
+++ b/build-test-websphere.xml
@@ -19,6 +19,8 @@
 
 		<antcall target="revert-test-properties" />
 
+		<ant dir="portal-impl" target="build-selenium-new-test-case" />
+
 		<antcall target="prepare-selenium">
 			<param name="test.class" value="${test.name}" />
 		</antcall>
diff --git a/build-test.xml b/build-test.xml
index 129ce408e05d78..9cd0ad39679401 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -29,9 +29,6 @@
 
 	<propertycopy from="liferay.portal.${liferay.portal.branch}.bundle" name="liferay.portal.bundle" />
 
-	<propertycopy from="mobile.device.resolution[${mobile.device.type}]" name="mobile.device.resolution" />
-	<propertycopy from="mobile.device.user.agent[${mobile.device.type}]" name="mobile.device.user.agent" />
-
 	<propertycopy from="operating.system.${operating.system.type}.version" name="operating.system.version" />
 
 	<property name="plink.executable" location="${project.dir}/tools/putty/plink.exe" />
@@ -1077,6 +1074,10 @@ create database lportal2 character set utf8;</echo>
 	</target>
 
 	<target name="generate-test-properties" depends="check-config">
+		<property file="${project.dir}/test.generated.properties" />
+
+		<var name="mobile.device.type" unset="true" />
+
 		<if>
 			<contains string="${test.class}" substring="#" />
 			<then>
@@ -1139,6 +1140,15 @@ create database lportal2 character set utf8;</echo>
 		</loadfile>
 
 		<echo file="${basedir}/test.run.properties">${test.properties.expanded}</echo>
+
+		<property file="${project.dir}/test.${user.name}.properties" />
+		<property file="${project.dir}/test.${env.COMPUTERNAME}.properties" />
+		<property file="${project.dir}/test.${env.HOST}.properties" />
+		<property file="${project.dir}/test.${env.HOSTNAME}.properties" />
+		<property file="${project.dir}/test.properties" />
+
+		<propertycopy from="mobile.device.resolution[${mobile.device.type}]" name="mobile.device.resolution" />
+		<propertycopy from="mobile.device.user.agent[${mobile.device.type}]" name="mobile.device.user.agent" />
 	</target>
 
 	<target name="merge-jenkins-test-results">
@@ -1734,9 +1744,7 @@ tck.url=true</echo>
 		</replace>
 	</target>
 
-	<target name="prepare-selenium">
-		<ant dir="portal-impl" target="build-selenium-new-test-case" />
-
+	<target name="prepare-selenium" depends="generate-test-properties">
 		<delete file="portal-web/test/test-portal-web-ext.properties" />
 
 		<if>