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

Adapt to Git branch changes.

Browse Source 
Closes #185
This commit is contained in:
Mark Paluch
2021-05-05 10:49:27 +02:00
parent 968d191dc2
commit ccb2f0b48a
8 changed files with 98 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/springframework/data/release/git/BackportTargetsUnitTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.release.model.TrainIteration;
/**
* Unit tests for {@link BackportTargets}.
*
*
* @author Oliver Gierke
*/
class BackportTargetsUnitTests {
@@ -51,7 +51,7 @@ class BackportTargetsUnitTests {
}
@Test // #11
void includesMasterBranchForServiceReleaseSource() {
void includesMainBranchForServiceReleaseSource() {
TrainIteration iteration = new TrainIteration(ReleaseTrains.GOSLING, Iteration.SR2);
ModuleIteration module = iteration.getModule(Projects.COMMONS);
@@ -59,7 +59,7 @@ class BackportTargetsUnitTests {
BackportTargets targets = new BackportTargets(module, Arrays.asList(ReleaseTrains.FOWLER));
assertThat(targets).hasSize(2);
assertThat(targets).contains(Branch.MASTER, fowlerBranch);
assertThat(targets).contains(Branch.MAIN, fowlerBranch);
}
private static Branch getBranch(Train train) {

2
src/test/java/org/springframework/data/release/git/BranchUnitTests.java
View File

@@ -34,7 +34,7 @@ class BranchUnitTests {
void testname() {
IterationVersion iterationVersion = new SimpleIterationVersion(Version.of(1, 4), Iteration.RC1);
assertThat(Branch.from(iterationVersion).toString()).isEqualTo("master");
assertThat(Branch.from(iterationVersion).toString()).isEqualTo("main");
}
@Test

29
src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java
View File

@@ -23,10 +23,6 @@ import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -102,29 +98,4 @@ class GitOperationsIntegrationTests extends AbstractIntegrationTests {
assertThat(hopperSR9.getIteration()).isEqualTo(Iteration.SR9);
}
@Test
void verify() throws Exception {
// gitOperations.update(ReleaseTrains.HOPPER);
try (Git git = new Git(new FileRepository("/Users/mpaluch/git/data/spring-data-elasticsearch/.git"))) {
ObjectId resolve = git.getRepository().parseCommit(git.getRepository().resolve("3.0.0.RELEASE"));
Iterable<RevCommit> master = git.log().addRange(resolve, git.getRepository().resolve("master")).call();
for (RevCommit revCommit : master) {
ParsedCommitMessage message = ParsedCommitMessage.parse(revCommit.getFullMessage());
if (message.getTicketReference() == null || message.getSummary() == null) {
System.out.println(revCommit.getFullMessage());
System.out.println();
}
}
} catch (Exception o_O) {
throw new RuntimeException(o_O);
}
}
}