Skip to content
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

Jump to bottom

JUnit 4 -> 5 #5899

Closed
wants to merge 9 commits into from
Closed

JUnit 4 -> 5 #5899

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8714a0a
Remove .jdk8 files. (#5900)
corneil Aug 20, 2024
08ca0dd
Update SCDF so that multipleComposedTaskWithArguments succeeds
cppwfs Aug 13, 2024
6cad8f0
Merge branch 'main-3' into corneil/main3-junit5
corneil Aug 22, 2024
5e7fa1b
Update ci-pr to record failed tests.
corneil Aug 23, 2024
59cee87
Updated missed changes from main-3.
corneil Aug 23, 2024
89f4e6f
Merge branch 'main-3' into corneil/main3-junit5
corneil Aug 23, 2024
b1ac63f
Secrets are not available to PR build.
corneil Aug 23, 2024
788a426
Remove plugin that doesn't have permission to produce integration tests.
corneil Aug 23, 2024
b48ef32
Updated assertj usage.
corneil Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/ci-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ jobs:
with:
java-version: '17'
distribution: 'liberica'
- uses: jvalkeal/setup-maven@v1
with:
maven-version: 3.8.8
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
# secrets not available to PR.
# - name: Login dockerhub
# if: ${{ secrets.DOCKERHUB_USERNAME != null && secrets.DOCKERHUB_USERNAME != '' }}
# uses: docker/login-action@v3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this commented out code?

Expand All @@ -39,14 +36,7 @@ jobs:
# build
- name: Build
run: |
mvn -B -s .github/settings.xml clean install
- name: Capture Test Results
if: failure()
uses: actions/upload-artifact@v3
with:
name: Unit Tests
path: '**/surefire-reports/*.xml'
retention-days: 3
./mvnw -B -s .github/settings.xml -Pasciidoctordocs,restdocs clean install
# clean m2 cache
- name: Clean cache
run: |
Expand Down
1 change: 1 addition & 0 deletions ...test/java/org/springframework/cloud/dataflow/registry/support/AppResourceCommonTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class AppResourceCommonTests {
private AppResourceCommon appResourceCommon = new AppResourceCommon(new MavenProperties(), resourceLoader);

@Test

void badNamedJars() throws Exception {
UrlResource urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/5.0.0/file-sink-rabbit.jar");
assertThatIllegalArgumentException().isThrownBy( () -> appResourceCommon.getUrlResourceVersion(urlResource));
Expand Down
1 change: 1 addition & 0 deletions ...java/org/springframework/cloud/dataflow/server/controller/AppRegistryControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@ void pagination() throws Exception {
}

@Test

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is an artifact. But we can probably remove these blank lines between the @test and the function.

void listApplicationsByVersion() throws Exception {
mockMvc.perform(get("/apps?version=5.0.0").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
Expand Down
Loading