Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests.

Browse Source 
See #167.
This commit is contained in:
Mark Paluch
2021-02-17 14:40:19 +01:00
parent b5a1e8d1c4
commit 5fa6c5f574
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release-tools/src/main/java/org/springframework/data/release/dependency/DependencyUpgradeProposals.java
View File

@@ -184,7 +184,7 @@ public class DependencyUpgradeProposals {
if (expectedUpgradeCount != result.size()) { if (expectedUpgradeCount != result.size()) {
throw new IllegalStateException(String.format( throw new IllegalStateException(String.format(
"The number of expected upgrades (%s) does not match the number of actual upgrades (%s): %n%n%s", "The number of expected upgrades (dependency.upgrade.count=%s) does not match the number of actual upgrades (%s): %n%n%s",
expectedUpgradeCount, result.size(), dependencyVersions.toString(1))); expectedUpgradeCount, result.size(), dependencyVersions.toString(1)));
} }

4
release-tools/src/main/java/org/springframework/data/release/issues/github/GitHubReadIssue.java
View File

@@ -17,6 +17,7 @@ package org.springframework.data.release.issues.github;
import lombok.Value; import lombok.Value;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -54,7 +55,8 @@ class GitHubReadIssue implements Comparable<GitHubReadIssue>, GitHubIssue {
@Override @Override
public List<String> getAssignees() { public List<String> getAssignees() {
return assignees.stream().map(GitHubUser::getName).collect(Collectors.toList()); return assignees == null ? Collections.emptyList()
: assignees.stream().map(GitHubUser::getName).collect(Collectors.toList());
} }
@Override @Override

1
release-tools/src/test/java/org/springframework/data/release/dependency/DependencyUpgradeProposalsUnitTests.java
View File

@@ -37,6 +37,7 @@ class DependencyUpgradeProposalsUnitTests {
Properties properties = new Properties(); Properties properties = new Properties();
properties.put("dependency.train", "Pascal"); properties.put("dependency.train", "Pascal");
properties.put("dependency.iteration", "M1"); properties.put("dependency.iteration", "M1");
properties.put("dependency.upgrade.count", "2");
properties.put("dependency[org.assertj:assertj-core]", "3.18.1"); properties.put("dependency[org.assertj:assertj-core]", "3.18.1");
properties.put("dependency[io.reactivex.rxjava3:rxjava]", "1.2.3"); properties.put("dependency[io.reactivex.rxjava3:rxjava]", "1.2.3");

4
release-tools/src/test/java/org/springframework/data/release/git/CommitUnitTests.java
View File

@@ -35,7 +35,7 @@ class CommitUnitTests {
assertThat( assertThat(
new Commit(new Ticket("1234", "Hello", Mockito.mock(TicketStatus.class)), "Summary", Optional.empty())) new Commit(new Ticket("1234", "Hello", Mockito.mock(TicketStatus.class)), "Summary", Optional.empty()))
.hasToString("1234 - Summary."); .hasToString("Summary.\n" + "\n" + "See 1234");
} }
@Test @Test
@@ -44,6 +44,6 @@ class CommitUnitTests {
assertThat( assertThat(
new Commit(new Ticket("1234", "Hello", Mockito.mock(TicketStatus.class)), "Summary", new Commit(new Ticket("1234", "Hello", Mockito.mock(TicketStatus.class)), "Summary",
Optional.of("detail"))) Optional.of("detail")))
.hasToString("1234 - Summary.\n" + "\n" + "detail"); .hasToString("Summary.\n" + "\n" + "detail\n" + "\n" + "See 1234");
} }
} }

3
release-tools/src/test/java/org/springframework/data/release/issues/github/GitHubIssueTrackerIntegrationTests.java
View File

@@ -157,7 +157,8 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
verify(postRequestedFor(urlPathMatching(ISSUES_URI)) verify(postRequestedFor(urlPathMatching(ISSUES_URI))
.withRequestBody( .withRequestBody(
equalToJson("{\"title\":\"Release 1.8 RC1 (Hopper)\",\"milestone\":45,\"labels\":[ \"type: task\" ]}"))); equalToJson(
"{\"title\":\"Release 1.8 RC1 (Hopper)\",\"milestone\":45,\"labels\":[ \"type: task\" ], \"assignees\" : [ ]}")));
} }
@Test // #5 @Test // #5

2
release-tools/src/test/java/org/springframework/data/release/model/ProjectUnitTests.java
View File

@@ -34,8 +34,6 @@ class ProjectUnitTests {
// Collections.reverse(projects); // Collections.reverse(projects);
// Collections.sort(projects); // Collections.sort(projects);
projects.stream().map(Project::getName).forEach(System.out::println);
assertThat(projects.get(0)).isEqualTo(Projects.BUILD); assertThat(projects.get(0)).isEqualTo(Projects.BUILD);
assertThat(projects.get(1)).isEqualTo(Projects.COMMONS); assertThat(projects.get(1)).isEqualTo(Projects.COMMONS);
} }