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

#155 - Fix calver version bump after conclude.

Browse Source
This commit is contained in:
Mark Paluch
2020-10-29 10:42:31 +01:00
parent 358432ab2a
commit 3ad17c3e83
6 changed files with 75 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java
View File

@@ -16,9 +16,11 @@
package org.springframework.data.release.build;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assumptions.assumeThat;
import static org.junit.Assume.*;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
@@ -91,6 +93,10 @@ class MavenIntegrationTests extends AbstractIntegrationTests {
@Test
void findsSnapshotDependencies() throws Exception {
Pom pom = projection.io().file(workspace.getFile("pom.xml", Projects.BUILD)).read(Pom.class);
File file = workspace.getFile("pom.xml", Projects.BUILD);
assumeThat(file).exists();
Pom pom = projection.io().file(file).read(Pom.class);
}
}

46
src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.release.model.TrainIteration;
/**
* Unit tests for {@link UpdateInformation}.
*
*
* @author Oliver Gierke
* @author Mark Paluch
*/
@@ -74,6 +74,17 @@ class UpdateInformationUnitTests {
assertThat(updateInformation.getProjectVersionToSet(Projects.JPA).toString()).isEqualTo("1.10.0.BUILD-SNAPSHOT");
}
@Test // #155
void calculatesProjectCalverVersionToSetCorrectly() {
TrainIteration ockhamGa = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.GA);
assertThat(UpdateInformation.of(ockhamGa, Phase.CLEANUP).getProjectVersionToSet(Projects.BOM).toString())
.isEqualTo("2020.1.0-SNAPSHOT");
assertThat(UpdateInformation.of(ockhamGa, Phase.MAINTENANCE).getProjectVersionToSet(Projects.BOM).toString())
.isEqualTo("2020.0.1-SNAPSHOT");
}
@Test // #22
void returnsCorrectReleaseTrainVersions() {
@@ -84,4 +95,37 @@ class UpdateInformationUnitTests {
assertThat(UpdateInformation.of(hopperM1, Phase.PREPARE).getReleaseTrainVersion()).isEqualTo("Hopper-M1");
assertThat(UpdateInformation.of(hopperSr1, Phase.PREPARE).getReleaseTrainVersion()).isEqualTo("Hopper-SR1");
}
@Test // #155
void returnsCorrectReleaseTrainCalverVersions() {
TrainIteration ockhamGa = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.GA);
TrainIteration ockhamM1 = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.M1);
TrainIteration ockhamSr1 = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.SR1);
assertThat(UpdateInformation.of(ockhamGa, Phase.PREPARE).getReleaseTrainVersion()).isEqualTo("2020.0.0");
assertThat(UpdateInformation.of(ockhamM1, Phase.PREPARE).getReleaseTrainVersion()).isEqualTo("2020.0.0-M1");
assertThat(UpdateInformation.of(ockhamSr1, Phase.PREPARE).getReleaseTrainVersion()).isEqualTo("2020.0.1");
}
@Test // #155
void returnsCorrectCleanupReleaseTrainCalverVersions() {
TrainIteration ockhamGa = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.GA);
TrainIteration ockhamM1 = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.M1);
TrainIteration ockhamSr1 = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.SR1);
assertThat(UpdateInformation.of(ockhamGa, Phase.CLEANUP).getReleaseTrainVersion()).isEqualTo("2020.1.0-SNAPSHOT");
assertThat(UpdateInformation.of(ockhamM1, Phase.CLEANUP).getReleaseTrainVersion()).isEqualTo("2020.0.0-SNAPSHOT");
assertThat(UpdateInformation.of(ockhamSr1, Phase.CLEANUP).getReleaseTrainVersion()).isEqualTo("2020.0.2-SNAPSHOT");
}
@Test // #155
void returnsCorrectMaintenanceReleaseTrainCalverVersions() {
TrainIteration ockhamGa = new TrainIteration(ReleaseTrains.OCKHAM, Iteration.GA);
assertThat(UpdateInformation.of(ockhamGa, Phase.MAINTENANCE).getReleaseTrainVersion())
.isEqualTo("2020.0.1-SNAPSHOT");
}
}