Commit Graph

282 Commits

Author SHA1 Message Date
Roxana Lucanu
dad0d17fb1 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests 2020-04-09 16:40:08 +03:00
Claudia Agache
bf77bf7997 fix the parameter 2020-04-08 19:07:33 +03:00
Claudia Agache
e1b2a626cb Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-20822_CMIS_tests 2020-04-08 18:52:37 +03:00
Claudia Agache
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
8008ace24e Merge branch 'release/V2.7' into merge-3.0/RM-7148_And_RM-7145
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CmisQueryTests.java
#	rm-enterprise/pom.xml
2020-04-08 15:14:00 +03:00
Roxana Lucanu
5bc81482a4 RM-7145 Addressed code review comments 2020-04-08 13:43:51 +03:00
Roxana Lucanu
eb2e085dd6 RM-7145 Addressed code review comments 2020-04-07 18:27:58 +03:00
Roxana Lucanu
235a2bc248 RM-7145 Added test for AFTS query 2020-04-06 17:10:56 +03:00
Roxana Lucanu
6daf69afde Merge branch 'release/V2.6' into feature-2.6/MNT-20822_CMIS_tests 2020-04-06 14:13:30 +03:00
Claudia Agache
4c4b41bfb8 fix the parameter 2020-04-03 16:26:03 +03:00
Claudia Agache
d222954e15 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion
# Conflicts:
#	rm-enterprise/pom.xml
2020-04-03 16:21:40 +03:00
Claudia Agache
59feba75e4 code review comments 2020-04-03 14:51:02 +03:00
Claudia Agache
3b51ce4966 fix header 2020-04-03 09:40:46 +03:00
Rodica Sutu
019a9a0375 move the cmis query tests
add some additional usecase

(cherry picked from commit d3284b1400)
2020-04-03 09:30:52 +03:00
rodicasutu
9cb79e7b4b wip CMIS tests for MNT-20822 2020-04-01 08:59:06 +03:00
Ramona Popa
852c77477e merge RM-7099 into V3.0 2020-01-31 16:13:09 +00:00
Sara Aspery
5865482fe6 Update license headers 2020-01-02 16:20:24 +00:00
Sara Aspery
304180f49e Merge branch 'release/V2.7' into release/V3.0
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
2020-01-02 16:15:49 +00:00
Sara Aspery
5849812683 Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
1f7a81fd45 Merge branch 'release/V2.6' into release/V2.7
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
cagache
2a9aca2ced transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
(cherry picked from commit ebc860ea2a)

# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
2019-07-05 10:32:10 +03:00
Rodica Sutu
ed02c79096 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-04 17:59:38 +03:00
cagache
1070562e07 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
(cherry picked from commit 451eaaf679)

# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/base/BaseRMEnterpriseRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/folder/RecordFolderClassificationTest.java
2019-07-04 16:03:20 +03:00
Rodica Sutu
11a638c827 refactoring of the added rest api tests for SQL queries
new tests added for sql queries for: record categories, record folders and records
2019-07-02 10:29:21 +03:00
Rodica Sutu
9314432beb test updates: minor refactoring and formatting fixes 2019-06-24 10:16:20 +03:00
cagache
c747e2bdab Revert "removed unused variable"
This reverts commit 06c7cfd2
2019-06-21 16:33:08 +03:00
cagache
0d4c5d2979 Fix "Either re-interrupt this method or rethrow the "InterruptedException"." sonar bug
(cherry picked from commit 8225920986)
2019-06-21 16:14:53 +03:00
cagache
d5335dc0cd delete unnecessary semicolon
(cherry picked from commit 162456217a)
2019-06-21 16:14:30 +03:00
cagache
06c7cfd2a5 removed unused variable
(cherry picked from commit b29f087bb2)
2019-06-21 16:11:11 +03:00
Tom Page
23c98eaa08 RM-6141 Revert change of how a user is a member of the RM site.
The user should be an RM User, not a site manager.  Also revert a couple
of changes that were done to make this work.

Minor tweaks to use constants rather than member variables.

(cherry picked from commit b284ba90388ef360f5321826e292ec43bf2e5197)
2019-06-19 11:43:31 +03:00
Tom Page
2ab90aad6b RM-6141 Update SQL tests to use correct users.
Also hardcode the site id of the RM site to be "rm", so that we can use
this when adding site members.

(cherry picked from commit 92a6dcf8ae04151699b0b5a4bad79bc82f36ae71)

# Conflicts:
#	rm-enterprise/pom.xml
2019-06-19 11:41:23 +03:00
Rodica Sutu
84aca54f31 adding search tests for the SQL support
(cherry picked from commit 29f2ddf2203261f477464528a9f5b83a7679223c)

# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
2019-06-19 11:36:45 +03:00
cagache
3310d3805a Renamed files to end with Test or Tests to get rid of java.lang.ClassNotFoundException 2019-04-10 17:47:48 +03:00
cagache
73c8c23766 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord 2019-03-15 10:00:48 +02:00
cagache
09de772516 code review comments 2019-03-14 09:19:23 +02:00
cagache
86a954f36e added cleanup method 2019-03-13 15:54:15 +02:00
cagache
02fd1c6e5e RM-6786 Create test to check that a file that has a record version can be declared as record 2019-03-13 12:23:25 +02:00
Rodica Sutu
eafe3ebf30 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02:00
Rodica Sutu
475164672e Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 09:19:23 +02:00
cagache
d3a8dca230 code review changes 2019-02-12 12:25:10 +02:00
Rodica Sutu
da21154350 add tests to check the content bin is available for:
- the copy when the original file is destroyed
 - file when having a record version that gets deleted
2019-02-12 10:49:55 +02:00
Rodica Sutu
59c6909d2d java docs updates 2019-02-07 09:36:18 +02:00
Rodica Sutu
307b92ee30 tests to cover cases when deleting records or classified files when the files have copies 2019-02-06 17:08:51 +02:00
Ross Gale
c8afff9a4b RM-6702 updating headers to 2019 2019-01-04 12:25:39 +00:00
Ross Gale
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
cagache
af42247487 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/Merge_MNT-19967_From2.6 2018-10-03 10:10:12 +03:00
cagache
3dedf274f2 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/Merge_MNT-19967_From2.6
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/DispositionScheduleService.java
2018-10-02 14:51:13 +03:00
cagache
690d55cf44 code review changes 2018-10-01 18:34:14 +03:00