Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r2410 -r2527
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 2410)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 2527)
@@ -100,13 +100,19 @@
 <Type>Tools.Test.Asserter</Type>
 </Property>
 
+<Property name="Matches">
+<Type>Tools.Test.Matchers</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	 Set r%Manager = AManager
 	 set ..DataExporteerder = ##class(Tools.Test.DataExporteerder).%New($this)
 	 set ..Asserter = ##class(Tools.Test.Asserter).%New($this,AManager)
+	 set ..Matches = ##class(Tools.Test.Matchers).%New()
 	 set ..Checker = ##class(Tools.Test.Checker).%New($this)
 	 Quit $$$OK
 ]]></Implementation>
Index: Tools/Test/Matchers.cls.xml
===================================================================
diff -u
--- Tools/Test/Matchers.cls.xml	(revision 0)
+++ Tools/Test/Matchers.cls.xml	(revision 2527)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.Matchers">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="List">
+<FormalSpec>List:%List,IsVolgordeVanBelang:%Boolean=1</FormalSpec>
+<ReturnType>Tools.Mock.ArgumentMatcher</ReturnType>
+<Implementation><![CDATA[	quit ##class(Tools.Mock.ArgumentMatchers.ListMatcher).%New(List,IsVolgordeVanBelang)
+]]></Implementation>
+</Method>
+
+<Method name="Stream">
+<FormalSpec>Stream:%Stream.Object</FormalSpec>
+<ReturnType>Tools.Mock.ArgumentMatcher</ReturnType>
+<Implementation><![CDATA[	quit ##class(Tools.Mock.ArgumentMatchers.StreamMatcher).%New(Stream)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/Mock/ArgumentMatchers/StreamMatcher.cls.xml
===================================================================
diff -u
--- Tools/Mock/ArgumentMatchers/StreamMatcher.cls.xml	(revision 0)
+++ Tools/Mock/ArgumentMatchers/StreamMatcher.cls.xml	(revision 2527)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Mock.ArgumentMatchers.StreamMatcher">
+<Super>TECH.RegisteredObject,Tools.Mock.ArgumentMatcher</Super>
+
+<Property name="VerwachteStream">
+<Type>%Stream.Object</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ArgumentMatchBepaler">
+<Type>Tools.Mock.ArgumentMatchBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Stream:%Stream.Object</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..VerwachteStream = Stream
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Matches">
+<FormalSpec>Stream:%Stream.Object</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsMatch As %Boolean = ( Stream.Size = ..VerwachteStream.Size )
+	Quit IsMatch
+]]></Implementation>
+</Method>
+
+<Method name="OmschrijfMismatch">
+<FormalSpec>Argument:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "TODO"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>