inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV (5.0.0) to HEAD (5.0/Cloud)

Browse Source 
86091: ACE-1061 : SQL Server: ArchiveAndRestoreTest.testListArchivedNodesFilter fails
   Disabled case-sensitive filtering as not required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alex Mukha
2014-10-03 06:17:59 +00:00
parent 172c9afcba
commit 0c9de67714
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
View File

@@ -33,13 +33,8 @@
assoc.parent_node_id = #{parentNodeId} assoc.parent_node_id = #{parentNodeId}
and assoc.type_qname_id = #{assocTypeQNameId} and assoc.type_qname_id = #{assocTypeQNameId}
<if test="filter != null"> <if test="filter != null">
<if test="filterIgnoreCase == true">
and lower(prop.string_value) like lower(#{filter}) <include refid="alfresco.util.escape"/> and lower(prop.string_value) like lower(#{filter}) <include refid="alfresco.util.escape"/>
</if> </if>
<if test="filterIgnoreCase == false">
and prop.string_value like #{filter} <include refid="alfresco.util.escape"/>
</if>
</if>
<if test="sortOrderAscending == true">order by childNode.id ASC</if> <if test="sortOrderAscending == true">order by childNode.id ASC</if>
<if test="sortOrderAscending == false">order by childNode.id DESC</if> <if test="sortOrderAscending == false">order by childNode.id DESC</if>
</select> </select>

10
source/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -41,7 +41,6 @@ public class ArchivedNodesCannedQueryBuilder
private final NodeRef archiveRootNodeRef; private final NodeRef archiveRootNodeRef;
private final PagingRequest pagingRequest; private final PagingRequest pagingRequest;
private String filter; private String filter;
private boolean filterIgnoreCase;
private boolean sortOrderAscending; private boolean sortOrderAscending;
public Builder(NodeRef archiveRootNodeRef, PagingRequest pagingRequest) public Builder(NodeRef archiveRootNodeRef, PagingRequest pagingRequest)
@@ -56,12 +55,6 @@ public class ArchivedNodesCannedQueryBuilder
return this; return this;
} }
public Builder filterIgnoreCase(boolean filterIgnoreCase)
{
this.filterIgnoreCase = filterIgnoreCase;
return this;
}
public Builder sortOrderAscending(boolean sortOrderAscending) public Builder sortOrderAscending(boolean sortOrderAscending)
{ {
this.sortOrderAscending = sortOrderAscending; this.sortOrderAscending = sortOrderAscending;
@@ -85,7 +78,6 @@ public class ArchivedNodesCannedQueryBuilder
builder.pagingRequest.getQueryExecutionId()); builder.pagingRequest.getQueryExecutionId());
pr.setRequestTotalCountMax(builder.pagingRequest.getRequestTotalCountMax()); pr.setRequestTotalCountMax(builder.pagingRequest.getRequestTotalCountMax());
this.pagingRequest = pr; this.pagingRequest = pr;
this.filterIgnoreCase = builder.filterIgnoreCase;
this.filter = builder.filter; this.filter = builder.filter;
this.sortOrderAscending = builder.sortOrderAscending; this.sortOrderAscending = builder.sortOrderAscending;
} }

20
source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -953,7 +953,7 @@ public class ArchiveAndRestoreTest extends TestCase
ScriptPagingDetails paging = new ScriptPagingDetails(2, 0); ScriptPagingDetails paging = new ScriptPagingDetails(2, 0);
// Create canned query // Create canned query
ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(
this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true).build(); this.archiveStoreRootNodeRef, paging).build();
// Query the DB // Query the DB
PagingResults<NodeRef> result = runListArchivedNodesAsAdmin(queryBuilder); PagingResults<NodeRef> result = runListArchivedNodesAsAdmin(queryBuilder);
@@ -972,7 +972,7 @@ public class ArchiveAndRestoreTest extends TestCase
// Create canned query // Create canned query
queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(
this.archiveStoreRootNodeRef, paging) this.archiveStoreRootNodeRef, paging)
.filterIgnoreCase(true).build(); .build();
result = runListArchivedNodesAsAdmin(queryBuilder); result = runListArchivedNodesAsAdmin(queryBuilder);
assertEquals("USER_A deleted only 1 item.", 1, result.getPage().size()); assertEquals("USER_A deleted only 1 item.", 1, result.getPage().size());
@@ -984,7 +984,7 @@ public class ArchiveAndRestoreTest extends TestCase
AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser(); AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, paging) queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, paging)
.filterIgnoreCase(true).build(); .build();
result = nodeArchiveService.listArchivedNodes(queryBuilder); result = nodeArchiveService.listArchivedNodes(queryBuilder);
// Admin can retrieve all users' deleted nodes // Admin can retrieve all users' deleted nodes
@@ -1028,7 +1028,7 @@ public class ArchiveAndRestoreTest extends TestCase
ScriptPagingDetails paging = new ScriptPagingDetails(3, 0); ScriptPagingDetails paging = new ScriptPagingDetails(3, 0);
ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(
this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true) this.archiveStoreRootNodeRef, paging)
// Sorting by Node_DBID. DESC. (same as sorting by archived date). // Sorting by Node_DBID. DESC. (same as sorting by archived date).
.sortOrderAscending(false) .sortOrderAscending(false)
.build(); .build();
@@ -1084,7 +1084,7 @@ public class ArchiveAndRestoreTest extends TestCase
String filter = "picture*"; String filter = "picture*";
ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(
this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true).filter(filter) this.archiveStoreRootNodeRef, paging).filter(filter)
.sortOrderAscending(false).build(); .sortOrderAscending(false).build();
// Query the DB // Query the DB
@@ -1101,7 +1101,7 @@ public class ArchiveAndRestoreTest extends TestCase
// Change the filter // Change the filter
filter = "pictureT*.jpg"; filter = "pictureT*.jpg";
queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef,
paging).filterIgnoreCase(true).filter(filter).sortOrderAscending(false).build(); paging).filter(filter).sortOrderAscending(false).build();
result = nodeArchiveService.listArchivedNodes(queryBuilder); result = nodeArchiveService.listArchivedNodes(queryBuilder);
assertEquals("There is only 1 node that matches 'pictureT*.jpg' pattern.", 1, result assertEquals("There is only 1 node that matches 'pictureT*.jpg' pattern.", 1, result
@@ -1113,7 +1113,7 @@ public class ArchiveAndRestoreTest extends TestCase
filter = "*Test.jpg"; filter = "*Test.jpg";
queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef,
paging).filterIgnoreCase(true).filter(filter).sortOrderAscending(false).build(); paging).filter(filter).sortOrderAscending(false).build();
result = nodeArchiveService.listArchivedNodes(queryBuilder); result = nodeArchiveService.listArchivedNodes(queryBuilder);
assertEquals("There are 2 nodes that match '*Test.jpg' pattern.", 2, result.getPage().size()); assertEquals("There are 2 nodes that match '*Test.jpg' pattern.", 2, result.getPage().size());
@@ -1126,9 +1126,9 @@ public class ArchiveAndRestoreTest extends TestCase
filter = "*test.jpg"; filter = "*test.jpg";
queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef,
paging).filterIgnoreCase(false).filter(filter).sortOrderAscending(false).build(); paging).filter(filter).sortOrderAscending(false).build();
result = nodeArchiveService.listArchivedNodes(queryBuilder); result = nodeArchiveService.listArchivedNodes(queryBuilder);
assertEquals("There is No node that matches '*test.jpg' pattern.", 0, result.getPage().size()); assertEquals("There are 2 nodes that matches '*test.jpg' pattern.", 2, result.getPage().size());
} }
} }