fix prerelease version prompt order

Signed-off-by: tvallin <thibault.vallin@oracle.com>
helidon-io · Jun 30, 2023 · dd7b2a0 · dd7b2a0
1 parent 435691e
commit dd7b2a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/cli/impl/src/main/java/io/helidon/build/cli/impl/InitCommand.java b/cli/impl/src/main/java/io/helidon/build/cli/impl/InitCommand.java
@@ -18,7 +18,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import io.helidon.build.archetype.engine.v1.Prompter;
@@ -133,7 +133,8 @@ private String promptHelidonVersion(ArchetypesData archetypesData, boolean showL
         if (showLatest) {
             versions = archetypesData.latestMajorVersions();
         }
-        versions.sort(Collections.reverseOrder());
+        versions.sort(Comparator.comparing((String it) -> it.contains("-"))
+                .thenComparing(Comparator.reverseOrder()));
         int defaultOption = archetypesData.defaultVersionIndex(versions);
         if (showLatest) {
             versions.add(SHOW_ALL_VERSIONS_MESSAGE);

diff --git a/cli/impl/src/test/java/io/helidon/build/cli/impl/InitCommandTest.java b/cli/impl/src/test/java/io/helidon/build/cli/impl/InitCommandTest.java
@@ -166,8 +166,8 @@ public void testInteractiveAllHelidonVersions() throws Exception {
                 projectDir);
 
         assertThat(output, containsString("Helidon versions"));
-        assertThat(output, containsString("(29) 2.0.0"));
-        assertThat(output, containsString("(1) 4.0.0-SNAPSHOT"));
+        assertThat(output, containsString("(28) 2.0.0"));
+        assertThat(output, containsString("(29) 4.0.0-SNAPSHOT"));
         assertThat(output, containsString("Enter selection (default: 1):"));
 
         if ( helidonProperty != null) {
@@ -193,11 +193,11 @@ public void testInteractiveLatestHelidonVersions() throws Exception {
                 projectDir);
 
         assertThat(output, containsString("Helidon versions"));
-        assertThat(output, containsString("(3) 2.6.0"));
-        assertThat(output, containsString("(2) 3.1.2"));
-        assertThat(output, containsString("(1) 4.0.0-SNAPSHOT"));
+        assertThat(output, containsString("(1) 3.1.2"));
+        assertThat(output, containsString("(2) 2.6.0"));
+        assertThat(output, containsString("(3) 4.0.0-SNAPSHOT"));
         assertThat(output, containsString("(4) Show all versions"));
-        assertThat(output, containsString("Enter selection (default: 1):"));
+        assertThat(output, containsString("Enter selection (default: 3):"));
 
         if ( helidonVersionProperty != null) {
             System.setProperty(HELIDON_VERSION_PROPERTY, helidonVersionProperty);

diff --git a/cli/impl/src/test/resources/io/helidon/build/cli/impl/input-latest-version-list.txt b/cli/impl/src/test/resources/io/helidon/build/cli/impl/input-latest-version-list.txt
@@ -1,4 +1,4 @@
-1
+3