Index: svn/UnitTestHelper.cls.xml
===================================================================
diff -u -r1649 -r1669
--- svn/UnitTestHelper.cls.xml	(.../UnitTestHelper.cls.xml)	(revision 1649)
+++ svn/UnitTestHelper.cls.xml	(.../UnitTestHelper.cls.xml)	(revision 1669)
@@ -13,16 +13,29 @@
 <Method name="RunUnitTestsForInternalName">
 <FormalSpec>InternalName:%String</FormalSpec>
 <Implementation><![CDATA[
-	set UnitTests = ##class(%ListOfDataTypes).%New()
+	#dim UnitTests As %ListOfDataTypes = ..GetUnitTestsForInternalName(InternalName)
+	if UnitTests.Count() > 0 {
+		do ..RunUnitTests(UnitTests)
+	} else {
+		write !,"Geen unittest voor "_InternalName_ "!!!!!!!!!!"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GetUnitTestsForInternalName">
+<FormalSpec>InternalName:%String</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
 	#dim InternalNameStripped As %String = ##class(TECH.SourceCodeUtils).StripExtension(InternalName)
+	set UnitTests = ##class(%ListOfDataTypes).%New()
 	if ##class(svn.UnitTestAnalyser).IsUnitClass(InternalNameStripped) {
 		do UnitTests.Insert(InternalNameStripped)
 	} elseif ##class(TECH.SourceCodeUtils).Type(InternalName) = ##class(TECH.enu.SourceCodeType).Class() {
 		do ..AddUnitTestsForClassAndDerivatives(InternalNameStripped,UnitTests)
 	} elseif ##class(TECH.SourceCodeUtils).Type(InternalName) = ##class(TECH.enu.SourceCodeType).Routine() {
 		do ##class(TECH.ListUtils).CopyListOfDataTypes(##class(svn.UnitTestInfo).GetUnitTestsForRoutine(InternalNameStripped),UnitTests)
 	}
-	do ..RunUnitTests(UnitTests)
+	quit UnitTests
 ]]></Implementation>
 </Method>
 
@@ -49,27 +62,18 @@
 <Method name="RunUnitTests">
 <FormalSpec>UnitTests:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
-	if ( UnitTests.Count() > 10 ) {
+	set UnitTests = ##class(TECH.ListUtils).RemoveDuplicateItems(UnitTests)
+	if 0 && ( UnitTests.Count() > 10 ) {
 		write !,"Teveel unittests om automatisch uit te voeren"
 	} else {
-		set itUnitTests = ##class(TECH.ListIterator).%New(UnitTests)
-		while itUnitTests.HasNext() {
-			do ..RunUnitTest(itUnitTests.Next())
-		}
+		do ..ExecuteUnitTests(UnitTests)
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="RunUnitTest">
-<FormalSpec>Classname:%String</FormalSpec>
-<Implementation><![CDATA[
-	#dim UnitTestName = ..BepaalUnitTestName(Classname)
-	if ##class(%Dictionary.ClassDefinition).%ExistsId(UnitTestName) {
-		set UnitTestName = $piece(UnitTestName,"vhUnitTest.",2,$length(UnitTestName,"vhUnitTest."))
-		do ..ExecuteUnitTest(UnitTestName)
-	} else {
-		write !,"Geen unittest ("_UnitTestName_") voor "_Classname	
-	}
+<FormalSpec>InternalName:%String</FormalSpec>
+<Implementation><![CDATA[	do ..RunUnitTestsForInternalName(InternalName)
 ]]></Implementation>
 </Method>
 
@@ -98,12 +102,24 @@
 	#dim SQLSelectMode = $SYSTEM.SQL.GetSelectMode()
 	do $SYSTEM.SQL.SetSelectMode(##class(TECH.enu.ResultSetRuntimeMode).Logical())
 
-	write !,"UnitTest uitvoeren : do ##class(vhUnitTest.Manager).RunTest("""","""_Filter_""")"
-	do ##class(vhUnitTest.Manager).RunTest("",Filter)
+	write !,"UnitTest uitvoeren : do ##class(vhUnitTest.Manager).RunTests("""","""_Filter_""")"
+	do ##class(vhUnitTest.Manager).RunTest("/duration",Filter)
 	
 	do $SYSTEM.SQL.SetSelectMode(SQLSelectMode)
 ]]></Implementation>
 </Method>
+
+<Method name="ExecuteUnitTests">
+<FormalSpec>Filters:%ListOfDataTypes</FormalSpec>
+<Implementation><![CDATA[
+	#dim SQLSelectMode = $SYSTEM.SQL.GetSelectMode()
+	do $SYSTEM.SQL.SetSelectMode(##class(TECH.enu.ResultSetRuntimeMode).Logical())
+
+	do ##class(vhUnitTest.Manager).RunTests("",Filters)
+	
+	do $SYSTEM.SQL.SetSelectMode(SQLSelectMode)
+]]></Implementation>
+</Method>
 </Class>