Fixed iteration detection in JiraVersion.

This commit is contained in:
Oliver Gierke
2014-05-02 17:00:01 +02:00
parent e77f9b087c
commit eeb511a377
3 changed files with 11 additions and 8 deletions

View File

@@ -46,7 +46,8 @@ class JiraVersion {
@Override
public String toString() {
Iteration iteration = module.hasCustomFirstIteration() ? module.getCustomFirstIteration() : this.iteration;
Iteration iteration = this.iteration.isInitialIteration() && module.hasCustomFirstIteration() ? module
.getCustomFirstIteration() : this.iteration;
if (iteration.isServiceIteration()) {
return String.format("%s.%s (%s %s)", module.getVersion(), iteration.getBugfixValue(), train.getName(),

View File

@@ -56,13 +56,6 @@ public class ModuleIteration implements IterationVersion {
.getCustomFirstIteration() : this.iteration;
}
public String getJiraVersionName() {
Iteration iteration = module.hasCustomFirstIteration() ? module.getCustomFirstIteration() : this.iteration;
return String.format("%s %s (%s)", module.getVersion(), iteration.getName(), train.getName());
}
/**
* Returns the {@link String} representation of the logical version of the {@link ModuleIteration}.
*

View File

@@ -52,6 +52,15 @@ public class JiraVersionUnitTests {
assertThat(version.toString(), is("1.0 M2 (Dijkstra)"));
}
@Test
public void doesNotUseCustomIterationOnNonFirstiterations() {
ModuleIteration module = ReleaseTrains.DIJKSTRA.getModuleIteration(Iteration.RC1, "Elasticsearch");
JiraVersion version = new JiraVersion(module);
assertThat(version.toString(), is("1.0 RC1 (Dijkstra)"));
}
private void assertIterationVersion(Iteration iteration, String expected) {
ModuleIteration module = ReleaseTrains.DIJKSTRA.getModuleIteration(iteration, "Commons");