Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LPD-28953 Remove SugarCRMObjectEntryManagerImplTest test from ignored #3281

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

LPD-28953 Remove SugarCRMObjectEntryManagerImplTest test from ignored #3281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a085e1
LPD-28953 Add keys to not be printed
guilhermedcamacho Jun 19, 2024
98fd2bb
LPD-28953 Remove test from ignored
guilhermedcamacho Jun 19, 2024
3fdb0a4
LPD-XXX DO NOT MERGE
guilhermedcamacho Jun 19, 2024
41a482b
LPD-28953 Add sugarcrm properties
pyoo47 Jun 20, 2024
d8522a0
LPD-28953 SF
pyoo47 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build-test-batch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2418,6 +2418,8 @@ ${poshi.runner.testsuite.testcase.name}</echo>

<antcall target="prepare-portal-test-object-storage-salesforce-properties" />

<antcall target="prepare-portal-test-object-storage-sugarcrm-properties" />

<ant dir="portal-test" inheritAll="false" target="deploy" />

<setup-test-batch-testable-tomcat test.portal.bundle.version="@{test.portal.bundle.version}" />
Expand Down
169 changes: 169 additions & 0 deletions build-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4133,6 +4133,64 @@ tell application "Safari" to quit
</sequential>
</macrodef>

<macrodef name="prepare-selenium-object-storage-sugarcrm-properties">
<sequential>
<if>
<isset property="object.storage.sugarcrm.access.token.url" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.access.token.url=${object.storage.sugarcrm.access.token.url}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.base.url" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.base.url=${object.storage.sugarcrm.base.url}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.client.id" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.client.id=${object.storage.sugarcrm.client.id}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.grant.type" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.grant.type=${object.storage.sugarcrm.grant.type}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.password" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.password=${object.storage.sugarcrm.password}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.username" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.username=${object.storage.sugarcrm.username}
</echo>
</then>
</if>
</sequential>
</macrodef>

<macrodef name="prepare-selenium-onedrive-properties">
<sequential>
<if>
Expand Down Expand Up @@ -12679,6 +12737,62 @@ captcha.enforce.disabled=true</echo>
</if>
</target>

<target name="prepare-portal-test-object-storage-sugarcrm-properties">
<if>
<isset property="object.storage.sugarcrm.access.token.url" />
<then>
<echo append="true" file="${project.dir}/portal-test/src/test-portal-impl.properties">
object.storage.sugarcrm.access.token.url=${object.storage.sugarcrm.access.token.url}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.base.url" />
<then>
<echo append="true" file="${project.dir}/portal-test/src/test-portal-impl.properties">
object.storage.sugarcrm.base.url=${object.storage.sugarcrm.base.url}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.client.id" />
<then>
<echo append="true" file="${project.dir}/portal-test/src/test-portal-impl.properties">
object.storage.sugarcrm.client.id=${object.storage.sugarcrm.client.id}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.grant.type" />
<then>
<echo append="true" file="${project.dir}/portal-test/src/test-portal-impl.properties">
object.storage.sugarcrm.grant.type=${object.storage.sugarcrm.grant.type}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.password" />
<then>
<echo append="true" file="${project.dir}/portal-test/src/test-portal-impl.properties">
object.storage.sugarcrm.password=${object.storage.sugarcrm.password}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.username" />
<then>
<echo append="true" file="${project.dir}/portal-test/src/test-portal-impl.properties">
object.storage.sugarcrm.username=${object.storage.sugarcrm.username}
</echo>
</then>
</if>
</target>

<target name="prepare-portlet-ext-properties">
<for list="${test.case.available.property.names}" param="test.case.available.property.name">
<sequential>
Expand Down Expand Up @@ -13028,6 +13142,60 @@ captcha.enforce.disabled=true</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.access.token.url" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.access.token.url=${object.storage.sugarcrm.access.token.url}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.base.url" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.base.url=${object.storage.sugarcrm.base.url}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.client.id" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.client.id=${object.storage.sugarcrm.client.id}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.grant.type" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.grant.type=${object.storage.sugarcrm.grant.type}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.password" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.password=${object.storage.sugarcrm.password}
</echo>
</then>
</if>

<if>
<isset property="object.storage.sugarcrm.username" />
<then>
<echo append="true" file="${test.ext.properties.file}">
object.storage.sugarcrm.username=${object.storage.sugarcrm.username}
</echo>
</then>
</if>

<if>
<isset property="site.initializer.partner.portal.login.url" />
<then>
Expand Down Expand Up @@ -13381,6 +13549,7 @@ captcha.enforce.disabled=true</echo>
<prepare-selenium-google-cloud-translation-properties />
<prepare-selenium-google-properties />
<prepare-selenium-object-storage-salesforce-properties />
<prepare-selenium-object-storage-sugarcrm-properties />
<prepare-selenium-onedrive-properties />
<prepare-selenium-openid-properties />
<prepare-selenium-recaptcha-properties />
Expand Down
2 changes: 0 additions & 2 deletions .../storage/sugarcrm/internal/rest/manager/v1_0/test/SugarCRMObjectEntryManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -58,7 +57,6 @@
* @author Maurice Sepe
*/
@FeatureFlags("LPS-135430")
@Ignore
@RunWith(Arquillian.class)
public class SugarCRMObjectEntryManagerImplTest
extends BaseObjectEntryManagerImplTestCase {
Expand Down
6 changes: 5 additions & 1 deletion portal-test/src/com/liferay/portal/kernel/test/util/TestPropsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ private void _set(String key, String value) {
"object.storage.salesforce.consumer.secret",
"object.storage.salesforce.login.url",
"object.storage.salesforce.password",
"object.storage.salesforce.username");
"object.storage.salesforce.username",
"object.storage.sugarcrm.access.token.url",
"object.storage.sugarcrm.base.url", "object.storage.sugarcrm.client.id",
"object.storage.sugarcrm.grant.type",
"object.storage.sugarcrm.password", "object.storage.sugarcrm.username");
private static final TestPropsUtil _testPropsUtil = new TestPropsUtil();

private final Properties _props = new Properties();
Expand Down
62 changes: 27 additions & 35 deletions test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6447,47 +6447,39 @@ test.batch.run.property.query[functional-orcllinux9-tomcat90-mysql57-jdk8]=\
playwright.test.project[playwright-js-tomcat90-mysql57-jdk8][object]=object

test.batch.class.names.includes[modules-integration-*-jdk8][object]=\
**/object/**/src/testIntegration/**/*Test.java
**/object/object-storage-sugarcrm-test/src/testIntegration/**/SugarCRMObjectEntryManagerImplTest.java

test.batch.class.names.includes[modules-unit-jdk8][object]=\
**/object/**/src/test/**/*Test.java
#
# test.batch.class.names.includes[modules-unit-jdk8][object]=\
# **/object/**/src/test/**/*Test.java
#

test.batch.dist.app.servers[object]=tomcat

test.batch.names[object]=\
central-requirements-jdk8,\
functional-tomcat90-mysql57-jdk8,\
functional-upgrade-tomcat90-mariadb102-jdk8,\
functional-upgrade-tomcat90-mysql57-jdk8,\
functional-upgrade-tomcat90-postgresql134-jdk8,\
functional-upgrade-tomcat90-sqlserver2017-jdk8,\
modules-integration-mysql57-jdk8,\
modules-semantic-versioning-jdk8,\
modules-unit-jdk8,\
playwright-compile-jdk8,\
playwright-js-tomcat90-mysql57-jdk8,\
semantic-versioning-jdk8

test.batch.run.property.query[functional-tomcat90-mysql57-jdk8][object]=\
(\
(database.types == null) OR \
(database.types ~ mysql)\
) AND \
(\
(portal.acceptance != quarantine) AND \
(portal.upstream == true)\
) AND \
(\
(testray.component.names ~ "Object") OR \
(testray.main.component.name ~ "Object")\
)
modules-integration-mysql57-jdk8

test.batch.run.property.query[functional-upgrade-*][object]=\
(\
(portal.acceptance != quarantine) AND \
(portal.upstream == true)\
) AND \
(testray.main.component.name == "Upgrades Object")
#
# test.batch.run.property.query[functional-tomcat90-mysql57-jdk8][object]=\
# (\
# (database.types == null) OR \
# (database.types ~ mysql)\
# ) AND \
# (\
# (portal.acceptance != quarantine) AND \
# (portal.upstream == true)\
# ) AND \
# (\
# (testray.component.names ~ "Object") OR \
# (testray.main.component.name ~ "Object")\
# )
#
# test.batch.run.property.query[functional-upgrade-*][object]=\
# (\
# (portal.acceptance != quarantine) AND \
# (portal.upstream == true)\
# ) AND \
# (testray.main.component.name == "Upgrades Object")

#
# Object Functional
Expand Down