Index: vhUnitTest/TECH/Lock/LockUtils/ReleaseAllLocksForThisProcess/Test.cls.xml
===================================================================
diff -u -r3284 -r3287
--- vhUnitTest/TECH/Lock/LockUtils/ReleaseAllLocksForThisProcess/Test.cls.xml	(.../Test.cls.xml)	(revision 3284)
+++ vhUnitTest/TECH/Lock/LockUtils/ReleaseAllLocksForThisProcess/Test.cls.xml	(.../Test.cls.xml)	(revision 3287)
@@ -3,6 +3,16 @@
 <Class name="vhUnitTest.TECH.Lock.LockUtils.ReleaseAllLocksForThisProcess.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="HeeftInitieleLocks">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="InitieleLocksList">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VerwachtUnlockedList">
 <Type>%ListOfDataTypes</Type>
 <Private>1</Private>
@@ -13,6 +23,15 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Set ..InitieleLocksList = ##class(TECH.Lock.LockUtils).GetLocksForProcess($Job)
+	Set ..HeeftInitieleLocks = (..InitieleLocksList.Count() > 0)
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -122,19 +141,29 @@
 <FormalSpec>SkipLockStringsList:%ListOfDataTypes,VerwachtUnlockedList:%ListOfDataTypes,VerwachtStillLockedList:%ListOfDataTypes</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim i As %Integer
-	#dim UnlockedList As %ListOfDataTypes = ##class(TECH.Lock.LockUtils).ReleaseAllLocksForThisProcess(SkipLockStringsList)
-	
-	If $$$AssertTrue($IsObject(UnlockedList)) { 
-		Do $$$AssertEqualsList(UnlockedList, VerwachtUnlockedList)
+	If (..HeeftInitieleLocks) && $$$Not($IsObject(SkipLockStringsList)) {
+		Do $$$AssertFalse(1, "Testmethod (""Zonder SkipList"") wordt overgeslagen, om de bestaande locks niet te verwijderen.")
 	}
+	Else {
+		If (..HeeftInitieleLocks) {
+			Do ##class(TECH.ListUtils).AppendList(SkipLockStringsList, ..InitieleLocksList)
+			Do ##class(TECH.ListUtils).AppendList(VerwachtStillLockedList, ..InitieleLocksList)
+		}
 
-	For i = 1:1:VerwachtStillLockedList.Count() {
-		Do $$$AssertTrue(..IsLocked(VerwachtStillLockedList.GetAt(i)))
-	}
+		#dim i As %Integer
+		#dim UnlockedList As %ListOfDataTypes = ##class(TECH.Lock.LockUtils).ReleaseAllLocksForThisProcess(SkipLockStringsList)
+		
+		If $$$AssertTrue($IsObject(UnlockedList)) { 
+			Do $$$AssertEqualsList(UnlockedList, VerwachtUnlockedList)
+		}
 
-	For i = 1:1:VerwachtUnlockedList.Count() {
-		Do $$$AssertFalse(..IsLocked(VerwachtUnlockedList.GetAt(i)))
+		For i = 1:1:VerwachtStillLockedList.Count() {
+			Do $$$AssertTrue(..IsLocked(VerwachtStillLockedList.GetAt(i)))
+		}
+
+		For i = 1:1:VerwachtUnlockedList.Count() {
+			Do $$$AssertFalse(..IsLocked(VerwachtUnlockedList.GetAt(i)))
+		}
 	}
 ]]></Implementation>
 </Method>