LPS-46481 - implement ways to override "mobile.device.type" property …

…in poshi
abdonpijpelink · May 3, 2014 · e130ca3 · e130ca3
1 parent b8ae316
commit e130ca3
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -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>
@@ Expand Down @@