Skip to content

Fix test compilation on main: remove duplicate testAvailableAfterEmptyBlock - #149

Merged
yawkat merged 1 commit into
mainfrom
fix/ghsa-merge-conflicts
Sep 25, 2026
Merged

yawkat merged 1 commit into
mainfrom
fix/ghsa-merge-conflicts

Conversation

@yawkat

@yawkat yawkat commented Sep 25, 2026

Copy link
Copy Markdown
Owner

main currently fails to compile its tests, and the "Run tests" workflow has been failing since c8ebf97:

LZ4BlockStreamingTest.java:[607,15] method testAvailableAfterEmptyBlock() is already defined in class LZ4BlockStreamingTest

#129 and c8ebf97 each added a testAvailableAfterEmptyBlock test, and both check that available() is 0 after the terminating empty block. This PR keeps the copy from #129, which covers both stopOnEmptyBlock settings, and removes the later one.

There are no other conflicts between these merges. LZ4BlockInputStream resets o = 0 only once in the empty-block branch, and the full suite passes:

./mvnw -B test   (JDK 7 toolchain, target 1.7)
Tests run: 3891, Failures: 0, Errors: 0, Skipped: 52

🤖 Generated with Claude Code

#129 and c8ebf97 both added a testAvailableAfterEmptyBlock method to
LZ4BlockStreamingTest, so the test sources no longer compile. Keep the
one from #129; both check the same behaviour.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@yawkat
yawkat enabled auto-merge (squash) September 25, 2026 18:05
@yawkat
yawkat disabled auto-merge September 25, 2026 18:07
@yawkat
yawkat merged commit 4af910b into main Sep 25, 2026
3 checks passed
@yawkat
yawkat deleted the fix/ghsa-merge-conflicts branch September 25, 2026 18:07
@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.76%. Comparing base (2acc0ec) to head (c446f2d).
⚠️ Report is 3 commits behind head on main.
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #149      +/-   ##
============================================
+ Coverage     79.14%   79.76%   +0.61%     
- Complexity      555      562       +7     
============================================
  Files            42       42              
  Lines          1841     1838       -3     
  Branches        251      247       -4     
============================================
+ Hits           1457     1466       +9     
+ Misses          247      239       -8     
+ Partials        137      133       -4     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants