Index: vhUnitTest/WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper/GeefWerkpost/Test.cls.xml
===================================================================
diff -u -r64177 -r64178
--- vhUnitTest/WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper/GeefWerkpost/Test.cls.xml	(.../Test.cls.xml)	(revision 64177)
+++ vhUnitTest/WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper/GeefWerkpost/Test.cls.xml	(.../Test.cls.xml)	(revision 64178)
@@ -3,10 +3,67 @@
 <Class name="vhUnitTest.WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper.GeefWerkpost.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test">
-<Implementation><![CDATA[	Set QueryApiMock = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+<Parameter name="Werkpost1">
+<Type>String</Type>
+<Default>LP1</Default>
+</Parameter>
+
+<Parameter name="Werkpost4">
+<Type>String</Type>
+<Default>P2</Default>
+</Parameter>
+
+<Method name="Test: Gewone DnaCode met toelevering geeft Werkpost1">
+<Implementation><![CDATA[
+	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode.DnaCode = "LAAAAA0"
+	Set DnaCode.Toelevering = "111111"
+	Set DnaCode.ProductNummer = "1304468"
+	
+	#dim DynamicQuery As TECH.DynamicQuery = ..MaakDynamicQuery(DnaCode)
+	
+	#dim ResultSetData As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(..#Werkpost1))
+	#dim ResultSetHeader As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeader.Insert("Werkpost")
+	#dim ResultSet As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeader)
+
+	Set QueryApiMock = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+	Do QueryApiMock.VerwachtMethodCall("GetResultSet",..Matches.Object((DynamicQuery))).DanReturn(ResultSet)
+	
+	Set EtiketAfdrukkenHelper = ##class(WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper).%New(, QueryApiMock)
+	#dim WerkPost As %String = EtiketAfdrukkenHelper.GeefWerkpost(DnaCode)
+	
+	Do $$$AssertEquals(WerkPost, ..#Werkpost1)
+	
+	Do QueryApiMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="MaakDynamicQuery">
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.DynamicQuery</ReturnType>
+<Implementation><![CDATA[
+	#dim Statement As %String = "SELECT top 1 Werkpost FROM APPS_VKP_Maatwerk_LadeRegistratie_impl.Registratie "
+	#dim Parameters As %List
+	
+	If $$$HasLength(DnaCode.Toelevering) {
+		Set Statement = Statement _ "where (prnr = ? and toeleveringid = ?) "
+	} Else {
+		Set Statement = Statement _ "where prnr = ? "
+	}
+	Set Statement = Statement _ "order by id desc "
+	
+	If $$$HasLength(DnaCode.Toelevering) {
+		Set Parameters = $ListBuild(DnaCode.ProductNummer, DnaCode.Toelevering)
+	} Else {
+		Set Parameters = $ListBuild(DnaCode.ProductNummer, DnaCode.Toelevering)
+	}
+	
+	Quit ##class(TECH.DynamicQuery).%New(Statement, Parameters)
+]]></Implementation>
+</Method>
 </Class>