Fixing tests.

Evolveum · Oct 13, 2016 · 2f3fce5 · 2f3fce5
1 parent c683bf0
commit 2f3fce5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/...n-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java b/...n-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
@@ -341,7 +341,7 @@ public void test040SearchCasesFilteredSortedPaged() throws Exception {
                 SelectorOptions.createCollection(GetOperationOptions.createResolveNames());
         ObjectQuery query = QueryBuilder.queryFor(AccessCertificationCaseType.class, prismContext)
                 .item(AccessCertificationCaseType.F_OBJECT_REF).ref(userAdministrator.getOid())
-                .desc(F_TARGET_REF)
+                .desc(getOrderBy(F_TARGET_REF))
                 .offset(2).maxSize(2)
                 .build();
         List<AccessCertificationCaseType> caseList = modelService.searchContainers(

diff --git a/...el-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java b/...el-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
@@ -638,14 +638,14 @@ private static ObjectFilter createFilterForNoValue(ObjectFilter filter, Expressi
 				return AllFilter.createAll();
 
 			case FILTER_EQUAL_NULL:
-				if (filter instanceof PropertyValueFilter) {
-					PropertyValueFilter evaluatedFilter = (PropertyValueFilter) filter.clone();
+				if (filter instanceof ValueFilter) {
+					ValueFilter evaluatedFilter = (ValueFilter) filter.clone();
 					evaluatedFilter.setExpression(null);
 					return evaluatedFilter;
 				} else if (filter instanceof InOidFilter) {
 					return NoneFilter.createNone();
 				} else {
-					throw new IllegalArgumentException("Unknow filter to evaluate: " + filter);
+					throw new IllegalArgumentException("Unknown filter to evaluate: " + filter);
 				}
 
 			case ERROR:

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
@@ -327,7 +327,7 @@ private static boolean containExpression(ObjectFilter filter){
 			return true;
 		}
 
-		if (filter instanceof PropertyValueFilter && ((PropertyValueFilter) filter).getExpression() != null){
+		if (filter instanceof ValueFilter && ((ValueFilter) filter).getExpression() != null){
 			return true;
 		}
 

diff --git a/...rc/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java b/...rc/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
@@ -21,15 +21,11 @@
 import com.evolveum.midpoint.prism.path.ItemPathSegment;
 import com.evolveum.midpoint.prism.path.NameItemPathSegment;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
-import com.evolveum.midpoint.prism.query.PropertyValueFilter;
 import com.evolveum.midpoint.prism.query.ValueFilter;
-import com.evolveum.midpoint.repo.sql.data.common.RObject;
 import com.evolveum.midpoint.repo.sql.data.common.any.RAnyConverter;
 import com.evolveum.midpoint.repo.sql.data.common.any.RAnyValue;
-import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.data.common.type.RObjectExtensionType;
 import com.evolveum.midpoint.repo.sql.query.QueryException;
-import com.evolveum.midpoint.repo.sql.query.QueryContext;
 import com.evolveum.midpoint.repo.sql.query.definition.AnyDefinition;
 import com.evolveum.midpoint.repo.sql.query.definition.Definition;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
@@ -38,13 +34,11 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
-
 import org.hibernate.criterion.Conjunction;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
 
 import javax.xml.namespace.QName;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -108,7 +102,7 @@ public Criterion interpretInternal(ValueFilter filter) throws QueryException {
 
         conjunction.add(Restrictions.eq(propertyNamePrefix + RAnyValue.F_NAME, RUtil.qnameToString(name)));
 
-        Object testedValue = getValue(((PropertyValueFilter) filter).getValues());
+        Object testedValue = getValue(filter.getValues());
         Object value = RAnyConverter.getAggregatedRepoObject(testedValue);
         conjunction.add(createCriterion(propertyNamePrefix + RAnyValue.F_VALUE, value, filter));
 

diff --git a/...-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java b/...-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
@@ -498,8 +498,8 @@ protected Object getValue(List<? extends PrismValue> values) {
 
     protected Object getValueFromFilter(ValueFilter filter, PropertyDefinition def) throws QueryException {
         Object value;
-        if (filter instanceof PropertyValueFilter) {
-            value = getValue(((PropertyValueFilter) filter).getValues());
+        if (filter != null) {
+            value = getValue((filter).getValues());
         } else {
             throw new QueryException("Unknown filter '" + filter + "', can't get value from it.");
         }