ben-manes / caffeine / #5452

100%

master: 100%

Build Type

push

github

Committed by ben-manes

Commit Message

Fix two TCK regressions from the spec-compliance sweep

1. LoadingCacheProxy.loadAll non-replacing path now routes through
   loadAllAndKeepExisting (the #L fix), which calls the user CacheLoader
   directly and bypasses JCacheLoaderAdapter.loadAll's wrap. TCK
   CacheLoaderTest.shouldPropagateExceptionUsingLoadAll asserts the
   listener sees a CacheLoaderException — 1.1.1 relaxed the spec rule
   but the TCK still enforces. Wrap RuntimeException in the inner catch
   to match CacheProxy.loadAll's convention.

2. EntryIterator.remove() routed through CacheProxy.remove(K, V) which
   records a hit on success. After #K added a hit on each next(),
   iterate+remove double-counted (200 hits for 100 entries). TCK
   CacheMBStatisticsBeanTest.testIterateAndRemove asserts CacheHits ==
   100 after iterating and removing 100 entries. Inline a conditional
   remove that records only the removal (not the hit), matching the
   stats table p.126's split: iterator() Hits=Yes on next, Removals=Yes
   on remove().

Coverage Stats

4011 of 4026 branches covered (99.63%)

19 of 24 new or added lines in 2 files covered. (79.17%)

11 existing lines in 2 files now uncovered.

8243 of 8259 relevant lines covered (99.81%)

1.0 hits per line