Index: vhUnitTest/Sys/FOP/DataMgr.cls.xml
===================================================================
diff -u -r3222 -r3223
--- vhUnitTest/Sys/FOP/DataMgr.cls.xml	(.../DataMgr.cls.xml)	(revision 3222)
+++ vhUnitTest/Sys/FOP/DataMgr.cls.xml	(.../DataMgr.cls.xml)	(revision 3223)
@@ -9,34 +9,13 @@
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="TestCreateStreamFromProxy">
-<Implementation><![CDATA[
-	Set blFOPData=##class(BL.Sys.FOP.DataMgr).Instantiate()
-	Do blFOPData.Init("","")
-	; Do blFOPData.FetchData(Doc,SeqItem)
-	Set blFOPData.FOPDataType="Stream"
-	Set blFOPData.DataProxy=##class(Sys.FOP.emDocProxy).%New()
-	Set blFOPData.FOPDataStream=blFOPData.CreateStreamFromProxy("%FileBinaryStream",,0,0)
-	Set sc=blFOPData.ErrorStatus
-	
-	Do $$$AssertEquals(sc,$$$OK,"De errorStatus van de FOP.DataMgr is correct")
-	Set XMLData=blFOPData.FOPDataStream.Read()
-	Set ExpectedXMLData="<?xml version=""1.0"" encoding=""UTF-8""?>"_$$$CRLF_"<emDocProxy></emDocProxy>"
-	Do $$$AssertEquals(XMLData,ExpectedXMLData,"De xml-data van FOPDataStream is correct ingevuld")
-
-	Do blFOPData.Close()
-	Set blFOPData=""
-]]></Implementation>
-</Method>
-
 <Method name="TestSetNewStream">
 <Implementation><![CDATA[
 	Set DummyText="This is a text for TestSetNewStream."
 	Set StreamObj=##class(%FileBinaryStream).%New()   ; Fetch data is niet nodig voor de unittest 
 	Do StreamObj.Write(DummyText)
 
-	Set blFOPData=##class(BL.Sys.FOP.DataMgr).Instantiate()
-	Do blFOPData.Init("","")
+	Set blFOPData=..GeefFOPDataMgr("")
 	Set blFOPData.FOPDataStream=StreamObj
 
 	Set DataFromStream=blFOPData.FOPDataStream.Read()
@@ -47,6 +26,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestCreateStreamFromProxy">
+<Implementation><![CDATA[
+	Set blFOPData=..GeefFOPDataMgr("")
+	Set blFOPData.DataProxy=##class(Sys.FOP.emDocProxy).%New()
+	Set blFOPData.FOPDataStream=blFOPData.CreateStreamFromProxy("%FileBinaryStream",,0,0)
+	Set sc=blFOPData.ErrorStatus
+	
+	Do $$$AssertEquals(sc,$$$OK,"De errorStatus van de FOP.DataMgr is correct")
+	Set XMLData=blFOPData.FOPDataStream.Read()
+	Set ExpectedXMLData="<?xml version=""1.0"" encoding=""UTF-8""?>"_$$$CRLF_"<emDocProxy></emDocProxy>"
+	Do $$$AssertEquals(XMLData,ExpectedXMLData,"De xml-data van FOPDataStream is correct ingevuld")
+
+	Do blFOPData.Close()
+	Set blFOPData=""
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*
@@ -56,9 +52,13 @@
 ]]></Content>
 </UDLText>
 
-<Method name="CreateBlablabla">
-<ReturnType>WS.TBX.Order</ReturnType>
-<Implementation><![CDATA[	Quit Blablabla
+<Method name="GeefFOPDataMgr">
+<FormalSpec>Task:Sys.FOP.Task</FormalSpec>
+<ReturnType>BL.Sys.FOP.DataMgr</ReturnType>
+<Implementation><![CDATA[
+	Set blFOPData=##class(BL.Sys.FOP.DataMgr).Instantiate()
+	Do blFOPData.Init(Task,"")
+	Quit blFOPData
 ]]></Implementation>
 </Method>
 </Class>