refactor tests

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

Author: rashmigottipati

internal/operator-controller/catalogmetadata/compare/compare_test.go

@@ -139,13 +139,13 @@ func TestByVersionAndRelease(t *testing.T) {
 	t.Run("all bundles valid", func(t *testing.T) {
 		toSort := []declcfg.Bundle{b3_1, b2, b3_2, b1}
 		slices.SortStableFunc(toSort, compare.ByVersionAndRelease)
-		assert.Equal(t, []declcfg.Bundle{b1, b3_2, b3_1, b2}, toSort, "should sort descending: 1.0.0 > 1.0.0-alpha+2 > 1.0.0-alpha+1 > 0.0.1")
+		assert.Equal(t, []declcfg.Bundle{b1, b3_2, b3_1, b2}, toSort)
 	})
 
 	t.Run("some bundles are missing version", func(t *testing.T) {
 		toSort := []declcfg.Bundle{b3_1, b4noVersion, b2, b3_2, b5empty, b1}
 		slices.SortStableFunc(toSort, compare.ByVersionAndRelease)
-		assert.Equal(t, []declcfg.Bundle{b1, b3_2, b3_1, b2, b4noVersion, b5empty}, toSort, "bundles with invalid/missing versions should sort last")
+		assert.Equal(t, []declcfg.Bundle{b1, b3_2, b3_1, b2, b4noVersion, b5empty}, toSort)
 	})
 }
 
@@ -162,12 +162,12 @@ func TestByDeprecationFunc(t *testing.T) {
 	c := declcfg.Bundle{Name: "c"}
 	d := declcfg.Bundle{Name: "d"}
 
-	assert.Equal(t, 0, byDeprecation(a, b), "both deprecated bundles are equal")
-	assert.Equal(t, 0, byDeprecation(b, a), "both deprecated bundles are equal")
-	assert.Equal(t, 1, byDeprecation(a, c), "deprecated bundle 'a' should sort after non-deprecated 'c'")
-	assert.Equal(t, -1, byDeprecation(c, a), "non-deprecated bundle 'c' should sort before deprecated 'a'")
-	assert.Equal(t, 0, byDeprecation(c, d), "both non-deprecated bundles are equal")
-	assert.Equal(t, 0, byDeprecation(d, c), "both non-deprecated bundles are equal")
+	assert.Equal(t, 0, byDeprecation(a, b))
+	assert.Equal(t, 0, byDeprecation(b, a))
+	assert.Equal(t, 1, byDeprecation(a, c))
+	assert.Equal(t, -1, byDeprecation(c, a))
+	assert.Equal(t, 0, byDeprecation(c, d))
+	assert.Equal(t, 0, byDeprecation(d, c))
 }
 
 // TestByVersionAndRelease_WithCompositeVersionComparison tests the feature-gated hybrid comparison.

internal/operator-controller/catalogmetadata/filter/bundle_predicates_test.go

@@ -73,44 +73,76 @@ func TestInAnyChannel(t *testing.T) {
 func TestSameVersionHigherRelease(t *testing.T) {
 	const testPackageName = "test-package"
 
-	// Expected bundle version 2.0.0+1
-	expect, err := bundle.NewLegacyRegistryV1VersionRelease("2.0.0+1")
-	require.NoError(t, err)
-
 	tests := []struct {
 		name          string
+		expectVersion string
 		bundleVersion string
 		shouldMatch   bool
 	}{
+		// Starting from a version with release
 		{
-			name:          "same version, higher release",
+			name:          "from version with release - higher release matches",
+			expectVersion: "2.0.0+1",
 			bundleVersion: "2.0.0+2",
 			shouldMatch:   true,
 		},
 		{
-			name:          "same version, same release",
+			name:          "from version with release - same release does not match",
+			expectVersion: "2.0.0+1",
 			bundleVersion: "2.0.0+1",
 			shouldMatch:   false,
 		},
 		{
-			name:          "same version, lower release",
+			name:          "from version with release - lower release does not match",
+			expectVersion: "2.0.0+1",
 			bundleVersion: "2.0.0+0",
 			shouldMatch:   false,
 		},
 		{
-			name:          "same version, no release",
+			name:          "from version with release - different version does not match",
+			expectVersion: "2.0.0+1",
+			bundleVersion: "2.1.0+2",
+			shouldMatch:   false,
+		},
+		// Starting from a version without release
+		{
+			name:          "from version without release - bundle with release matches",
+			expectVersion: "2.0.0",
+			bundleVersion: "2.0.0+1",
+			shouldMatch:   true,
+		},
+		{
+			name:          "from version without release - bundle without release does not match",
+			expectVersion: "2.0.0",
 			bundleVersion: "2.0.0",
 			shouldMatch:   false,
 		},
 		{
-			name:          "different version, higher release",
-			bundleVersion: "2.1.0+2",
+			name:          "from version without release - different version does not match",
+			expectVersion: "2.0.0",
+			bundleVersion: "2.1.0+1",
 			shouldMatch:   false,
 		},
+		// Starting from different base versions
+		{
+			name:          "from 1.0.0+5 - higher release matches",
+			expectVersion: "1.0.0+5",
+			bundleVersion: "1.0.0+10",
+			shouldMatch:   true,
+		},
+		{
+			name:          "from 3.5.2+1 - higher release matches",
+			expectVersion: "3.5.2+1",
+			bundleVersion: "3.5.2+2",
+			shouldMatch:   true,
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			expect, err := bundle.NewLegacyRegistryV1VersionRelease(tt.expectVersion)
+			require.NoError(t, err)
+
 			testBundle := declcfg.Bundle{
 				Name:    "test-package.v" + tt.bundleVersion,
 				Package: testPackageName,
@@ -120,30 +152,15 @@ func TestSameVersionHigherRelease(t *testing.T) {
 			}
 
 			f := filter.SameVersionHigherRelease(*expect)
-			assert.Equal(t, tt.shouldMatch, f(testBundle), "version %s should match=%v", tt.bundleVersion, tt.shouldMatch)
+			assert.Equal(t, tt.shouldMatch, f(testBundle), "comparing %s to %s", tt.bundleVersion, tt.expectVersion)
 		})
 	}
 
-	// Test when expected version has no release (e.g: "2.0.0")
-	t.Run("expected version without release", func(t *testing.T) {
-		expectNoRelease, err := bundle.NewLegacyRegistryV1VersionRelease("2.0.0")
-		require.NoError(t, err)
-
-		// Bundle with release should be considered higher
-		bundleWithRelease := declcfg.Bundle{
-			Name:    "test-package.v2.0.0+1",
-			Package: testPackageName,
-			Properties: []property.Property{
-				property.MustBuildPackage(testPackageName, "2.0.0+1"),
-			},
-		}
-
-		f := filter.SameVersionHigherRelease(*expectNoRelease)
-		assert.True(t, f(bundleWithRelease), "2.0.0+1 should be higher than 2.0.0")
-	})
-
 	// Test error case: invalid bundle (no package property)
 	t.Run("invalid bundle - no package property", func(t *testing.T) {
+		expect, err := bundle.NewLegacyRegistryV1VersionRelease("2.0.0+1")
+		require.NoError(t, err)
+
 		testBundle := declcfg.Bundle{
 			Name:       "test-package.invalid",
 			Package:    testPackageName,
@@ -156,7 +173,7 @@ func TestSameVersionHigherRelease(t *testing.T) {
 
 	// Test with explicit pkg.Release field (new bundle format)
 	t.Run("explicit release field - higher release matches", func(t *testing.T) {
-		expectExplicit, err := bundle.NewLegacyRegistryV1VersionRelease("2.0.0+1")
+		expect, err := bundle.NewLegacyRegistryV1VersionRelease("2.0.0+1")
 		require.NoError(t, err)
 
 		bundleWithExplicitRelease := declcfg.Bundle{
@@ -167,7 +184,7 @@ func TestSameVersionHigherRelease(t *testing.T) {
 			},
 		}
 
-		f := filter.SameVersionHigherRelease(*expectExplicit)
+		f := filter.SameVersionHigherRelease(*expect)
 		assert.True(t, f(bundleWithExplicitRelease), "explicit release=2 should be higher than 2.0.0+1")
 	})
 }