imporving tests for query parsing..

Evolveum · Feb 23, 2014 · 751215c · 751215c
1 parent 9554ea9
commit 751215c
Show file tree

Hide file tree

Showing 5 changed files with 256 additions and 131 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
@@ -75,6 +75,10 @@ public abstract class PropertyValueFilter<T extends PrismValue> extends ValueFil
 	PropertyValueFilter(ItemPath path, ItemDefinition definition, XNode expression) {
 		super(path, definition, expression);
 	}
+	PropertyValueFilter(ItemPath path, ItemDefinition definition, XNode expression, List<T> values) {
+		super(path, definition, expression);
+		this.values = values;
+	}
 
 	PropertyValueFilter(ItemPath path, ItemDefinition definition, QName matchingRule, XNode expression) {
 		super(path, definition, matchingRule, expression);

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
@@ -47,8 +47,8 @@ public class RefFilter extends PropertyValueFilter<PrismReferenceValue>{
 	 */
 	private static final long serialVersionUID = 1L;
 
-	RefFilter(ItemPath path, PrismReferenceDefinition definition, QName matchingRule, List<PrismReferenceValue> values) {
-		super(path, definition, matchingRule, values);
+	RefFilter(ItemPath path, PrismReferenceDefinition definition, XNode expression, List<PrismReferenceValue> values) {
+		super(path, definition, expression, values);
 	}
 
 	RefFilter(ItemPath path, PrismReferenceDefinition definition, XNode expression) {
@@ -68,7 +68,7 @@ public static RefFilter createReferenceEqual(ItemPath path, PrismReferenceDefini
 	}
 
 	public static RefFilter createReferenceEqual(ItemPath path, PrismReference item, XNode expression){
-		return new RefFilter(path, item.getDefinition(), expression);
+		return new RefFilter(path, item.getDefinition(), expression, item.getValues());
 	}
 
 	public static RefFilter createReferenceEqual(ItemPath path, PrismReferenceDefinition definition, XNode expression){
@@ -134,7 +134,7 @@ private static RefFilter createNullRefFilter(ItemPath path, PrismReferenceDefini
 
 	@Override
 	public RefFilter clone() {
-		RefFilter clone = new RefFilter(getFullPath(), (PrismReferenceDefinition) getDefinition(), getMatchingRule(), (List<PrismReferenceValue>) getValues());
+		RefFilter clone = new RefFilter(getFullPath(), (PrismReferenceDefinition) getDefinition(), getExpression(), (List<PrismReferenceValue>) getValues());
 		cloneValues(clone);
 		return clone;
 	}