Index: vhUnitTest/vhLib/WebServiceLogger/impl/VhLibLoggerTest.cls.xml
===================================================================
diff -u -r1497 -r2600
--- vhUnitTest/vhLib/WebServiceLogger/impl/VhLibLoggerTest.cls.xml	(.../VhLibLoggerTest.cls.xml)	(revision 1497)
+++ vhUnitTest/vhLib/WebServiceLogger/impl/VhLibLoggerTest.cls.xml	(.../VhLibLoggerTest.cls.xml)	(revision 2600)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.vhLib.WebServiceLogger.impl.VhLibLoggerTest">
-<Super>vhUnitTest.TestCase,%Stream.Object</Super>
+<Super>vhUnitTest.TestCase</Super>
 
 <Property name="Logger">
 <Type>vhLib.WebServiceLogger.impl.VhLibLogger</Type>
@@ -20,32 +20,58 @@
 <Private>1</Private>
 </Property>
 
-<Property name="IsStreamOneindig">
-<Type>%Boolean</Type>
-<InitialExpression>0</InitialExpression>
-<Private>1</Private>
-</Property>
-
 <Property name="BestaandeVhLibWebServiceRequestStream">
 <Type>%Stream.Object</Type>
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Do ##class(TECH.Context).Instance().PushLoggingAPIClassName(##class(TECH.Logging.impl.LoggingAPI).%ClassName(1))
+	
+	Do ..KuisOpLogItems()
+	Do ..KuisOpWebserviceLogSetting()
+	
+	Set ..Logger = ##class(vhLib.WebServiceLogger.impl.VhLibLogger).%New()
+	Do ..SetUpRequestStream()
+	Do ..RegistreerDatLogGroepEchtGelogdMoetWorden()
+	
+	Do ..WisVhLibWebServiceRequestStream()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ResetRuntimeContext()
+	Do ..KuisOpWebserviceLogSetting()
+	Do ..HerzetVhLibWebServiceRequestStream()
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
 <Method name="TestLogStream">
 <Implementation><![CDATA[
 	Do $$$LogMessage( "Loggroep: " _ ..LogGroep )
 	Do $$$LogMessage( "%request: " _ %request )
 	Do $$$LogMessage( "%request.CgiEnvs: " _ %request.CgiEnvs("HTTP_SOAPACTION") )
 	
+	set Stream = ##class(vhUnitTest.vhLib.WebServiceLogger.impl.Stream).%New()
+	set Stream.IsStreamOneindig = 0
+	
 	/// Actie
-	Do ..Logger.LogStream( ##this, ..Direction, ..LogGroep)
+	Do ..Logger.LogStream( Stream, ..Direction, ..LogGroep)
 	
 	/// Controle
 	#Dim LogItems As TECH.ResultSet
 	Set LogItems = ##class(TECH.ResultSet).Create( 
 		"SELECT * FROM vhLib.Logging WHERE Groep = ? AND Detail = ?",
 		$ListBuild( ..LogGroep, "Test" )
 	 )
+	 
 	#Dim ResultSetStatus As %Status = ""
 	Do $$$AssertTrue( LogItems.Next(.ResultSetStatus) )
 	Do $$$AssertStatusOK( ResultSetStatus )
@@ -60,11 +86,12 @@
 	Do $$$LogMessage( "%request: " _ %request )
 	Do $$$LogMessage( "%request.CgiEnvs: " _ %request.CgiEnvs("HTTP_SOAPACTION") )
 	
-	/// Setup
-	Set ..IsStreamOneindig = 1
+
+	set Stream = ##class(vhUnitTest.vhLib.WebServiceLogger.impl.Stream).%New()
+	Set Stream.IsStreamOneindig = 1
 	
 	/// Actie
-	Do ..Logger.LogStream( ##this, ..Direction, ..LogGroep)
+	Do ..Logger.LogStream( Stream, ..Direction, ..LogGroep)
 	
 	/// Controle
 	#Dim LogItems As TECH.ResultSet
@@ -80,26 +107,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	
-	Do ##class(TECH.Context).Instance().PushLoggingAPIClassName(##class(TECH.Logging.impl.LoggingAPI).%ClassName(1))
-	
-	Do ..KuisOpLogItems()
-	Do ..KuisOpWebserviceLogSetting()
-	
-	Set ..Logger = ##class(vhLib.WebServiceLogger.impl.VhLibLogger).%New()
-	Do ..SetUpRequestStream()
-	Do ..RegistreerDatLogGroepEchtGelogdMoetWorden()
-	
-	Set ..AtEnd = 0
-	
-	Do ..WisVhLibWebServiceRequestStream()
-]]></Implementation>
-</Method>
-
 <Method name="WisVhLibWebServiceRequestStream">
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -129,16 +136,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ..ResetRuntimeContext()
-	Do ..KuisOpWebserviceLogSetting()
-	Do ..HerzetVhLibWebServiceRequestStream()
-	Do ##super(aTestName)
-]]></Implementation>
-</Method>
-
 <Method name="HerzetVhLibWebServiceRequestStream">
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -167,27 +164,6 @@
 		$ListBuild( ..LogGroep ) )
 ]]></Implementation>
 </Method>
-
-<Method name="ReadLine">
-<Description><![CDATA[
-Read a line from the stream. This will look for the line terminator in the stream and
-once it finds the terminator it will return the string minus the terminator character/s. If it reaches the
-end of the stream before it finds a terminator it will return the data it has so far, and if you specify a
-maximum size in <var>len</var> it will only read up to this number of characters. On exit <var>len</var>
-will contain the actual number of characters read. The byref argument <var>sc</var> will
-return a %Status if any error occured during the read and the byref argument <var>eol</var>
-is true if it found the line terminator and false otherwise.]]></Description>
-<FormalSpec><![CDATA[&len:%Integer=32000,&sc:%Status,&eol:%Boolean]]></FormalSpec>
-<ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[
-	If ('..IsStreamOneindig)
-	{
-		Set ..AtEnd = 1
-	}
-	
-	Quit "Test"
-]]></Implementation>
-</Method>
 </Class>