Index: vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml
===================================================================
diff -u -r1934 -r1969
--- vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(.../TestExceptions.cls.xml)	(revision 1934)
+++ vhUnitTest/TECH/Exceptions/TestExceptions.cls.xml	(.../TestExceptions.cls.xml)	(revision 1969)
@@ -7,55 +7,33 @@
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<UDLText name="T">
-<Content><![CDATA[
-// do ##class(vhUnitTest.TECH.Exceptions.TestExceptions).%New().TestThrowException()
-
-]]></Content>
-</UDLText>
-
-<UDLText name="T">
-<Content><![CDATA[
-// 
-
-]]></Content>
-</UDLText>
-
 <Method name="TestThrowException">
 <Implementation><![CDATA[
-		w "---------------------------------------------------------------------",!
 		Set $ZTRAP = "CatchThrow"
 		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).ThrowException()	
-		w "---------------------------------------------------------------------",!
 		Quit
 CatchThrow Set $ZTRAP = ""
 		Set Exception = ##class(TECH.ExceptionHandler).Catch()
-		w !,Exception.ToString(),!
-		w "---------------------------------------------------------------------",!
-		quit
+		Do $$$AssertEquals(Exception.GeefOmschrijving(),"Klasse B detecteert exception.","Omschrijving van Exception is correct.")
+		Do $$$AssertTrue($IsObject(Exception.GeefInnerException()),"InnerException is een object.")
+		Do $$$AssertEquals(Exception.GeefInnerException().GeefOmschrijving()," [Exception, gethrowed in Klasse C.]","Omschrijving van Exception is correct.")
+		Do $$$AssertFalse('$IsObject(Exception.GeefInnerException()),"InnerException van InnerException bestaat niet.")		
+		Quit
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-// do ##class(vhUnitTest.TECH.Exceptions.TestExceptions).%New().TestRaiseUndefined()
-
-]]></Content>
-</UDLText>
-
 <Method name="TestRaiseUndefined">
 <Implementation><![CDATA[
-		w "---------------------------------------------------------------------",!
 		Set $ZTRAP = "CatchRaise"
 		Do ##class(vhUnitTest.TECH.Exceptions.KlasseA).RaiseUndefined()	
-		
-		w "---------------------------------------------------------------------",!
 		Quit
 CatchRaise Set $ZTRAP = ""
 		Set Exception = ##class(TECH.ExceptionHandler).Catch()
-		w !,Exception.ToString(),!
-		w "---------------------------------------------------------------------",!
-		quit
+		Do $$$AssertEquals(Exception.GeefOmschrijving(),"Klasse B detecteert undefined.","Omschrijving van Exception is correct.")
+		Do $$$AssertTrue($IsObject(Exception.GeefInnerException()),"InnerException is een object.")
+		Do $$$AssertEquals(Exception.GeefInnerException().GeefOmschrijving(),"Runtime exception","Omschrijving van Exception is correct.")
+		Do $$$AssertFalse('$IsObject(Exception.GeefInnerException()),"InnerException van InnerException bestaat niet.")
+		Quit
 ]]></Implementation>
 </Method>
 </Class>