Fix filter blocks with shared fields and derived data variables (#2087)

[Vampire]

Fixes #2087

[Vampire]

• Fix filter blocks with shared fields and derived data variables (#2087) #2088 👈 (View in Graphite)
• master

This stack of pull requests is managed by Graphite. Learn more about stacking.

[leonard84]

Is this really correct? What happens if next is filtered? Shouldn't we track whether there is a next? So, moving the next calculation into a computeNext() method that is called by hasNext() or next() if the computedNext value is unset. If it is set then next() will return it and unset it again.

[Vampire]

I'd say it is fine.
It is the same as before.
It works thanks to https://github.com/spockframework/spock/blob/master/spock-core/src/main/java/org/spockframework/runtime/extension/IDataDriver.java#L36-L39.
And we also have tests that skipping the last iteration works. (Because there was then a problem at a different place, i. e. when the data iterators are exhausted.)

[codecov]

Codecov Report

Attention: Patch coverage is 88.00000% with 6 lines in your changes missing coverage. Please review.

Project coverage is 81.92%. Comparing base (792e592) to head (d32c867).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
...rg/spockframework/runtime/DataIteratorFactory.java	88.00%	5 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #2088      +/-   ##
============================================
+ Coverage     81.89%   81.92%   +0.03%     
  Complexity     4687     4687              
============================================
  Files           452      452              
  Lines         14666    14678      +12     
  Branches       1846     1847       +1     
============================================
+ Hits          12010    12025      +15     
  Misses         1972     1972              
+ Partials        684      681       -3     

Files with missing lines	Coverage Δ
...rg/spockframework/compiler/WhereBlockRewriter.java	94.74% <ø> (ø)
...rg/spockframework/runtime/DataIteratorFactory.java	81.77% <88.00%> (+0.54%)	⬆️

... and 3 files with indirect coverage changes