Polish

Author: islamaliev

tests/integration/supported_from_version_test.go

@@ -19,11 +19,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"golang.org/x/mod/semver"
-
 	defraMultiplier "github.com/sourcenetwork/defradb/tests/multiplier"
 )
 
+// Which release a declared version resolves to is covered by the multiplier
+// package. These tests cover what the harness adds on top: validating the
+// declared value, walking the active multipliers, and restoring the versions it
+// set, including when a skip ends the test partway through.
+
 // versionRecorder captures a failure from applyTestCaseVersion without ending
 // the real test.
 //
@@ -110,15 +113,6 @@ func runVersionMode(
 	return resolved, rec
 }
 
-func TestApplyTestCaseVersion_NoSupportedFrom_UsesDefaultTarget(t *testing.T) {
-	resolved, rec := runVersion(t, "", defraMultiplier.CrossVersionOldSource,
-		defraMultiplier.CrossVersionOldSource)
-
-	require.False(t, rec.failed)
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		resolved[defraMultiplier.CrossVersionOldSource])
-}
-
 func TestApplyTestCaseVersion_SupportedFromNewerThanTarget_RunsAtSupportedFrom(t *testing.T) {
 	// The point of the change: rather than skipping, the test runs against the
 	// oldest release it supports.
@@ -129,28 +123,9 @@ func TestApplyTestCaseVersion_SupportedFromNewerThanTarget_RunsAtSupportedFrom(t
 	assert.Equal(t, "v99.0.0", resolved[defraMultiplier.CrossVersionOldSource])
 }
 
-func TestApplyTestCaseVersion_SupportedFromEqualToTarget_UsesTarget(t *testing.T) {
-	resolved, rec := runVersion(t, defraMultiplier.CrossVersionTargetVersion,
-		defraMultiplier.CrossVersionOldSource, defraMultiplier.CrossVersionOldSource)
-
-	require.False(t, rec.failed)
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		resolved[defraMultiplier.CrossVersionOldSource])
-}
-
-func TestApplyTestCaseVersion_SupportedFromOlderThanTarget_UsesTarget(t *testing.T) {
-	// The default target already satisfies the test, so it stays: it is the
-	// pairing most likely to have drifted from the current build.
-	require.Equal(t, "v1.0.0", defraMultiplier.CrossVersionTargetVersion)
-
-	resolved, rec := runVersion(t, "v0.9.0", defraMultiplier.CrossVersionOldSource,
-		defraMultiplier.CrossVersionOldSource)
-
-	require.False(t, rec.failed)
-	assert.Equal(t, "v1.0.0", resolved[defraMultiplier.CrossVersionOldSource])
-}
-
-func TestApplyTestCaseVersion_BothDirections_AreSetIndependently(t *testing.T) {
+func TestApplyTestCaseVersion_AllVersionMultipliers_AreSet(t *testing.T) {
+	// Every active multiplier that targets a release has to be pointed at the
+	// declared version, not just the first one found.
 	active := fmt.Sprintf("%s,%s",
 		defraMultiplier.CrossVersionOldSource, defraMultiplier.CrossVersionNewSource)
 
@@ -162,6 +137,30 @@ func TestApplyTestCaseVersion_BothDirections_AreSetIndependently(t *testing.T) {
 	assert.Equal(t, "v99.0.0", resolved[defraMultiplier.CrossVersionNewSource])
 }
 
+func TestApplyTestCaseVersion_NonVersionMultiplier_Unaffected(t *testing.T) {
+	// signed-docs targets no release, so a declared version must not reach it and
+	// must not disturb the cross-version default.
+	_, rec := runVersion(t, "v99.0.0", defraMultiplier.SignedDocs)
+
+	require.False(t, rec.failed)
+	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
+		defraMultiplier.TargetVersionInEffect(defraMultiplier.CrossVersionOldSource))
+}
+
+func TestApplyTestCaseVersion_Exact_SupportedFromNewerThanTarget_Skips(t *testing.T) {
+	// In exact mode the release the test needs is covered by its own run, so
+	// running it here as well would report coverage of a release this run never
+	// touched.
+	_, rec := runVersionExact(t, "v99.0.0", defraMultiplier.CrossVersionOldSource,
+		defraMultiplier.CrossVersionOldSource)
+
+	assert.True(t, rec.skipped)
+	assert.False(t, rec.failed)
+	assert.Contains(t, rec.message, defraMultiplier.CrossVersionOldSource)
+	assert.Contains(t, rec.message, defraMultiplier.CrossVersionTargetVersion)
+	assert.Contains(t, rec.message, "v99.0.0")
+}
+
 func TestApplyTestCaseVersion_RestoresDefaultAfterwards(t *testing.T) {
 	// A version must not leak into the next test in the package.
 	_, rec := runVersion(t, "v99.0.0", defraMultiplier.CrossVersionOldSource,
@@ -172,14 +171,19 @@ func TestApplyTestCaseVersion_RestoresDefaultAfterwards(t *testing.T) {
 		defraMultiplier.TargetVersionInEffect(defraMultiplier.CrossVersionOldSource))
 }
 
-func TestApplyTestCaseVersion_NonVersionMultiplier_Unaffected(t *testing.T) {
-	// signed-docs targets no release, so a declared version must not reach it and
-	// must not disturb the cross-version default.
-	_, rec := runVersion(t, "v99.0.0", defraMultiplier.SignedDocs)
+func TestApplyTestCaseVersion_Exact_SkipRestoresEarlierMultipliers(t *testing.T) {
+	// The skip ends the test partway through the loop, so a version set for an
+	// earlier multiplier must not leak into the next test.
+	active := fmt.Sprintf("%s,%s",
+		defraMultiplier.CrossVersionOldSource, defraMultiplier.CrossVersionNewSource)
+
+	_, rec := runVersionExact(t, "v99.0.0", active)
+	require.True(t, rec.skipped)
 
-	require.False(t, rec.failed)
 	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
 		defraMultiplier.TargetVersionInEffect(defraMultiplier.CrossVersionOldSource))
+	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
+		defraMultiplier.TargetVersionInEffect(defraMultiplier.CrossVersionNewSource))
 }
 
 func TestApplyTestCaseVersion_InvalidVersion_Fails(t *testing.T) {
@@ -210,74 +214,3 @@ func TestApplyTestCaseVersion_SpacedNames_AreTrimmed(t *testing.T) {
 	require.False(t, rec.failed)
 	assert.Equal(t, "v99.0.0", resolved[defraMultiplier.CrossVersionOldSource])
 }
-
-// TestSupportedFromVersion_ComparisonIsNotLexical guards the reason x/mod/semver
-// is used rather than plain string comparison.
-func TestSupportedFromVersion_ComparisonIsNotLexical(t *testing.T) {
-	// "v1.10.0" sorts before "v1.9.0" as a string, so a lexical comparison would
-	// treat a v1.10.0 target as older than a v1.9.0 requirement and needlessly
-	// move the run to v1.9.0.
-	require.Less(t, "v1.10.0", "v1.9.0", "precondition: these compare the wrong way lexically")
-
-	assert.Positive(t, semver.Compare("v1.10.0", "v1.9.0"))
-	assert.Negative(t, semver.Compare("v1.9.0", "v1.10.0"))
-	assert.Zero(t, semver.Compare("v1.9.0", "v1.9.0"))
-}
-
-func TestApplyTestCaseVersion_Exact_SupportedFromNewerThanTarget_Skips(t *testing.T) {
-	// In exact mode the release the test needs is covered by its own run, so
-	// promoting it here would run it twice and report coverage of a release this
-	// run never touched.
-	_, rec := runVersionExact(t, "v99.0.0", defraMultiplier.CrossVersionOldSource,
-		defraMultiplier.CrossVersionOldSource)
-
-	assert.True(t, rec.skipped)
-	assert.False(t, rec.failed)
-	assert.Contains(t, rec.message, defraMultiplier.CrossVersionOldSource)
-	assert.Contains(t, rec.message, defraMultiplier.CrossVersionTargetVersion)
-	assert.Contains(t, rec.message, "v99.0.0")
-}
-
-func TestApplyTestCaseVersion_Exact_SupportedFromEqualToTarget_Runs(t *testing.T) {
-	resolved, rec := runVersionExact(t, defraMultiplier.CrossVersionTargetVersion,
-		defraMultiplier.CrossVersionOldSource, defraMultiplier.CrossVersionOldSource)
-
-	require.False(t, rec.skipped)
-	require.False(t, rec.failed)
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		resolved[defraMultiplier.CrossVersionOldSource])
-}
-
-func TestApplyTestCaseVersion_Exact_SupportedFromOlderThanTarget_Runs(t *testing.T) {
-	resolved, rec := runVersionExact(t, "v0.9.0", defraMultiplier.CrossVersionOldSource,
-		defraMultiplier.CrossVersionOldSource)
-
-	require.False(t, rec.skipped)
-	require.False(t, rec.failed)
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		resolved[defraMultiplier.CrossVersionOldSource])
-}
-
-func TestApplyTestCaseVersion_Exact_NoSupportedFrom_Runs(t *testing.T) {
-	resolved, rec := runVersionExact(t, "", defraMultiplier.CrossVersionOldSource,
-		defraMultiplier.CrossVersionOldSource)
-
-	require.False(t, rec.skipped)
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		resolved[defraMultiplier.CrossVersionOldSource])
-}
-
-func TestApplyTestCaseVersion_Exact_SkipRestoresEarlierMultipliers(t *testing.T) {
-	// The skip ends the test partway through the loop, so a version set for an
-	// earlier multiplier must not leak into the next test.
-	active := fmt.Sprintf("%s,%s",
-		defraMultiplier.CrossVersionOldSource, defraMultiplier.CrossVersionNewSource)
-
-	_, rec := runVersionExact(t, "v99.0.0", active)
-	require.True(t, rec.skipped)
-
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		defraMultiplier.TargetVersionInEffect(defraMultiplier.CrossVersionOldSource))
-	assert.Equal(t, defraMultiplier.CrossVersionTargetVersion,
-		defraMultiplier.TargetVersionInEffect(defraMultiplier.CrossVersionNewSource))
-}

tests/multiplier/target_version.go

@@ -66,6 +66,8 @@ func ResolveTargetVersion(name Name, supportedFrom string, exact bool) (string,
 		return "", VersionNotTargeted
 	}
 
+	// Compared as semver rather than as strings: "v1.10.0" sorts before "v1.9.0"
+	// lexically, which would read a newer target as older than the requirement.
 	if supportedFrom != "" && semver.Compare(target, supportedFrom) < 0 {
 		if exact {
 			return "", VersionSkip