Merge remote-tracking branch 'origin' into closure

Conflicts: repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
Evolveum · Jul 19, 2014 · a753085 · a753085
1 parent d700179
commit a753085
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
@@ -124,12 +124,10 @@ public void test001addOrgStructObjects() throws Exception {
         OrgType pRoot = repositoryService.getObject(OrgType.class, ORG_PROJECT_ROOT_OID, null, opResult).asObjectable();
         AssertJUnit.assertEquals("PRoot", pRoot.getName().getOrig());
 
-//		QueryType query = QueryUtil.createNameQuery(ELAINE_NAME);
-        ObjectQuery query = new ObjectQuery();
-        PrismObjectDefinition<UserType> userObjectDef = prismContext.getSchemaRegistry().findObjectDefinitionByCompileTimeClass(UserType.class);
-        query.setFilter(EqualFilter.createEqual(UserType.F_NAME, userObjectDef.findPropertyDefinition(UserType.F_NAME), null, ELAINE_NAME));
-
-        EqualsFilter equals = EqualsFilter.createEqual(UserType.F_NAME, UserType.class, prismContext, ELAINE_NAME);
+        PrismObjectDefinition<UserType> userObjectDef = prismContext.getSchemaRegistry()
+                .findObjectDefinitionByCompileTimeClass(UserType.class);
+
+        EqualFilter equals = EqualFilter.createEqual(UserType.F_NAME, userObjectDef.findPropertyDefinition(UserType.F_NAME), null, ELAINE_NAME);
         List<PrismObject<UserType>> users = repositoryService.searchObjects(UserType.class,
                 ObjectQuery.createObjectQuery(equals), null, opResult);