Skip to content

Commit 9c49e22

Browse files
vicnate5brianchandotcom
authored andcommitted
LRQA-72752 Direct login
1 parent 62b7575 commit 9c49e22

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build-test-tck.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@
9494

9595
<propertycopy from="app.server.${app.server.type}.bin.dir" name="app.server.bin.dir" override="true" />
9696

97+
<antcall target="prepare-selenium-login-config" />
98+
9799
<antcall inheritall="false" target="start-app-server">
98100
<param name="app.server.bin.dir" value="${app.server.bin.dir}" />
99101
</antcall>
@@ -129,7 +131,9 @@
129131
</call>
130132
</xmltask>
131133

132-
<var name="tck.properties" value="-Dtest.context.base='${test.context.base[tck]}' -Dtest.server.username.id='${test.server.username.id[tck]}' -Dtest.server.username='${test.server.username[tck]}' -Dtest.server.password.id='${test.server.password.id[tck]}' -Dtest.server.password='${test.server.password[tck]}' -Dtest.timeout='${test.timeout[tck]}' -Dtest.ignore.list.file=${project.dir}/tools/tck/ignoredTestCases.xml -Dtest.non.exclusive.file=${project.dir}/tools/tck/nonExclusiveTestCases.xml" />
134+
<var name="tck.login.url" value="http://localhost:8080/group/portlet-tck?SM_USER=test@liferay.com" />
135+
136+
<var name="tck.properties" value="-Dtest.context.base='${test.context.base[tck]}' -Dtest.server.username.id='${test.server.username.id[tck]}' -Dtest.server.username='${test.server.username[tck]}' -Dtest.server.password.id='${test.server.password.id[tck]}' -Dtest.server.password='${test.server.password[tck]}' -Dtest.timeout='${test.timeout[tck]}' -Dtest.ignore.list.file=${project.dir}/tools/tck/ignoredTestCases.xml -Dtest.non.exclusive.file=${project.dir}/tools/tck/nonExclusiveTestCases.xml -Dtest.server.login.url=${tck.login.url}" />
133137

134138
<execute dir="${tck.home}" failonerror="true">
135139
mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=htmlunit -Dtest.browser.binary= -Dtest.browser.webDriver= -Dtest.list.file=${project.dir}/tools/tck/htmlunit-tests.xml test
@@ -159,7 +163,7 @@
159163
<propertycopy from="selenium.${browser.type[tck]}.driver.executable" name="tck.selenium.browser.driver.executable" silent="true" />
160164

161165
<execute dir="${tck.home}" failonerror="true">
162-
mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=${browser.type[tck]} -Dtest.browser.binary='${tck.browser.bin.file}' -Dtest.browser.webDriver=${project.dir}/tools/tck/../${selenium.executable.dir.name}${tck.selenium.browser.driver.executable} -Dtest.list.file=${tck.tests.xml} test
166+
mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=${browser.type[tck]} -Dtest.browser.binary='${tck.browser.bin.file}' -Dtest.browser.webDriver=${project.dir}/tools/tck/../${selenium.executable.dir.name}${tck.selenium.browser.driver.executable} -Dtest.list.file=${tck.tests.xml} -Dtest.server.login.url=${tck.login.url} test
163167
</execute>
164168

165169
<if>

0 commit comments

Comments
 (0)