Index: vhUnitTest/TECH/DynamicSQL.cls.xml
===================================================================
diff -u -r2292 -r2439
--- vhUnitTest/TECH/DynamicSQL.cls.xml	(.../DynamicSQL.cls.xml)	(revision 2292)
+++ vhUnitTest/TECH/DynamicSQL.cls.xml	(.../DynamicSQL.cls.xml)	(revision 2439)
@@ -5,36 +5,35 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnAfterAllTests">
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	 do ##super()
-	 do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1000,1001)
+ 	 do ##super()
+ 	 do ##class(vhTest.Data.TECH.Persistent.Data).CreateTestData(1000,1001)
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
+<Method name="OnAfterAllTests">
 <Implementation><![CDATA[
- 	 do ##super()
- 	 do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1000,1001)
+	 do ##super()
+	 do ##class(vhTest.Data.TECH.Persistent.Data).DeleteTestData(1000,1001)
 ]]></Implementation>
 </Method>
 
 <Method name="TestAllesOK">
 <Implementation><![CDATA[
+	#dim ResultSet As %ResultSet
+	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ItemId FROM vhTest_Data_TECH_Persistent.Data")
 	
-	#dim ResultSet As %ResultSet = ""
-	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ID FROM Prod.Product")
-	
 	set ResultSet = SQL.VoerUit()
 	do $$$AssertTrue(ResultSet.Next(),"SQL is uitgevoerd")
 	
-	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ID FROM Prod.Product WHERE ID = ? ",$listbuild(1000))
+	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ItemId FROM vhTest_Data_TECH_Persistent.Data WHERE ItemId = ? ",$listbuild(1000))
 	set ResultSet = SQL.VoerUit()
 	do $$$AssertTrue(ResultSet.Next(),"SQL is uitgevoerd")
 	do $$$AssertEquals(ResultSet.GetData(1),"1000","De juiste id werd teruggegeven")
 	do $$$AssertFalse(ResultSet.Next(),"Resultset heeft einde bereikt")
 	
-	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ID FROM Prod.Product WHERE ID = ? OR ID = ?",$listbuild(1000,1001))
+	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ItemId FROM vhTest_Data_TECH_Persistent.Data WHERE ItemId = ?  OR ItemId = ?",$listbuild(1000,1001))
 	set ResultSet = SQL.VoerUit()
 	do $$$AssertTrue(ResultSet.Next(),"SQL is uitgevoerd")
 	do $$$AssertEquals(ResultSet.GetData(1),"1000","De juiste id werd teruggegeven")
@@ -46,11 +45,11 @@
 
 <Method name="TestFoutiefStatement">
 <Implementation><![CDATA[
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan query 'SELECT ID FROM Prod.Product WHERE FOUT IN SQL' niet voorbereiden")
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan query 'SELECT ID FROM vhTest_Data_TECH_Persistent.Data WHERE FOUT IN SQL' niet voorbereiden")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.StatusException",Substrings))
 
 	#dim ResultSet As %ResultSet = ""
-	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ID FROM Prod.Product WHERE FOUT IN SQL")
+	set SQL = ##class(TECH.DynamicSQL).%New("SELECT ID FROM vhTest_Data_TECH_Persistent.Data WHERE FOUT IN SQL")
 	set ResultSet = SQL.VoerUit()
 ]]></Implementation>
 </Method>