fix up tests

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

Author: rashmigottipati

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

@@ -140,13 +140,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)
+		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")
 	})
 
 	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)
+		assert.Equal(t, []declcfg.Bundle{b1, b3_2, b3_1, b2, b4noVersion, b5empty}, toSort, "bundles with invalid/missing versions should sort last")
 	})
 }
 
@@ -163,66 +163,47 @@ func TestByDeprecationFunc(t *testing.T) {
 	c := declcfg.Bundle{Name: "c"}
 	d := declcfg.Bundle{Name: "d"}
 
-	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))
+	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")
 }
 
-// TestByVersionAndRelease_WithCompositeVersionComparison tests the feature-gated hybrid comparison:
-// When disabled: uses build metadata (backward compatible)
-// When enabled: uses Bundle.Compare() with build metadata fallback for registry+v1
+// TestByVersionAndRelease_WithCompositeVersionComparison tests the feature-gated hybrid comparison
+// for registry+v1 bundles. When the feature gate is enabled, Bundle.Compare() is called but returns
+// 0 for registry+v1 bundles (no explicit release field), so we fall back to build metadata parsing.
+// This maintains backward compatibility while preparing for future bundle formats with explicit release.
 func TestByVersionAndRelease_WithCompositeVersionComparison(t *testing.T) {
 	// Registry+v1 bundles: same version, different build metadata
-	registryV1_b1 := declcfg.Bundle{
+	b1 := declcfg.Bundle{
 		Name: "package1.v1.0.0+1",
 		Properties: []property.Property{
 			{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+1"}`)},
 		},
 	}
-	registryV1_b2 := declcfg.Bundle{
+	b2 := declcfg.Bundle{
 		Name: "package1.v1.0.0+2",
 		Properties: []property.Property{
 			{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package1", "version": "1.0.0+2"}`)},
 		},
 	}
 
-	// New format bundles: same version, different .spec.release
-	newFormat_b1 := declcfg.Bundle{
-		Name: "package2.v1.0.0-rel.1",
-		Properties: []property.Property{
-			{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package2", "version": "1.0.0", "release": "1"}`)},
-		},
-	}
-	newFormat_b2 := declcfg.Bundle{
-		Name: "package2.v1.0.0-rel.2",
-		Properties: []property.Property{
-			{Type: property.TypePackage, Value: json.RawMessage(`{"packageName": "package2", "version": "1.0.0", "release": "2"}`)},
-		},
-	}
-
 	prevEnabled := features.OperatorControllerFeatureGate.Enabled(features.CompositeVersionComparison)
 	t.Cleanup(func() {
 		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=%t", features.CompositeVersionComparison, prevEnabled)))
 	})
 
-	t.Run("feature gate disabled - uses build metadata", func(t *testing.T) {
+	t.Run("feature gate disabled - uses build metadata only", func(t *testing.T) {
 		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=false", features.CompositeVersionComparison)))
-		result := compare.ByVersionAndRelease(registryV1_b1, registryV1_b2)
+		result := compare.ByVersionAndRelease(b1, b2)
 		assert.Positive(t, result, "should sort by build metadata: 1.0.0+2 > 1.0.0+1")
 	})
 
-	t.Run("feature gate enabled - registry+v1 bundles use build metadata fallback", func(t *testing.T) {
-		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=true", features.CompositeVersionComparison)))
-		result := compare.ByVersionAndRelease(registryV1_b1, registryV1_b2)
-		assert.Positive(t, result, "should fallback to build metadata: 1.0.0+2 > 1.0.0+1")
-	})
-
-	t.Run("feature gate enabled - new format bundles use .spec.release", func(t *testing.T) {
+	t.Run("feature gate enabled - registry+v1 bundles still work via build metadata fallback", func(t *testing.T) {
 		require.NoError(t, features.OperatorControllerFeatureGate.Set(fmt.Sprintf("%s=true", features.CompositeVersionComparison)))
-		result := compare.ByVersionAndRelease(newFormat_b1, newFormat_b2)
-		assert.Positive(t, result, "should use .spec.release: release=2 > release=1")
+		result := compare.ByVersionAndRelease(b1, b2)
+		assert.Positive(t, result, "Bundle.Compare() returns 0, fallback to build metadata: 1.0.0+2 > 1.0.0+1")
 	})
 }

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

@@ -279,7 +279,7 @@ func TestSuccessorsOf_WithCompositeVersionComparison_FeatureGateDisabled(t *test
 	require.NoError(t, err)
 
 	// Higher release should NOT match without feature gate
-	assert.False(t, predicate(higherRelease))
+	assert.False(t, predicate(higherRelease), "1.0.0+2 should NOT be a successor of 1.0.0+1 when feature gate disabled")
 }
 
 // TestSuccessorsOf_WithCompositeVersionComparison_FeatureGateEnabled verifies higher releases
@@ -318,5 +318,5 @@ func TestSuccessorsOf_WithCompositeVersionComparison_FeatureGateEnabled(t *testi
 	require.NoError(t, err)
 
 	// Higher release should match when feature gate is enabled
-	assert.True(t, predicate(higherRelease))
+	assert.True(t, predicate(higherRelease), "1.0.0+2 should be a successor of 1.0.0+1 when feature gate enabled")
 }