FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix CompletionStageSubscriber race condition, add jcstress tests and CI coverage gate by andimarek · Pull Request #4296 · graphql-java/graphql-java · GitHub

/ graphql-java Public

Fix CompletionStageSubscriber race condition, add jcstress tests and CI coverage gate #4296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andimarek merged 10 commits into from
Mar 6, 2026
Conversation 1 Commits 10 Checks 12 Files changed
Merged

Fix CompletionStageSubscriber race condition, add jcstress tests and CI coverage gate #4296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cdc892a
Fix race condition in CompletionStageSubscriber.onComplete()
andimarek Mar 6, 2026
7f0bcae
Add jcstress stress tests and CI integration
andimarek Mar 6, 2026
9132b0b
Fix jcstress CI: create build dir before tee
andimarek Mar 6, 2026
4936a15
Fix flaky optional_spec111 TCK multicast test
andimarek Mar 6, 2026
1e316ed
Verify exact set of TestNG TCK skipped tests after each run
andimarek Mar 6, 2026
069d64a
Fix coverage gate to check per-class regressions, not just overall
andimarek Mar 6, 2026
ac6274f
Fix coverage gate false positives and add missing tests
andimarek Mar 6, 2026
460d365
Rename test-summary check to Test Report & Per-Class Coverage Gate
andimarek Mar 6, 2026
1405d45
Exclude identity equals/hashCode from JaCoCo coverage via bytecode an…
andimarek Mar 6, 2026
099b330
Bump Java toolchain from 21 to 25 to match CI
andimarek Mar 6, 2026
File filter

Filter by extension

Filter by extension .gradle  (1) .groovy  (1) .java  (6) .yml  (2) All 4 file types selected
Only manifest files
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
40 changes: 35 additions & 5 deletions .github/workflows/master.yml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
- gradle-argument: 'test -x testWithJava11 -x testWithJava17 -x testWithJava21 testng jacocoTestReport'
label: 'java25'
test-results-dirs: 'test testng'
- gradle-argument: 'jcstress'
label: 'jcstress'
steps:
- uses: actions/checkout@v6
- uses: gradle/actions/wrapper-validation@v5
Expand All @@ -36,10 +38,17 @@ jobs:
java-version: '25'
distribution: 'corretto'
- name: build and test
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
run: |
if [ "${{ matrix.label }}" = "jcstress" ]; then
set -o pipefail
mkdir -p build
./gradlew ${{matrix.gradle-argument}} --info --stacktrace 2>&1 | tee build/jcstress-output.txt
else
./gradlew ${{matrix.gradle-argument}} --info --stacktrace
fi
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v2.23.0
if: always() && matrix.label != 'check'
if: always() && matrix.label != 'check' && matrix.label != 'jcstress'
with:
files: |
**/build/test-results/*/TEST-*.xml
Expand All @@ -51,7 +60,7 @@ jobs:
path: build/reports/jacoco/test/jacocoTestReport.xml
retention-days: 1
- name: Parse Test Results
if: always() && matrix.label != 'check'
if: always() && matrix.label != 'check' && matrix.label != 'jcstress'
run: |
total=0; failures=0; errors=0; skipped=0
for dir_name in ${{ matrix.test-results-dirs }}; do
Expand All @@ -72,6 +81,24 @@ jobs:
mkdir -p /tmp/test-stats
echo "{\"total\":$total,\"passed\":$passed,\"failed\":$failures,\"errors\":$errors,\"skipped\":$skipped}" \
> "/tmp/test-stats/${{ matrix.label }}.json"
- name: Parse jcstress Results
if: always() && matrix.label == 'jcstress'
run: |
total=0; passed=0; failed=0; errors=0; skipped=0
if [ -f build/jcstress-output.txt ]; then
line=$(grep 'Results:.*planned.*passed.*failed' build/jcstress-output.txt | tail -1)
if [ -n "$line" ]; then
total=$(echo "$line" | sed 's/.*Results: \([0-9]*\) planned.*/\1/')
passed=$(echo "$line" | sed 's/.*; \([0-9]*\) passed.*/\1/')
failed=$(echo "$line" | sed 's/.*passed, \([0-9]*\) failed.*/\1/')
soft=$(echo "$line" | sed 's/.*failed, \([0-9]*\) soft.*/\1/')
hard=$(echo "$line" | sed 's/.*soft errs, \([0-9]*\) hard.*/\1/')
errors=$((soft + hard))
fi
fi
mkdir -p /tmp/test-stats
echo "{\"total\":$total,\"passed\":$passed,\"failed\":$failed,\"errors\":$errors,\"skipped\":$skipped}" \
> "/tmp/test-stats/${{ matrix.label }}.json"
- name: Upload Test Stats
if: always() && matrix.label != 'check'
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -102,7 +129,7 @@ jobs:
const fs = require('fs');
const path = require('path');

const versions = ['java11', 'java17', 'java21', 'java25'];
const versions = ['java11', 'java17', 'java21', 'java25', 'jcstress'];
const zeroTest = { total: 0, passed: 0, failed: 0, errors: 0, skipped: 0 };
const zeroCov = { covered: 0, missed: 0 };

Expand Down Expand Up @@ -160,7 +187,10 @@ jobs:
else if (cntMatch[1] === 'BRANCH') counters.branch = entry;
else if (cntMatch[1] === 'METHOD') counters.method = entry;
}
coverage.classes[className] = counters;
// Skip classes with 0 total lines (interfaces, annotations, abstract classes)
if (counters.line.covered + counters.line.missed > 0) {
coverage.classes[className] = counters;
}
}
}
}
Expand Down
74 changes: 53 additions & 21 deletions .github/workflows/pull_request.yml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
- gradle-argument: 'test -x testWithJava11 -x testWithJava17 -x testWithJava21 testng jacocoTestReport'
label: 'java25'
test-results-dirs: 'test testng'
- gradle-argument: 'jcstress'
label: 'jcstress'
steps:
- uses: actions/checkout@v6
- uses: gradle/actions/wrapper-validation@v5
Expand All @@ -45,7 +47,14 @@ jobs:
java-version: '25'
distribution: 'corretto'
- name: build and test
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
run: |
if [ "${{ matrix.label }}" = "jcstress" ]; then
set -o pipefail
mkdir -p build
./gradlew ${{matrix.gradle-argument}} --info --stacktrace 2>&1 | tee build/jcstress-output.txt
else
./gradlew ${{matrix.gradle-argument}} --info --stacktrace
fi
- name: Upload Coverage HTML Report
uses: actions/upload-artifact@v4
if: always() && matrix.label == 'java25'
Expand All @@ -61,7 +70,7 @@ jobs:
path: build/reports/jacoco/test/jacocoTestReport.xml
retention-days: 1
- name: Parse Test Results
if: always() && matrix.label != 'check'
if: always() && matrix.label != 'check' && matrix.label != 'jcstress'
run: |
total=0; failures=0; errors=0; skipped=0
for dir_name in ${{ matrix.test-results-dirs }}; do
Expand All @@ -82,13 +91,32 @@ jobs:
mkdir -p /tmp/test-stats
echo "{\"total\":$total,\"passed\":$passed,\"failed\":$failures,\"errors\":$errors,\"skipped\":$skipped}" \
> "/tmp/test-stats/${{ matrix.label }}.json"
- name: Parse jcstress Results
if: always() && matrix.label == 'jcstress'
run: |
total=0; passed=0; failed=0; errors=0; skipped=0
if [ -f build/jcstress-output.txt ]; then
line=$(grep 'Results:.*planned.*passed.*failed' build/jcstress-output.txt | tail -1)
if [ -n "$line" ]; then
total=$(echo "$line" | sed 's/.*Results: \([0-9]*\) planned.*/\1/')
passed=$(echo "$line" | sed 's/.*; \([0-9]*\) passed.*/\1/')
failed=$(echo "$line" | sed 's/.*passed, \([0-9]*\) failed.*/\1/')
soft=$(echo "$line" | sed 's/.*failed, \([0-9]*\) soft.*/\1/')
hard=$(echo "$line" | sed 's/.*soft errs, \([0-9]*\) hard.*/\1/')
errors=$((soft + hard))
fi
fi
mkdir -p /tmp/test-stats
echo "{\"total\":$total,\"passed\":$passed,\"failed\":$failed,\"errors\":$errors,\"skipped\":$skipped}" \
> "/tmp/test-stats/${{ matrix.label }}.json"
- name: Upload Test Stats
if: always() && matrix.label != 'check'
uses: actions/upload-artifact@v4
with:
name: test-stats-${{ matrix.label }}
path: /tmp/test-stats/${{ matrix.label }}.json
test-summary:
name: "Test Report & Per-Class Coverage Gate"
needs: buildAndTest
if: always() && github.event_name == 'pull_request'
runs-on: ubuntu-latest
Expand All @@ -106,14 +134,14 @@ jobs:
with:
name: coverage-report
path: coverage/
- name: Generate Unified Test Report Comment
- name: Post Test Report and Enforce Per-Class Coverage Gate
uses: actions/github-script@v7
with:
script: |
const fs = require('fs');
const path = require('path');

const versions = ['java11', 'java17', 'java21', 'java25'];
const versions = ['java11', 'java17', 'java21', 'java25', 'jcstress'];
const zeroTest = { total: 0, passed: 0, failed: 0, errors: 0, skipped: 0 };
const zeroCov = { covered: 0, missed: 0 };

Expand Down Expand Up @@ -270,6 +298,9 @@ jobs:
// --- Per-class coverage deltas ---
const changedClasses = [];
for (const [cls, curr] of Object.entries(classCounters)) {
// Skip classes with 0 total lines (interfaces, annotations, abstract classes)
const totalLines = curr.line.covered + curr.line.missed;
if (totalLines === 0) continue;
const base = baseClasses[cls] || { line: zeroCov, branch: zeroCov, method: zeroCov };
const currLinePct = pct(curr.line.covered, curr.line.missed);
const baseLinePct = pct(base.line.covered, base.line.missed);
Expand All @@ -290,6 +321,9 @@ jobs:
}
// Also detect classes removed (in baseline but not in current)
for (const cls of Object.keys(baseClasses)) {
// Skip baseline classes with 0 total lines (interfaces, annotations)
const baseTotalLines = baseClasses[cls].line.covered + baseClasses[cls].line.missed;
if (baseTotalLines === 0) continue;
if (!classCounters[cls]) {
changedClasses.push({
name: cls,
Expand Down Expand Up @@ -364,25 +398,23 @@ jobs:
});
}

// --- Coverage gate: fail if any metric drops ---
if (covLine || covBranch || covMethod) {
const drops = [];
for (const { name, curr, baseKey } of [
{ name: 'Line', curr: covLine, baseKey: 'line' },
{ name: 'Branch', curr: covBranch, baseKey: 'branch' },
{ name: 'Method', curr: covMethod, baseKey: 'method' },
]) {
if (!curr) continue;
const b = baseCov[baseKey] || zeroCov;
const currPct = pct(curr.covered, curr.missed);
const basePct = pct(b.covered, b.missed);
// --- Coverage gate: fail if any class regresses on any metric ---
const regressions = [];
for (const [cls, curr] of Object.entries(classCounters)) {
// Skip classes with 0 total lines (interfaces, annotations, abstract classes)
const totalLines = curr.line.covered + curr.line.missed;
if (totalLines === 0) continue;
const base = baseClasses[cls] || { line: zeroCov, branch: zeroCov, method: zeroCov };
for (const [metric, key] of [['Line', 'line'], ['Branch', 'branch'], ['Method', 'method']]) {
const currPct = pct(curr[key].covered, curr[key].missed);
const basePct = pct(base[key].covered, base[key].missed);
if (currPct < basePct - 0.05) {
drops.push(`${name}: ${currPct.toFixed(1)}% (was ${basePct.toFixed(1)}%, delta ${(currPct - basePct).toFixed(1)}%)`);
regressions.push(` ${cls} ${metric}: ${currPct.toFixed(1)}% (was ${basePct.toFixed(1)}%, delta ${(currPct - basePct).toFixed(1)}%)`);
}
}
if (drops.length > 0) {
core.setFailed(`Coverage decreased:\n${drops.join('\n')}`);
}
}
if (regressions.length > 0) {
core.setFailed(`Per-class coverage regressions detected:\n${regressions.join('\n')}\n\nUpdate test-baseline.json if these changes are intentional.`);
}
javadoc:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -411,7 +443,7 @@ jobs:
exit 1
fi
if [ "${{ needs.test-summary.result }}" != "success" ] && [ "${{ needs.test-summary.result }}" != "skipped" ]; then
echo "test-summary failed with result: ${{ needs.test-summary.result }}"
echo "Test Report & Per-Class Coverage Gate failed with result: ${{ needs.test-summary.result }}"
exit 1
fi
if [ "${{ needs.javadoc.result }}" != "success" ]; then
Expand Down
Loading
Loading
Back | FazBrowse Home | New Git URL