--- a/RegressionTests__CoverageInstrumentationTest.st	Wed Sep 04 20:26:35 2013 +0200
+++ b/RegressionTests__CoverageInstrumentationTest.st	Thu Sep 12 17:20:29 2013 +0200
@@ -85,7 +85,7 @@
 
     self assert:(m2 hasBeenCalled not).
     self assert:(m2 blockInvocationInfo size == 1).
-    self assert:(m2 statementInvocationInfo size == 1).
+    self assert:(m2 statementInvocationInfo size == 3).
     self assert:(m2 blockInvocationInfo conform:[:i | i hasBeenExecuted not]).
     self assert:(m2 statementInvocationInfo conform:[:i | i hasBeenExecuted not]).
 
@@ -96,7 +96,9 @@
     ].
     self assert:(m2 hasBeenCalled).
     self assert:(m2 blockInvocationInfo conform:[:i | i hasBeenExecuted]).
-    self assert:(m2 statementInvocationInfo conform:[:i | i hasBeenExecuted not]).
+    self assert:(m2 statementInvocationInfo first hasBeenExecuted).
+    self assert:(m2 statementInvocationInfo second hasBeenExecuted).
+    self assert:(m2 statementInvocationInfo third hasBeenExecuted not).
 
     "/ execute in the same context
     context runForCoverage:[
@@ -110,6 +112,8 @@
     "
      self new test_02_instrumentation
     "
+
+    "Modified: / 12-09-2013 / 16:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_03_instrumentation
@@ -122,7 +126,7 @@
     "/ before execution
     self assert:(m3 hasBeenCalled not).
     self assert:(m3 blockInvocationInfo size == 2).
-    self assert:(m3 statementInvocationInfo size == 1).
+    self assert:(m3 statementInvocationInfo size == 4).
     self assert:(m3 blockInvocationInfo conform:[:i | i hasBeenExecuted not]).
     self assert:(m3 blockInvocationInfo conform:[:i | i count == 0]).
     self assert:(m3 statementInvocationInfo conform:[:i | i hasBeenExecuted not]).
@@ -137,7 +141,10 @@
     self assert:(m3 hasBeenCalled).
     self assert:(m3 blockInvocationInfo count:[:i | i hasBeenExecuted]) = 1.
     self assert:(m3 blockInvocationInfo count:[:i | i hasBeenExecuted not]) = 1.
-    self assert:(m3 statementInvocationInfo conform:[:i | i hasBeenExecuted not]).
+    self assert:(m3 statementInvocationInfo first hasBeenExecuted).
+    self assert:(m3 statementInvocationInfo second hasBeenExecuted).
+    self assert:(m3 statementInvocationInfo third hasBeenExecuted not).
+    self assert:(m3 statementInvocationInfo fourth hasBeenExecuted not).
 
     "/ execute
     context runForCoverage:[
@@ -149,11 +156,17 @@
     self assert:(m3 blockInvocationInfo count:[:i | i hasBeenExecuted]) = 2.
     self assert:(m3 blockInvocationInfo count:[:i | i hasBeenExecuted not]) = 0.
     self assert:(m3 blockInvocationInfo conform:[:i | i count == 1]).
-    self assert:(m3 statementInvocationInfo conform:[:i | i hasBeenExecuted not]).
+    self assert:(m3 statementInvocationInfo first hasBeenExecuted).
+    self assert:(m3 statementInvocationInfo second hasBeenExecuted).
+    self assert:(m3 statementInvocationInfo third hasBeenExecuted).
+    self assert:(m3 statementInvocationInfo fourth hasBeenExecuted not).
+
 
     "
      self new test_03_instrumentation
     "
+
+    "Modified: / 12-09-2013 / 16:19:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_04_instrumentation
@@ -165,7 +178,7 @@
 
     self assert:(m4 hasBeenCalled not).
     self assert:(m4 blockInvocationInfo size == 1).
-    self assert:(m4 statementInvocationInfo size == 0).
+    self assert:(m4 statementInvocationInfo size == 2).
     self assert:(m4 blockInvocationInfo conform:[:i | i hasBeenExecuted not]).
     self assert:(m4 statementInvocationInfo conform:[:i | i hasBeenExecuted not]).
 
@@ -179,6 +192,8 @@
     "
      self new test_04_instrumentation
     "
+
+    "Modified: / 12-09-2013 / 16:19:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_05_instrumentation_loop_count
@@ -240,3 +255,4 @@
 version_CVS
     ^ '$Header$'
 ! !
+