Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r1154 -r1208
--- Tools/Test/TestCase.cls.xml (.../TestCase.cls.xml) (revision 1154)
+++ Tools/Test/TestCase.cls.xml (.../TestCase.cls.xml) (revision 1208)
@@ -8,8 +8,8 @@
Test case class. All test cases are derived from here.
Every test method should start with prefix "Test".
-%outUnitTest,Tools.UnitTest,vhLib.Macro
-%outUnitTest,Tools.UnitTest
+Tools.UnitTest,vhLib.Macro
+Tools.UnitTest
1
%RegisteredObject
@@ -43,6 +43,10 @@
1
+
+Tools.Test.Asserter
+
+
Indien true wordt de gehele testcase niet uitgevoerd
@@ -92,6 +96,7 @@
@@ -251,93 +256,39 @@
]]>
-
-aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String
-%Boolean
-
+%String
+
-
-aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String
-%Boolean
-
+TestMethode:%String
+
-
-aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String
+
%Boolean
-
-
-aAutoQuoted:%String,aValue1:%String,aValue2:%String,aDifference:%String,aMessage:%String
+
%Boolean
-(aDifference)
- Do manager.LogAssert(success,"AssertAlmostEquals",aMessage)
- Quit success
+
-
-aAutoQuoted:%String,List1:%ListOfDataTypes,List2:%ListOfDataTypes,aMessage:%String
-%Status
- *"_Value2_"*"
- }
- }
- Set manager=r%Manager
-
-
- if List1.Count() '= List2.Count() {
- set aMessage = aMessage _ "# Items differs "_List1.Count()_"="_List2.Count()
- }
- Do manager.LogAssert(success,"AssertEqualsList",aMessage)
- Quit success
-]]>
+
+1
+%String
-
-aAutoQuoted:%String,List1:%List,List2:%List,aMessage:%String
-%Status
-
+1
+%String
+
@@ -364,181 +315,12 @@
if 'success set aMessage = aMessage _ Exception.GeefOmschrijving() _ " = "_ ExceptionMessage _$$$CRLF
}
- set aMessage = aMessage _ "["_..ParseAutoQuoted(aAutoQuoted,"Exception")_"]"
+ set aMessage = aMessage _ "["_..Asserter.ParseAutoQuoted(aAutoQuoted,"Exception")_"]"
Do manager.LogAssert(success,"AssertException",aMessage)
Quit success
]]>
-
-aAutoQuoted:%String,aValue:%String,aMessage:%String
-%Boolean
-
-
-
-
-aAutoQuoted:%String,aValue:%String,aMessage:%String
-%Boolean
-
-
-
-
-aAutoQuoted:%String,status:%String,aMessage:%String
-%Status
- "_$g(errorarray(1))
- Do manager.LogAssert(success,"AssertStatusOK",aMessage)
- Quit success
-]]>
-
-
-
-aAutoQuoted:%String,Folder:%String,aMessage:%String=""
-%Status
-
-
-
-
-aAutoQuoted:%String,Object:%RegisteredObject,VerwachtObject:%RegisteredObject,aMessage:%String=""
- "_ $method(WaardePropertyVerwachtObject,"Count") )
- } else {
- set itList1 = ##class(TECH.ListIterator).%New(WaardePropertyObject)
- set itList2 = ##class(TECH.ListIterator).%New(WaardePropertyVerwachtObject)
- while itList1.HasNext() && success {
- #dim Value1 As %String = itList1.Next()
- #dim Value2 As %String = itList2.Next()
- set success = ( Value1 = Value2)
- if 'success do Verschillen.Insert("Item "_itList1.Key()_" verschillend : *"_Value1 _ "* <> *"_Value2_"*")
- }
- }
- } elseif WaardePropertyObject '= WaardePropertyVerwachtObject {
- do Verschillen.Insert(Property_" : "_WaardePropertyObject _" <> "_ WaardePropertyVerwachtObject )
- }
- }
-
- if Verschillen.Count() {
- set aMessage = aMessage _ ##class(TECH.ListUtils).ListToPieces(Verschillen,$$$CRLF)
- set success = 0
- }
-
- Do manager.LogAssert(success,"AssertObject",aMessage)
-
- Quit success
-]]>
-
-
-
-Path:%String
-1
-%Boolean
- 0) )
- quit Result
-]]>
-
-
-
-Path:%String
-1
- 0)
- set itFiles = ##class(TECH.ListIterator).%New(FileList)
- while ( itFiles.HasNext() ) && ( RecentAangepast ) {
- #dim File As TECH.FileInfo = itFiles.Next()
- if ..ControleBestandNodigOpRecenteAanpassing(File) {
- set RecentAangepast = '##class(TECH.Comparator.TimeStampComparator).%New().IsKleinerDan(File.DateModified,..StartTime)
- }
- }
- quit RecentAangepast
-]]>
-
-
-
-FileInfo:TECH.FileInfo
-1
-%Boolean
-
-
-
-
-aAutoQuoted:%String,status:%String,aMessage:%String
-%Status
-
-
-
aMessage:%String
%Status
@@ -549,49 +331,6 @@
]]>
-
-aAutoQuoted:%String,file1:%String,file2:%String,aMessage:%String
-%Boolean
-
-
-
-
-message:%String
-
-
-
-
-
-[Previously private]
-1
-argline:%String,type:%String
-%String
-$l(argline) s c=$e(argline,i) d
- . i c="""" s q='q
- . i c="(" s p=p+1
- . i c=")" s p=p-1
- . i c=",",q=0,p=0 s args($increment(piece))=$e(argline,ptr,i-1),ptr=i+1
- s args($increment(piece))=$e(argline,ptr,i-1)
- i type="expr" q $g(args(1))
- i type="equals" q $g(args(1))_"=="_$g(args(2))
- q ""
-]]>
-
-
EventType:%String
-
-
-aAutoQuoted:%String,aValue1:%String,Pattern:%String,aMessage:%String
-%Boolean
-
-
-
-
-%String
-
-
-
-
-TestMethode:%String
-
-
-
-
-%Boolean
-
-
-
-
-%Boolean
-
-
-
-
-1
-%String
-
-
-
-1
-%String
-
-
Index: Tools/UnitTest.inc.rou
===================================================================
diff -u -r1143 -r1208
--- Tools/UnitTest.inc.rou (.../UnitTest.inc.rou) (revision 1143)
+++ Tools/UnitTest.inc.rou (.../UnitTest.inc.rou) (revision 1208)
@@ -1,13 +1,26 @@
-#def1arg AssertAlmostEquals(%args) ..AssertAlmostEqualsViaMacro(##quote(%args),%args)
-#def1arg AssertException(%args) ..AssertExceptionViaMacro(##quote(%args),%args)
-#def1arg AssertEqualsList(%args) ..AssertEqualsListViaMacro(##quote(%args),%args)
-#def1arg AssertEqualsListbuild(%args) ..AssertEqualsListbuildViaMacro(##quote(%args),%args)
-#def1arg AssertFalse(%args) ..AssertNotTrueViaMacro(##quote(%args),%args)
-#def1arg AssertError(%args) ..AssertNotTrueViaMacro(1,%args)
-#def1arg AssertContains(%args) ..AssertContainsViaMacro(##quote(%args),%args)
-#def1arg AssertCorrectGemaakteBestanden(%args) ..AssertCorrectGemaakteBestandenViaMacro(##quote(%args),%args)
-#def1arg AssertObject(%args) ..AssertObjectViaMacro(##quote(%args),%args)
-#def1arg AssertPattern(%args) ..AssertPatternViaMacro(##quote(%args),%args)
+#def1arg AssertEquals(%args) ..Asserter.AssertEqualsViaMacro(##quote(%args),%args)
+#def1arg AssertNotEquals(%args) ..Asserter.AssertNotEqualsViaMacro(##quote(%args),%args)
+#def1arg AssertTrue(%args) ..Asserter.AssertTrueViaMacro(##quote(%args),%args)
+#def1arg AssertNotTrue(%args) ..Asserter.AssertNotTrueViaMacro(##quote(%args),%args)
+#def1arg AssertStatusOK(%args) ..Asserter.AssertStatusOKViaMacro(##quote(%args),%args)
+#def1arg AssertStatusNotOK(%args) ..Asserter.AssertStatusNotOKViaMacro(##quote(%args),%args)
+#def1arg AssertStatusEquals(%args) ..Asserter.AssertStatusEqualsViaMacro(##quote(%args),%args)
+#def1arg AssertFilesSame(%args) ..Asserter.AssertFilesSameViaMacro(##quote(%args),%args)
+#;
+#define LogMessage(%message) ..Asserter.LogMessage(%message)
+#define AssertSkipped(%message) ..Asserter.AssertSkippedViaMacro(%message)
+
+#def1arg AssertAlmostEquals(%args) ..Asserter.AssertAlmostEqualsViaMacro(##quote(%args),%args)
+#def1arg AssertException(%args) ..AssertExceptionViaMacro(##quote(%args),%args)
+#def1arg AssertEqualsList(%args) ..Asserter.AssertEqualsListViaMacro(##quote(%args),%args)
+#def1arg AssertEqualsListbuild(%args) ..Asserter.AssertEqualsListbuildViaMacro(##quote(%args),%args)
+#def1arg AssertFalse(%args) ..Asserter.AssertNotTrueViaMacro(##quote(%args),%args)
+#def1arg AssertError(%args) ..Asserter.AssertNotTrueViaMacro(1,%args)
+#def1arg AssertContains(%args) ..Asserter.AssertContainsViaMacro(##quote(%args),%args)
+#def1arg AssertCorrectGemaakteBestanden(%args) ..Asserter.AssertCorrectGemaakteBestandenViaMacro(##quote(%args),%args)
+#def1arg AssertObject(%args) ..Asserter.AssertObjectViaMacro(##quote(%args),%args)
+#def1arg AssertPattern(%args) ..Asserter.AssertPatternViaMacro(##quote(%args),%args)
+#def1arg AssertInList(%args) ..Asserter.AssertInListViaMacro(##quote(%args),%args)
#define UnitTestUtils ##class(vhUnitTest.Utils)
Index: Tools/Test/Asserter.cls.xml
===================================================================
diff -u
--- Tools/Test/Asserter.cls.xml (revision 0)
+++ Tools/Test/Asserter.cls.xml (revision 1208)
@@ -0,0 +1,358 @@
+
+
+
+TECH.RegisteredObject
+
+
+Tools.Test.Manager
+1
+
+
+
+Tools.Test.TestCase
+1
+
+
+
+TestCase:Tools.Test.TestCase,Manager:Tools.Test.Manager
+1
+1
+%Status
+1
+
+
+
+
+aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String
+%Boolean
+
+
+
+
+aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String
+%Boolean
+
+
+
+
+aAutoQuoted:%String,aValue1:%String,aValue2:%String,aMessage:%String
+%Boolean
+
+
+
+
+aAutoQuoted:%String,aValue1:%String,aValue2:%String,aDifference:%String,aMessage:%String
+%Boolean
+(aDifference)
+ Do manager.LogAssert(success,"AssertAlmostEquals",aMessage)
+ Quit success
+]]>
+
+
+
+aAutoQuoted:%String,List1:%ListOfDataTypes,List2:%ListOfDataTypes,aMessage:%String
+%Status
+ *"_Value2_"*"
+ }
+ }
+ Set manager=r%Manager
+
+
+ if List1.Count() '= List2.Count() {
+ set aMessage = aMessage _ "# Items differs "_List1.Count()_"="_List2.Count()
+ }
+ Do manager.LogAssert(success,"AssertEqualsList",aMessage)
+ Quit success
+]]>
+
+
+
+aAutoQuoted:%String,List1:%List,List2:%List,aMessage:%String
+%Status
+
+
+
+
+aAutoQuoted:%String,aValue:%String,aMessage:%String
+%Boolean
+
+
+
+
+aAutoQuoted:%String,aValue:%String,aMessage:%String
+%Boolean
+
+
+
+
+aAutoQuoted:%String,List:%AbstractList,Value:%CacheString,aMessage:%String
+%Status
+ 0 )
+ Set aMessage=$g(aMessage)_":"
+ Do manager.LogAssert(success,"AssertInList",aMessage)
+ Quit success
+]]>
+
+
+
+aAutoQuoted:%String,status:%String,aMessage:%String
+%Status
+ "_$g(errorarray(1))
+ Do manager.LogAssert(success,"AssertStatusOK",aMessage)
+ Quit success
+]]>
+
+
+
+aAutoQuoted:%String,Folder:%String,aMessage:%String=""
+%Status
+
+
+
+
+aAutoQuoted:%String,Object:%RegisteredObject,VerwachtObject:%RegisteredObject,aMessage:%String=""
+ "_ $method(WaardePropertyVerwachtObject,"Count") )
+ } else {
+ set itList1 = ##class(TECH.ListIterator).%New(WaardePropertyObject)
+ set itList2 = ##class(TECH.ListIterator).%New(WaardePropertyVerwachtObject)
+ while itList1.HasNext() && success {
+ #dim Value1 As %String = itList1.Next()
+ #dim Value2 As %String = itList2.Next()
+ set success = ( Value1 = Value2)
+ if 'success do Verschillen.Insert("Item "_itList1.Key()_" verschillend : *"_Value1 _ "* <> *"_Value2_"*")
+ }
+ }
+ } elseif WaardePropertyObject '= WaardePropertyVerwachtObject {
+ do Verschillen.Insert(Property_" : "_WaardePropertyObject _" <> "_ WaardePropertyVerwachtObject )
+ }
+ }
+
+ if Verschillen.Count() {
+ set aMessage = aMessage _ ##class(TECH.ListUtils).ListToPieces(Verschillen,$$$CRLF)
+ set success = 0
+ }
+
+ Do manager.LogAssert(success,"AssertObject",aMessage)
+
+ Quit success
+]]>
+
+
+
+Path:%String
+1
+%Boolean
+ 0) )
+ quit Result
+]]>
+
+
+
+Path:%String
+1
+ 0)
+ set itFiles = ##class(TECH.ListIterator).%New(FileList)
+ while ( itFiles.HasNext() ) && ( RecentAangepast ) {
+ #dim File As TECH.FileInfo = itFiles.Next()
+ if ..ControleBestandNodigOpRecenteAanpassing(File) {
+ set RecentAangepast = '##class(TECH.Comparator.TimeStampComparator).%New().IsKleinerDan(File.DateModified,..TestCase.StartTime)
+ }
+ }
+ quit RecentAangepast
+]]>
+
+
+
+FileInfo:TECH.FileInfo
+1
+%Boolean
+
+
+
+
+aAutoQuoted:%String,status:%String,aMessage:%String
+%Status
+
+
+
+
+aAutoQuoted:%String,file1:%String,file2:%String,aMessage:%String
+%Boolean
+
+
+
+
+message:%String
+
+
+
+
+1
+argline:%String,type:%String
+%String
+$l(argline) s c=$e(argline,i) d
+ . i c="""" s q='q
+ . i c="(" s p=p+1
+ . i c=")" s p=p-1
+ . i c=",",q=0,p=0 s args($increment(piece))=$e(argline,ptr,i-1),ptr=i+1
+ s args($increment(piece))=$e(argline,ptr,i-1)
+ i type="expr" q $g(args(1))
+ i type="equals" q $g(args(1))_"=="_$g(args(2))
+ q ""
+]]>
+
+
+
+aAutoQuoted:%String,aValue1:%String,Pattern:%String,aMessage:%String
+%Boolean
+
+
+
+
+
+