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

#145 - Polishing.

Browse Source 
Rewrite ticket references in tests from (at)see #nnn to (at)Test // #nnn.
This commit is contained in:
Mark Paluch
2020-04-30 15:07:46 +02:00
parent 1a1e0cd07d
commit 46d4e75a62
8 changed files with 37 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
release-tools/src/test/java/org/springframework/data/release/build/MavenPropertiesUnitTests.java
View File

@@ -38,28 +38,19 @@ class MavenPropertiesUnitTests {
this.properties.setPlugins(Collections.singletonMap("versions", "org.codehaus.mojo:versions-maven-plugin:2.2")); this.properties.setPlugins(Collections.singletonMap("versions", "org.codehaus.mojo:versions-maven-plugin:2.2"));
} }
/** @Test // #8
* @see #8
*/
@Test
void expandsGoalsCorrectly() { void expandsGoalsCorrectly() {
assertThat(properties.getFullyQualifiedPlugin("versions:set")) assertThat(properties.getFullyQualifiedPlugin("versions:set"))
.isEqualTo("org.codehaus.mojo:versions-maven-plugin:2.2:set"); .isEqualTo("org.codehaus.mojo:versions-maven-plugin:2.2:set");
} }
/** @Test // #8
* @see #8
*/
@Test
void doesNotExpandGoalStartingWithDash() { void doesNotExpandGoalStartingWithDash() {
assertThat(properties.getFullyQualifiedPlugin("-versions:set")).isEqualTo("-versions:set"); assertThat(properties.getFullyQualifiedPlugin("-versions:set")).isEqualTo("-versions:set");
} }
/** @Test // #8
* @see #8
*/
@Test
void doesNotExpandGoalWithoutColon() { void doesNotExpandGoalWithoutColon() {
assertThat(properties.getFullyQualifiedPlugin("versions-set")).isEqualTo("versions-set"); assertThat(properties.getFullyQualifiedPlugin("versions-set")).isEqualTo("versions-set");
} }

5
release-tools/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
View File

@@ -74,10 +74,7 @@ class UpdateInformationUnitTests {
assertThat(updateInformation.getProjectVersionToSet(Projects.JPA).toString()).isEqualTo("1.10.0.BUILD-SNAPSHOT"); assertThat(updateInformation.getProjectVersionToSet(Projects.JPA).toString()).isEqualTo("1.10.0.BUILD-SNAPSHOT");
} }
/** @Test // #22
* @see #22
*/
@Test
void returnsCorrectReleaseTrainVersions() { void returnsCorrectReleaseTrainVersions() {
TrainIteration hopperGa = new TrainIteration(ReleaseTrains.HOPPER, Iteration.GA); TrainIteration hopperGa = new TrainIteration(ReleaseTrains.HOPPER, Iteration.GA);

10
release-tools/src/test/java/org/springframework/data/release/git/BackportTargetsUnitTests.java
View File

@@ -38,10 +38,7 @@ class BackportTargetsUnitTests {
Branch goslingBranch = getBranch(ReleaseTrains.GOSLING); Branch goslingBranch = getBranch(ReleaseTrains.GOSLING);
Branch fowlerBranch = getBranch(ReleaseTrains.FOWLER); Branch fowlerBranch = getBranch(ReleaseTrains.FOWLER);
/** @Test // #11
* @see #11
*/
@Test
void returnsModuleBranchesForTrains() { void returnsModuleBranchesForTrains() {
TrainIteration iteration = new TrainIteration(ReleaseTrains.HOPPER, Iteration.M1); TrainIteration iteration = new TrainIteration(ReleaseTrains.HOPPER, Iteration.M1);
@@ -53,10 +50,7 @@ class BackportTargetsUnitTests {
assertThat(targets).contains(goslingBranch, fowlerBranch); assertThat(targets).contains(goslingBranch, fowlerBranch);
} }
/** @Test // #11
* @see #11
*/
@Test
void includesMasterBranchForServiceReleaseSource() { void includesMasterBranchForServiceReleaseSource() {
TrainIteration iteration = new TrainIteration(ReleaseTrains.GOSLING, Iteration.SR2); TrainIteration iteration = new TrainIteration(ReleaseTrains.GOSLING, Iteration.SR2);

5
release-tools/src/test/java/org/springframework/data/release/git/BranchUnitTests.java
View File

@@ -44,10 +44,7 @@ class BranchUnitTests {
assertThat(Branch.from(iterationVersion).toString()).isEqualTo("1.4.x"); assertThat(Branch.from(iterationVersion).toString()).isEqualTo("1.4.x");
} }
/** @Test // #2
* @see #2
*/
@Test
void detectsIssueBranches() { void detectsIssueBranches() {
Branch branch = Branch.from("issue/DATACMNS-4711"); Branch branch = Branch.from("issue/DATACMNS-4711");

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

@@ -71,10 +71,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
github.reset(); github.reset();
} }
/** @Test // #5
* @see #5
*/
@Test
void findTicketsByTicketIds() { void findTicketsByTicketIds() {
mockGetIssueWith("issue.json", 233); mockGetIssueWith("issue.json", 233);
@@ -83,30 +80,21 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
assertThat(tickets).hasSize(1); assertThat(tickets).hasSize(1);
} }
/** @Test // #5
* @see #5
*/
@Test
void ignoresUnknownTicketsByTicketId() { void ignoresUnknownTicketsByTicketId() {
Collection<Ticket> tickets = github.findTickets(Projects.BUILD, Collections.singletonList("123")); Collection<Ticket> tickets = github.findTickets(Projects.BUILD, Collections.singletonList("123"));
assertThat(tickets).hasSize(0); assertThat(tickets).hasSize(0);
} }
/** @Test // #5
* @see #5
*/
@Test
void emptyResultWithEmptyTicketIds() { void emptyResultWithEmptyTicketIds() {
Collection<Ticket> tickets = github.findTickets(Projects.COMMONS, Collections.emptyList()); Collection<Ticket> tickets = github.findTickets(Projects.COMMONS, Collections.emptyList());
assertThat(tickets).hasSize(0); assertThat(tickets).hasSize(0);
} }
/** @Test // #5
* @see #5
*/
@Test
void getReleaseTicketForReturnsTheReleaseTicket() { void getReleaseTicketForReturnsTheReleaseTicket() {
mockGetMilestonesWith("milestones.json"); mockGetMilestonesWith("milestones.json");
@@ -116,10 +104,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
assertThat(releaseTicket.getId()).isEqualTo("#233"); assertThat(releaseTicket.getId()).isEqualTo("#233");
} }
/** @Test // #5
* @see #5
*/
@Test
void noReleaseTicketFound() { void noReleaseTicketFound() {
mockGetMilestonesWith("emptyMilestones.json"); mockGetMilestonesWith("emptyMilestones.json");
@@ -128,10 +113,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
.withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1!"); .withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1!");
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseVersionShouldCreateAVersion() { void createReleaseVersionShouldCreateAVersion() {
mockGetMilestonesWith("emptyMilestones.json"); mockGetMilestonesWith("emptyMilestones.json");
@@ -143,10 +125,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
.withRequestBody(equalToJson("{\"title\":\"1.8 RC1 (Hopper)\", \"description\":\"Hopper RC1\"}"))); .withRequestBody(equalToJson("{\"title\":\"1.8 RC1 (Hopper)\", \"description\":\"Hopper RC1\"}")));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseVersionShouldFindExistingReleaseVersion() { void createReleaseVersionShouldFindExistingReleaseVersion() {
mockGetMilestonesWith("milestones.json"); mockGetMilestonesWith("milestones.json");
@@ -156,10 +135,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
verify(0, postRequestedFor(urlPathMatching(MILESTONES_URI))); verify(0, postRequestedFor(urlPathMatching(MILESTONES_URI)));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldCreateReleaseTicket() { void createReleaseTicketShouldCreateReleaseTicket() {
mockGetMilestonesWith("milestones.json"); mockGetMilestonesWith("milestones.json");
@@ -172,10 +148,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
.withRequestBody(equalToJson("{\"title\":\"Release 1.8 RC1 (Hopper)\",\"milestone\":45}"))); .withRequestBody(equalToJson("{\"title\":\"Release 1.8 RC1 (Hopper)\",\"milestone\":45}")));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldFailWithNoReleaseVersion() { void createReleaseTicketShouldFailWithNoReleaseVersion() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.BUILD, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.BUILD, Iteration.RC1);
@@ -187,10 +160,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
.withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1!"); .withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1!");
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldFindExistingTicket() { void createReleaseTicketShouldFindExistingTicket() {
mockGetMilestonesWith("milestones.json"); mockGetMilestonesWith("milestones.json");
@@ -201,10 +171,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
verify(0, postRequestedFor(urlPathMatching(MILESTONES_URI))); verify(0, postRequestedFor(urlPathMatching(MILESTONES_URI)));
} }
/** @Test // #55
* @see #55
*/
@Test
void assignTicketToMe() { void assignTicketToMe() {
mockGetMilestonesWith("milestones.json"); mockGetMilestonesWith("milestones.json");
@@ -219,10 +186,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
.withRequestBody(equalToJson("{\"assignees\":[\"dummy\"]}"))); .withRequestBody(equalToJson("{\"assignees\":[\"dummy\"]}")));
} }
/** @Test // #94
* @see #94
*/
@Test
void closeIterationShouldResolveReleaseTicket() { void closeIterationShouldResolveReleaseTicket() {
mockGetMilestonesWith("milestones.json"); mockGetMilestonesWith("milestones.json");

15
release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraComponentsUnitTests.java
View File

@@ -28,10 +28,7 @@ import org.junit.jupiter.api.Test;
*/ */
class JiraComponentsUnitTests { class JiraComponentsUnitTests {
/** @Test // #5
* @see #5
*/
@Test
void returnsComponentByName() { void returnsComponentByName() {
JiraComponent fooComponent = new JiraComponent("123", "foo"); JiraComponent fooComponent = new JiraComponent("123", "foo");
@@ -40,10 +37,7 @@ class JiraComponentsUnitTests {
assertThat(jiraComponents.findComponent("foo").isPresent()).isTrue(); assertThat(jiraComponents.findComponent("foo").isPresent()).isTrue();
} }
/** @Test // #5
* @see #5
*/
@Test
void returnsEmptyIfComponentMissing() { void returnsEmptyIfComponentMissing() {
JiraComponent fooComponent = new JiraComponent("123", "foo"); JiraComponent fooComponent = new JiraComponent("123", "foo");
@@ -52,10 +46,7 @@ class JiraComponentsUnitTests {
assertThat(jiraComponents.findComponent("baz").isPresent()).isFalse(); assertThat(jiraComponents.findComponent("baz").isPresent()).isFalse();
} }
/** @Test // #5
* @see #5
*/
@Test
void failsOnNullArgumentConstruction() { void failsOnNullArgumentConstruction() {
assertThatIllegalArgumentException().isThrownBy(() -> JiraComponents.of(null)); assertThatIllegalArgumentException().isThrownBy(() -> JiraComponents.of(null));
} }

70
release-tools/src/test/java/org/springframework/data/release/issues/jira/JiraConnectorIntegrationTests.java
View File

@@ -76,10 +76,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
jira.reset(); jira.reset();
} }
/** @Test // #5
* @see #5
*/
@Test
void findResolvedTicketsByTicketIds() { void findResolvedTicketsByTicketIds() {
mockSearchWith("DATAREDIS-1andDATAJPA-1.json"); mockSearchWith("DATAREDIS-1andDATAJPA-1.json");
@@ -88,10 +85,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
assertThat(tickets).hasSize(2); assertThat(tickets).hasSize(2);
} }
/** @Test // #5
* @see #5
*/
@Test
void ignoresUnknownTicketsByTicketId() { void ignoresUnknownTicketsByTicketId() {
mockSearchWith("emptyTickets.json"); mockSearchWith("emptyTickets.json");
@@ -100,20 +94,14 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
assertThat(tickets).hasSize(0); assertThat(tickets).hasSize(0);
} }
/** @Test // #5
* @see #5
*/
@Test
void emptyResultWithEmptyTicketIds() { void emptyResultWithEmptyTicketIds() {
Collection<Ticket> tickets = jira.findTickets(Projects.COMMONS, Arrays.asList()); Collection<Ticket> tickets = jira.findTickets(Projects.COMMONS, Arrays.asList());
assertThat(tickets).hasSize(0); assertThat(tickets).hasSize(0);
} }
/** @Test // #5
* @see #5
*/
@Test
void getReleaseTicketForReturnsTheReleaseTicket() { void getReleaseTicketForReturnsTheReleaseTicket() {
mockSearchWith("releaseTickets.json"); mockSearchWith("releaseTickets.json");
@@ -122,10 +110,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
assertThat(releaseTicket.getId()).isEqualTo("DATAREST-782"); assertThat(releaseTicket.getId()).isEqualTo("DATAREST-782");
} }
/** @Test // #5
* @see #5
*/
@Test
void noReleaseTicketFound() { void noReleaseTicketFound() {
mockSearchWith("emptyTickets.json"); mockSearchWith("emptyTickets.json");
@@ -134,10 +119,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
.withMessageContaining("Did not find a release ticket for Spring Data REST 2.5 RC1"); .withMessageContaining("Did not find a release ticket for Spring Data REST 2.5 RC1");
} }
/** @Test // #5
* @see #5
*/
@Test
void getReleaseVersion() { void getReleaseVersion() {
mockGetProjectVersionsWith("releaseVersions.json", REST_HOPPER_RC1.getProjectKey()); mockGetProjectVersionsWith("releaseVersions.json", REST_HOPPER_RC1.getProjectKey());
@@ -148,10 +130,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
assertThat(optional.get().getName()).isEqualTo("2.5 RC1 (Hopper)"); assertThat(optional.get().getName()).isEqualTo("2.5 RC1 (Hopper)");
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseVersionShouldCreateAVersion() { void createReleaseVersionShouldCreateAVersion() {
mockGetProjectVersionsWith("emptyReleaseVersions.json", REST_HOPPER_RC1.getProjectKey()); mockGetProjectVersionsWith("emptyReleaseVersions.json", REST_HOPPER_RC1.getProjectKey());
@@ -163,10 +142,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
"{\"name\":\"2.5 RC1 (Hopper)\",\"project\":\"DATAREST\",\"description\":\"Hopper RC1\", \"released\":false, \"archived\":false}"))); "{\"name\":\"2.5 RC1 (Hopper)\",\"project\":\"DATAREST\",\"description\":\"Hopper RC1\", \"released\":false, \"archived\":false}")));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseVersionShouldFindExistingReleaseVersion() { void createReleaseVersionShouldFindExistingReleaseVersion() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -178,10 +154,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
verify(0, postRequestedFor(urlPathMatching(CREATE_VERSION_URI))); verify(0, postRequestedFor(urlPathMatching(CREATE_VERSION_URI)));
} }
/** @Test // #56
* @see #56
*/
@Test
void archiveReleaseVersionShouldArchiveReleaseVersion() { void archiveReleaseVersionShouldArchiveReleaseVersion() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -197,10 +170,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
+ "\"description\":\"Hopper RC1\", \"released\":true,\"archived\":true}"))); + "\"description\":\"Hopper RC1\", \"released\":true,\"archived\":true}")));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldCreateReleaseTicket() { void createReleaseTicketShouldCreateReleaseTicket() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -219,10 +189,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
+ "\"components\":[{\"name\":\"Infrastructure\"}]}}"))); + "\"components\":[{\"name\":\"Infrastructure\"}]}}")));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldCreateReleaseTicketWithoutComponent() { void createReleaseTicketShouldCreateReleaseTicketWithoutComponent() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -240,10 +207,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
+ "\"fixVersions\":[{\"name\":\"2.5 RC1 (Hopper)\"}]}}"))); + "\"fixVersions\":[{\"name\":\"2.5 RC1 (Hopper)\"}]}}")));
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldFailWithNoReleaseVersion() { void createReleaseTicketShouldFailWithNoReleaseVersion() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -255,10 +219,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
.withMessageContaining("Did not find a release version for Spring Data REST 2.5 RC1"); .withMessageContaining("Did not find a release version for Spring Data REST 2.5 RC1");
} }
/** @Test // #5
* @see #5
*/
@Test
void createReleaseTicketShouldFindExistingTicket() { void createReleaseTicketShouldFindExistingTicket() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);
@@ -309,10 +270,7 @@ class JiraConnectorIntegrationTests extends AbstractIntegrationTests {
verify(0, postRequestedFor(urlPathMatching("/rest/api/2/issue/DATACASS-302"))); verify(0, postRequestedFor(urlPathMatching("/rest/api/2/issue/DATACASS-302")));
} }
/** @Test // #94
* @see #94
*/
@Test
void closeIterationShouldResolveReleaseTicket() { void closeIterationShouldResolveReleaseTicket() {
ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1); ModuleIteration moduleIteration = ReleaseTrains.HOPPER.getModuleIteration(Projects.REST, Iteration.RC1);

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

@@ -40,10 +40,7 @@ class ProjectUnitTests {
assertThat(projects.get(1)).isEqualTo(Projects.COMMONS); assertThat(projects.get(1)).isEqualTo(Projects.COMMONS);
} }
/** @Test // #28
* @see #28
*/
@Test
void findsProjectByKey() { void findsProjectByKey() {
assertThat(Projects.requiredByName("DATACMNS")).isEqualTo(Projects.COMMONS); assertThat(Projects.requiredByName("DATACMNS")).isEqualTo(Projects.COMMONS);
} }