Repository: syncope Updated Branches: refs/heads/1_2_X 80625d3fd -> 219e86438
[SYNCOPE-768] search test improvement + fix for style Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/219e8643 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/219e8643 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/219e8643 Branch: refs/heads/1_2_X Commit: 219e86438db2356488b8d0fec8a2453e475464fc Parents: 80625d3 Author: fmartelli <[email protected]> Authored: Fri Feb 19 09:58:59 2016 +0100 Committer: fmartelli <[email protected]> Committed: Fri Feb 19 09:58:59 2016 +0100 ---------------------------------------------------------------------- .../core/persistence/dao/impl/SubjectSearchDAOImpl.java | 6 +----- .../java/org/apache/syncope/core/rest/SearchTestITCase.java | 8 +++++++- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/219e8643/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SubjectSearchDAOImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SubjectSearchDAOImpl.java b/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SubjectSearchDAOImpl.java index 2b6d004..0b1dfd8 100644 --- a/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SubjectSearchDAOImpl.java +++ b/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SubjectSearchDAOImpl.java @@ -35,10 +35,6 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.common.types.AttributeSchemaType; import org.apache.syncope.common.types.SubjectType; -import org.apache.syncope.common.types.SubjectType; -import org.apache.syncope.common.types.SubjectType; -import org.apache.syncope.common.types.SubjectType; -import org.apache.syncope.common.types.SubjectType; import org.apache.syncope.core.persistence.beans.AbstractAttrValue; import org.apache.syncope.core.persistence.beans.AbstractNormalSchema; import org.apache.syncope.core.persistence.beans.AbstractSubject; @@ -245,7 +241,7 @@ public class SubjectSearchDAOImpl extends AbstractDAOImpl implements SubjectSear where.append(','); if (searchView.name.equals(svs.attr().name)) { where.append(" (SELECT * FROM ").append(searchView.name).append(" UNION "). - append("SELECT * FROM ").append(svs.nullAttr().name).append(")"); + append("SELECT * FROM ").append(svs.nullAttr().name).append(')'); } else { where.append(searchView.name); } http://git-wip-us.apache.org/repos/asf/syncope/blob/219e8643/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java index d168f32..2eb998b 100644 --- a/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java +++ b/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.apache.syncope.client.SyncopeClient; import org.apache.syncope.common.reqres.PagedResult; @@ -190,10 +191,15 @@ public class SearchTestITCase extends AbstractTest { @Test public void issueSYNCOPE768() { + final List<UserTO> usersWithType = userService.search( + SyncopeClient.getUserSearchConditionBuilder().is("type").notNullValue().query()).getResult(); + + assertFalse(usersWithType.isEmpty()); + final PagedResult<UserTO> matchedUsers = userService.search( SyncopeClient.getUserSearchConditionBuilder().is("username").notNullValue().query(), SyncopeClient.getOrderByClauseBuilder().asc("type").build()); - assertTrue(matchedUsers.getResult().size() >= 5); + assertTrue(matchedUsers.getResult().size() > usersWithType.size()); } }
