fix integration tests

Author: alessio-perugini

internal/integrationtest/core/core_test.go

@@ -695,7 +695,7 @@ func TestCoreSearchSortedResults(t *testing.T) {
 	require.NoError(t, err)
 
 	out := strings.Split(strings.TrimSpace(string(stdout)), "\n")
-	var lines, deprecated, notDeprecated, incompatibles [][]string
+	var lines, deprecated, notDeprecated [][]string
 	for i, v := range out {
 		if i > 0 {
 			v = strings.Join(strings.Fields(v), " ")
@@ -707,11 +707,7 @@ func TestCoreSearchSortedResults(t *testing.T) {
 			deprecated = append(deprecated, v)
 			continue
 		}
-		if _, err := semver.Parse(v[1]); err != nil {
-			incompatibles = append(incompatibles, v)
-		} else {
-			notDeprecated = append(notDeprecated, v)
-		}
+		notDeprecated = append(notDeprecated, v)
 	}
 
 	// verify that results are already sorted correctly
@@ -721,13 +717,9 @@ func TestCoreSearchSortedResults(t *testing.T) {
 	require.True(t, sort.SliceIsSorted(notDeprecated, func(i, j int) bool {
 		return strings.ToLower(notDeprecated[i][2]) < strings.ToLower(notDeprecated[j][2])
 	}))
-	require.True(t, sort.SliceIsSorted(incompatibles, func(i, j int) bool {
-		return strings.ToLower(incompatibles[i][2]) < strings.ToLower(incompatibles[j][2])
-	}))
 
-	result := append(notDeprecated, incompatibles...)
 	// verify that deprecated platforms are the last ones
-	require.Equal(t, lines, append(result, deprecated...))
+	require.Equal(t, lines, append(notDeprecated, deprecated...))
 
 	// test same behaviour with json output
 	stdout, _, err = cli.Run("core", "search", "--additional-urls="+url.String(), "--format=json")
@@ -1134,15 +1126,15 @@ func TestCoreHavingIncompatibleDepTools(t *testing.T) {
 	stdout, _, err := cli.Run("core", "list", "--all", "--format", "json", additionalURLs)
 	require.NoError(t, err)
 	t.Log(string(stdout))
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest`, `"1.0.2"`)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_compatible`, `"1.0.1"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_version`, `"1.0.2"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_compatible_version`, `"1.0.1"`)
 
 	// install latest compatible version
 	_, _, err = cli.Run("core", "install", "foo_vendor:avr", additionalURLs)
 	require.NoError(t, err)
 	stdout, _, err = cli.Run("core", "list", "--all", "--format", "json", additionalURLs)
 	require.NoError(t, err)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_compatible`, `"1.0.1"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_compatible_version`, `"1.0.1"`)
 
 	// install incompatible version
 	_, stderr, err := cli.Run("core", "install", "foo_vendor:[email protected]", additionalURLs)
@@ -1154,26 +1146,26 @@ func TestCoreHavingIncompatibleDepTools(t *testing.T) {
 	require.NoError(t, err)
 	stdout, _, err = cli.Run("core", "list", "--format", "json", additionalURLs)
 	require.NoError(t, err)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .installed`, `"1.0.0"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .installed_version`, `"1.0.0"`)
 
 	// Lists all updatable cores
 	stdout, _, err = cli.Run("core", "list", "--updatable", "--format", "json", additionalURLs)
 	require.NoError(t, err)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_compatible`, `"1.0.1"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_compatible_version`, `"1.0.1"`)
 
 	// upgrade to latest compatible (1.0.0 -> 1.0.1)
 	_, _, err = cli.Run("core", "upgrade", "foo_vendor:avr", "--format", "json", additionalURLs)
 	require.NoError(t, err)
 	stdout, _, err = cli.Run("core", "list", "--format", "json", additionalURLs)
 	require.NoError(t, err)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .installed`, `"1.0.1"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .installed_version`, `"1.0.1"`)
 
 	// upgrade to latest incompatible not possible (1.0.1 -> 1.0.2)
 	_, _, err = cli.Run("core", "upgrade", "foo_vendor:avr", "--format", "json", additionalURLs)
 	require.NoError(t, err)
 	stdout, _, err = cli.Run("core", "list", "--format", "json", additionalURLs)
 	require.NoError(t, err)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .installed`, `"1.0.1"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .installed_version`, `"1.0.1"`)
 
 	// When no compatible version are found return error
 	_, stderr, err = cli.Run("core", "install", "incompatible_vendor:avr", additionalURLs)
@@ -1184,19 +1176,19 @@ func TestCoreHavingIncompatibleDepTools(t *testing.T) {
 	stdout, _, err = cli.Run("core", "search", "--all", "--format", "json", additionalURLs)
 	require.NoError(t, err)
 	requirejson.Query(t, stdout,
-		`[.[] | select(.id == "foo_vendor:avr") | {latest: .latest, incompatible: .incompatible}] | sort_by(.latest)`,
+		`[.[] | select(.id == "foo_vendor:avr") | .releases | map(.) | .[] | {version: .version, incompatible: .incompatible}] | sort_by(.version)`,
 		`[
-			{"incompatible":null,"latest":"1.0.0"},
-			{"incompatible":null,"latest":"1.0.1"},
-			{"incompatible":true,"latest":"1.0.2"}
+			{"incompatible":null,"version":"1.0.0"},
+			{"incompatible":null,"version":"1.0.1"},
+			{"incompatible":true,"version":"1.0.2"}
 		]`,
 	)
 
-	// Core search shows latest compatible version
+	// Core search shows latest compatible version even if incompatible
 	stdout, _, err = cli.Run("core", "search", "--format", "json", additionalURLs)
 	require.NoError(t, err)
-	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest`, `"1.0.1"`)
-	requirejson.Query(t, stdout, `.[] | select(.id == "incompatible_vendor:avr") | .incompatible`, `true`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "foo_vendor:avr") | .latest_version`, `"1.0.2"`)
+	requirejson.Query(t, stdout, `.[] | select(.id == "incompatible_vendor:avr") | .releases[.latest_version].incompatible`, `true`)
 
 	// In text mode, core search doesn't show any version if no compatible one are present
 	stdout, _, err = cli.Run("core", "search", additionalURLs)
@@ -1205,5 +1197,5 @@ func TestCoreHavingIncompatibleDepTools(t *testing.T) {
 	for _, v := range strings.Split(strings.TrimSpace(string(stdout)), "\n") {
 		lines = append(lines, strings.Fields(strings.TrimSpace(v)))
 	}
-	require.Contains(t, lines, []string{"incompatible_vendor:avr", "Incompatible", "Boards"})
+	require.Contains(t, lines, []string{"incompatible_vendor:avr"})
 }