Index: vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml	(revision 2580)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test001">
+<Implementation><![CDATA[
+	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	do ValueList.InsertKeyValue("Property1","ValidValue")
+	
+	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
+	
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object.Property1 = "ValidValue"
+	
+	do $$$AssertTrue(Filter.IsValid(Object))
+]]></Implementation>
+</Method>
+
+<Method name="Test002">
+<Implementation><![CDATA[
+	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	do ValueList.InsertKeyValue("Property1","ValidValue")
+	
+	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
+	
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object.Property1 = "InvalidValue"
+	
+	do $$$AssertFalse(Filter.IsValid(Object))
+]]></Implementation>
+</Method>
+
+<Method name="Test003">
+<Implementation><![CDATA[
+	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	do ValueList.InsertKeyValue("Property1","ValidValue")
+	do ValueList.InsertKeyValue("Property2","ValidValue")
+	
+	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
+	
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object.Property1 = "ValidValue"
+	set Object.Property2 = "ValidValue"
+	
+	do $$$AssertTrue(Filter.IsValid(Object))
+]]></Implementation>
+</Method>
+
+<Method name="Test004">
+<Implementation><![CDATA[
+	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	do ValueList.InsertKeyValue("Property1","ValidValue")
+	do ValueList.InsertKeyValue("Property2","ValidValue")
+	
+	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
+	
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object.Property1 = "ValidValue"
+	set Object.Property2 = "InvalidValue"
+	
+	do $$$AssertFalse(Filter.IsValid(Object))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Object.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Object.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Object.cls.xml	(revision 2580)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object">
+<Super>%RegisteredObject</Super>
+
+<Property name="Property1">
+<Type>%String</Type>
+</Property>
+
+<Property name="Property2">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: TECH/Filter/PropertyBasedFilter.cls.xml
===================================================================
diff -u
--- TECH/Filter/PropertyBasedFilter.cls.xml	(revision 0)
+++ TECH/Filter/PropertyBasedFilter.cls.xml	(revision 2580)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Filter.PropertyBasedFilter">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="KeyValuePairIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KeyValuePairList:TECH.KeyValue.UniqueList</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..KeyValuePairIterator = ##class(TECH.ListIterator).%New(KeyValuePairList)
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<FormalSpec>Object:%CacheString</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsValid As %Boolean = 1
+	while ( ..KeyValuePairIterator.HasNext() ) && ( IsValid ) {
+		#dim KeyValuePair As TECH.KeyValuePair = ..KeyValuePairIterator.Next()
+		set IsValid = $property(Object,KeyValuePair.Key)=KeyValuePair.Value
+	}
+	quit IsValid
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>