Index: vhUnitTest/APPS/PM/OL/OrgaluxGammaExporter/Test.cls.xml
===================================================================
diff -u -r31923 -r55623
--- vhUnitTest/APPS/PM/OL/OrgaluxGammaExporter/Test.cls.xml	(.../Test.cls.xml)	(revision 31923)
+++ vhUnitTest/APPS/PM/OL/OrgaluxGammaExporter/Test.cls.xml	(.../Test.cls.xml)	(revision 55623)
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.PM.OL.OrgaluxGammaExporter.Test">
-<Description>
-Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.PM.OL.OrgaluxGammaExporter")</Description>
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.APPS.PM.OL.OrgaluxGammaExporter</Super>
@@ -14,72 +12,63 @@
 
 <Method name="TestIntivo">
 <Implementation><![CDATA[
-	// SETUP
 	set ExportFilter = ##class(DOM.PM.OL.Gamma.dto.ExportFilter).%New()
 	set ExportFilter.KlantNr = 8197
 	set ExportFilter.LadeDesigns = $listbuild( ##class(DOM.PM.enu.LadeVariant).TBXIntivo() )
 	set ExportFilter.OokBeperktActieve = 1
 	
-	// ACTIE
 	Set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
 	Set ProductLijst = ##class(%ListOfDataTypes).%New()
 	Do Exporter.BepaalProducten( ExportFilter, .ProductLijst )
 	
-	Do $$$AssertTrue( ProductLijst.Find( "794966" ) )
+	Do ##class(Tools.Wlip).%New(42).ListOfDataTypes(ProductLijst)
+	Do $$$AssertTrue(ProductLijst.Find("794372"))
 ]]></Implementation>
 </Method>
 
 <Method name="TestIntivoEnAntaro">
 <Implementation><![CDATA[
-	// SETUP
 	set ExportFilter = ##class(DOM.PM.OL.Gamma.dto.ExportFilter).%New()
 	set ExportFilter.KlantNr = 8197
 	set ExportFilter.LadeDesigns = $listbuild( ##class(DOM.PM.enu.LadeVariant).TBXIntivo(), ##class(DOM.PM.enu.LadeVariant).TBXAntaro() )
 	set ExportFilter.OokBeperktActieve = 1
 	
-	// ACTIE
 	Set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
 	Set ProductLijst = ##class(%ListOfDataTypes).%New()
 	Do Exporter.BepaalProducten( ExportFilter, .ProductLijst )
 	
-	Do $$$AssertTrue( ProductLijst.Find( "794966" ) )
-	Do $$$AssertTrue( ProductLijst.Find( "796002.1" ) || ProductLijst.Find( "796002.2" ) || ProductLijst.Find( "796002.3" ) || ProductLijst.Find( "796002.4" ))
+	Do $$$AssertTrue(ProductLijst.Find("796002.1") || ProductLijst.Find("796002.2") || ProductLijst.Find("796002.3") || ProductLijst.Find("796002.4"))
 ]]></Implementation>
 </Method>
 
 <Method name="TestAntaroEnIntivo">
 <Implementation><![CDATA[
-	// SETUP
 	set ExportFilter = ##class(DOM.PM.OL.Gamma.dto.ExportFilter).%New()
 	set ExportFilter.KlantNr = 8197
 	set ExportFilter.LadeDesigns = $listbuild( ##class(DOM.PM.enu.LadeVariant).TBXAntaro(), ##class(DOM.PM.enu.LadeVariant).TBXIntivo() )
 	set ExportFilter.OokBeperktActieve = 1
 	
-	// ACTIE
 	Set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
 	Set ProductLijst = ##class(%ListOfDataTypes).%New()
 	Do Exporter.BepaalProducten( ExportFilter, .ProductLijst )
 	
-	Do $$$AssertTrue( ProductLijst.Find( "794966" ) )
-	Do $$$AssertTrue( ProductLijst.Find( "796002.1" ) || ProductLijst.Find( "796002.2" ) || ProductLijst.Find( "796002.3" ) || ProductLijst.Find( "796002.4" ))
+	Do $$$AssertTrue(ProductLijst.Find("796002.1") || ProductLijst.Find("796002.2") || ProductLijst.Find("796002.3") || ProductLijst.Find("796002.4"))
 ]]></Implementation>
 </Method>
 
 <Method name="TestAlleTbx">
 <Implementation><![CDATA[
-	// SETUP
 	set ExportFilter = ##class(DOM.PM.OL.Gamma.dto.ExportFilter).%New()
 	set ExportFilter.KlantNr = 4875
 	set ExportFilter.LadeDesigns = $ListBuild( ##class(DOM.PM.enu.LadeVariant).TBXAntaro(), ##class(DOM.PM.enu.LadeVariant).TBXAntaro(), ##class(DOM.PM.enu.LadeVariant).TBXPlus(), ##class(DOM.PM.enu.LadeVariant).TBXIntivo() )
 	Set ExportFilter.LadeHoogtes = $ListBuild( "M", "M/Z", "N", "N/Z", "K", "K/Z", "C", "C/Z" ) _ $ListBuild( "M", "M/Z", "N", "N/Z", "K", "K/Z", "D", "D/Z" )
 	set ExportFilter.OokBeperktActieve = 0
 	
-	// ACTIE
 	Set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
 	Set ProductLijst = ##class(%ListOfDataTypes).%New()
-	Do Exporter.BepaalProducten( ExportFilter, .ProductLijst )
+	Do Exporter.BepaalProducten(ExportFilter, .ProductLijst)
 	
-	Do $$$AssertTrue( ProductLijst.Find( "887261" ) )
+	Do $$$AssertTrue(ProductLijst.Find("886569"))
 ]]></Implementation>
 </Method>