Skip to content

Commit 34bfb45

Browse files
authored
Merge branch 'main' into test-execution-listener-adapter-coverage
2 parents 1b8fb48 + 464022d commit 34bfb45

File tree

24 files changed

+80
-38
lines changed

24 files changed

+80
-38
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
persist-credentials: false
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
48+
uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
4949
with:
5050
languages: ${{ matrix.language }}
5151
build-mode: ${{ matrix.build-mode }}
@@ -60,6 +60,6 @@ jobs:
6060
-Dscan.tag.CodeQL \
6161
classes
6262
- name: Perform CodeQL Analysis
63-
uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
63+
uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
6464
with:
6565
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
# Upload the results to GitHub's code scanning dashboard (optional).
5858
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
60+
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
6161
with:
6262
sarif_file: results.sarif

junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* <em>class template</em>.
2828
*
2929
* <p>In contrast to regular test classes, a class template is not directly
30-
* a test class but rather a template for a set of test classes. As such, it is
30+
* a test class but rather a template for a set of test cases. As such, it is
3131
* designed to be invoked multiple times depending on the number of {@linkplain
3232
* org.junit.jupiter.api.extension.ClassTemplateInvocationContext invocation contexts}
3333
* returned by the registered {@linkplain
@@ -46,7 +46,7 @@
4646
*
4747
* <h2>Inheritance</h2>
4848
*
49-
* <p>This annotation is inherited by subclasses.
49+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
5050
*
5151
* @since 5.13
5252
* @see TestTemplate @TestTemplate

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
*
125125
* <h2>Inheritance</h2>
126126
*
127-
* <p>This annotation is inherited by subclasses.
127+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
128128
*
129129
* @since 5.13
130130
* @see Parameter

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*
3434
* <h2>Inheritance</h2>
3535
*
36-
* <p>This annotation is inherited to subclasses.
36+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
3737
*
3838
* @since 5.0
3939
* @see org.junit.jupiter.params.provider.ArgumentsProvider

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
/**
2525
* {@code @ArgumentsSources} is a simple container for one or more
26-
* {@link ArgumentsSource} annotations.
26+
* {@link ArgumentsSource @ArgumentsSource} annotations.
2727
*
2828
* <p>Note, however, that use of the {@code @ArgumentsSources} container is completely
2929
* optional since {@code @ArgumentsSource} is a {@linkplain java.lang.annotation.Repeatable
3030
* repeatable} annotation.
3131
*
3232
* <h2>Inheritance</h2>
3333
*
34-
* <p>This annotation is inherited to subclasses.
34+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
3535
*
3636
* @since 5.0
3737
* @see org.junit.jupiter.params.provider.ArgumentsSource

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
*
7171
* <h2>Inheritance</h2>
7272
*
73-
* <p>This annotation is inherited to subclasses.
73+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
7474
*
7575
* @since 5.0
7676
* @see CsvSource

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSources.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
/**
2525
* {@code @CsvFileSources} is a simple container for one or more
26-
* {@link CsvFileSource} annotations.
26+
* {@link CsvFileSource @CsvFileSource} annotations.
2727
*
2828
* <p>Note, however, that use of the {@code @CsvFileSources} container is completely
2929
* optional since {@code @CsvFileSource} is a {@linkplain java.lang.annotation.Repeatable
3030
* repeatable} annotation.
3131
*
3232
* <h2>Inheritance</h2>
3333
*
34-
* <p>This annotation is inherited to subclasses.
34+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
3535
*
3636
* @since 5.11
3737
* @see CsvFileSource

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
*
7676
* <h2>Inheritance</h2>
7777
*
78-
* <p>This annotation is inherited to subclasses.
78+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
7979
*
8080
* @since 5.0
8181
* @see CsvFileSource

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSources.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
/**
2525
* {@code @CsvSources} is a simple container for one or more
26-
* {@link CsvSource} annotations.
26+
* {@link CsvSource @CsvSource} annotations.
2727
*
2828
* <p>Note, however, that use of the {@code @CsvSources} container is completely
2929
* optional since {@code @CsvSource} is a {@linkplain java.lang.annotation.Repeatable
3030
* repeatable} annotation.
3131
*
3232
* <h2>Inheritance</h2>
3333
*
34-
* <p>This annotation is inherited to subclasses.
34+
* <p>This annotation is {@linkplain Inherited inherited} within class hierarchies.
3535
*
3636
* @since 5.11
3737
* @see CsvSource

0 commit comments

Comments
 (0)