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

#151 - Adapt project metadata update to new Sagan API.

Browse Source
This commit is contained in:
Mark Paluch
2020-10-15 08:20:29 +02:00
parent 4f91059766
commit 6ddafa3a12
16 changed files with 223 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,6 @@ class MavenIntegrationTests extends AbstractIntegrationTests {
@Test
void findsSnapshotDependencies() throws Exception {
Pom pom = projection.io().file(workspace.getFile("bom/pom.xml", Projects.BUILD)).read(Pom.class);
Pom pom = projection.io().file(workspace.getFile("pom.xml", Projects.BUILD)).read(Pom.class);
}
}

17
src/test/java/org/springframework/data/release/issues/github/GitHubIssueTrackerIntegrationTests.java
View File

@@ -105,14 +105,25 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
}
@Test // #5
void noReleaseTicketFound() {
void noMilestoneNoReleaseTicketFound() {
mockGetMilestonesWith("emptyMilestones.json");
assertThatIllegalArgumentException().isThrownBy(() -> github.getReleaseTicketFor(BUILD_HOPPER_RC1))
assertThatIllegalStateException().isThrownBy(() -> github.getReleaseTicketFor(BUILD_HOPPER_RC1))
.withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1 (Hopper)!");
}
@Test // #5
void noReleaseTicketFound() {
mockGetMilestonesWith("milestones.json");
mockGetIssuesWith("emptyIssues.json");
assertThatIllegalArgumentException().isThrownBy(() -> github.getReleaseTicketFor(BUILD_HOPPER_RC1))
.withMessageContaining(
"Did not find a release ticket for Spring Data Build 1.8 RC1 (Hopper) containing Release 1.8 RC1 (Hopper)!");
}
@Test // #5
void createReleaseVersionShouldCreateAVersion() {
@@ -156,7 +167,7 @@ class GitHubIssueTrackerIntegrationTests extends AbstractIntegrationTests {
mockGetIssuesWith("emptyIssues.json");
mockGetMilestonesWith("emptyMilestones.json");
assertThatIllegalArgumentException().isThrownBy(() -> github.createReleaseTicket(moduleIteration))
assertThatIllegalStateException().isThrownBy(() -> github.createReleaseTicket(moduleIteration))
.withMessageContaining("No milestone for Spring Data Build found containing 1.8 RC1 (Hopper)!");
}

6
src/test/java/org/springframework/data/release/sagan/MaintainedVersionUnitTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.data.release.model.ReleaseTrains;
/**
* Unit tests for {@link MaintainedVersion}.
*
*
* @author Oliver Gierke
*/
class MaintainedVersionUnitTests {
@@ -33,9 +33,9 @@ class MaintainedVersionUnitTests {
void newerVersionIsOrderedFirst() {
MaintainedVersion ingalls = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("1.13.0.RELEASE"),
ReleaseTrains.INGALLS);
ReleaseTrains.INGALLS, null, null);
MaintainedVersion hopper = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("1.12.0.RELEASE"),
ReleaseTrains.HOPPER);
ReleaseTrains.HOPPER, null, null);
assertThat(ingalls.compareTo(hopper)).isGreaterThan(0);
}

6
src/test/java/org/springframework/data/release/sagan/MaintainedVersionsUnitTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.data.release.model.ReleaseTrains;
/**
* Unit tests for {@link MaintainedVersions}.
*
*
* @author Oliver Gierke
*/
class MaintainedVersionsUnitTests {
@@ -33,9 +33,9 @@ class MaintainedVersionsUnitTests {
void considersMostRecentReleaseVersionTheMainOne() {
MaintainedVersion ingalls = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("1.13.0.RELEASE"),
ReleaseTrains.INGALLS);
ReleaseTrains.INGALLS, null, null);
MaintainedVersion hopper = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("1.12.0.RELEASE"),
ReleaseTrains.HOPPER);
ReleaseTrains.HOPPER, null, null);
MaintainedVersions versions = MaintainedVersions.of(ingalls, hopper);

12
src/test/java/org/springframework/data/release/sagan/ProjectMetadataSerializationTests.java
View File

@@ -25,8 +25,9 @@ import com.fasterxml.jackson.databind.ObjectWriter;
/**
* Tests for serialization of {@link ProjectMetadata}.
*
*
* @author Oliver Gierke
* @author Mark Paluch
*/
class ProjectMetadataSerializationTests {
@@ -35,14 +36,15 @@ class ProjectMetadataSerializationTests {
ObjectWriter mapper = new ObjectMapper().writerWithDefaultPrettyPrinter();
MaintainedVersion kay = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("2.0.0.RC1"), ReleaseTrains.KAY);
MaintainedVersion kay = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("2.0.0.RC1"), ReleaseTrains.KAY,
null, null);
MaintainedVersion ingalls = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("1.13.5.RELEASE"),
ReleaseTrains.INGALLS);
ReleaseTrains.INGALLS, null, null);
MaintainedVersion ingallsSnapshot = ingalls.nextDevelopmentVersion();
MaintainedVersion hopper = MaintainedVersion.of(Projects.COMMONS, ArtifactVersion.of("1.12.8.RELEASE"),
ReleaseTrains.HOPPER);
ReleaseTrains.HOPPER, null, null);
MaintainedVersions versions = MaintainedVersions.of(kay, ingalls, ingallsSnapshot, hopper);
MaintainedVersions versions = MaintainedVersions.of(kay, ingalls, hopper);
System.out.println(mapper.writeValueAsString(new ProjectMetadata(kay, versions)));
System.out.println(mapper.writeValueAsString(new ProjectMetadata(ingallsSnapshot, versions)));

21
src/test/java/org/springframework/data/release/sagan/SaganOperationsIntegrationTests.java
View File

@@ -15,11 +15,17 @@
*/
package org.springframework.data.release.sagan;
import static org.assertj.core.api.Assertions.*;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.release.AbstractIntegrationTests;
import org.springframework.data.release.model.Project;
import org.springframework.data.release.model.Projects;
import org.springframework.data.release.model.ReleaseTrains;
@@ -48,8 +54,6 @@ class SaganOperationsIntegrationTests extends AbstractIntegrationTests {
String output = version.toString();
System.out.println(versions.isMainVersion(version) ? output.concat(" (main release)") : output);
});
System.out.println();
});
}
@@ -58,6 +62,19 @@ class SaganOperationsIntegrationTests extends AbstractIntegrationTests {
sagan.updateProjectMetadata(ReleaseTrains.KAY, ReleaseTrains.INGALLS, ReleaseTrains.HOPPER);
}
@Test
void findVersions() {
Map<Project, MaintainedVersions> versions = sagan.findVersions(ReleaseTrains.LOVELACE, ReleaseTrains.MOORE,
ReleaseTrains.NEUMANN);
List<MaintainedVersion> maintainedVersions = versions.get(Projects.ELASTICSEARCH)
.filter(it -> it.getVersion().isReleaseVersion()).toList();
assertThat(maintainedVersions).isNotEmpty();
assertThat(maintainedVersions.get(0).getGenerationInception()).isNotNull();
assertThat(maintainedVersions.get(0).getReleaseDate()).isNotNull();
}
@Test
void updateJpa() {