fix: remove cyclic dependency on learn mock

Author: acke

infrastructure/oss/unified_converter_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/snyk/snyk-ls/infrastructure/learn/mock_learn"
 	ctx2 "github.com/snyk/snyk-ls/internal/context"
 	"github.com/snyk/snyk-ls/internal/testutil"
 	"github.com/snyk/snyk-ls/internal/types"
@@ -131,9 +132,18 @@ func Test_UnifiedIssue_HasUpgradeQuickFixAction(t *testing.T) {
 	require.NoError(t, err)
 	path := filepath.Join(workDir, "package.json")
 	ctx = ctx2.NewContextWithWorkDirAndFilePath(ctx, types.FilePath(workDir), types.FilePath(path))
+
+	// Create learn service mock and inject into context (merge with existing dependencies)
+	ctrl := gomock.NewController(t)
+	learnMock := mock_learn.NewMockService(ctrl)
+	learnMock.EXPECT().GetLesson(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
+	deps, _ := ctx2.DependenciesFromContext(ctx)
+	deps[ctx2.DepLearnService] = learnMock
+	ctx = ctx2.NewContextWithDependencies(ctx, deps)
+
 	problems := asProblemsMap(ctx, []testapi.FindingData{finding})
 	require.NotEmpty(t, problems)
-	// Enable OSS quick-fix actions (deps already injected by UnitTestWithCtx)
+	// Enable OSS quick-fix actions
 	c.SetSnykOSSQuickFixCodeActionsEnabled(true)
 
 	// Pick first problem group
@@ -182,6 +192,15 @@ func Test_UnifiedIssue_ProducesUpgradeCodeLens(t *testing.T) {
 	require.NoError(t, err)
 	path := filepath.Join(workDir, "package.json")
 	ctx = ctx2.NewContextWithWorkDirAndFilePath(ctx, types.FilePath(workDir), types.FilePath(path))
+
+	// Create learn service mock and inject into context (merge with existing dependencies)
+	ctrl := gomock.NewController(t)
+	learnMock := mock_learn.NewMockService(ctrl)
+	learnMock.EXPECT().GetLesson(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
+	deps, _ := ctx2.DependenciesFromContext(ctx)
+	deps[ctx2.DepLearnService] = learnMock
+	ctx = ctx2.NewContextWithDependencies(ctx, deps)
+
 	problems := asProblemsMap(ctx, []testapi.FindingData{finding})
 	require.NotEmpty(t, problems)
 	// Enable OSS quick-fix actions
@@ -192,7 +211,7 @@ func Test_UnifiedIssue_ProducesUpgradeCodeLens(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, issue)
 
-		// deps already injected by UnitTestWithCtx
+		// deps already injected above
 		enriched := addUnifiedOssQuickFixesAndLenses(ctx, []types.Issue{issue})
 		require.Len(t, enriched, 1)
 		enrichedIssue := enriched[0]

internal/testutil/test_setup.go

@@ -26,7 +26,6 @@ import (
 	ctx2 "github.com/snyk/snyk-ls/internal/context"
 	"github.com/snyk/snyk-ls/internal/util"
 
-	"github.com/golang/mock/gomock"
 	"github.com/snyk/go-application-framework/pkg/configuration"
 	"github.com/snyk/go-application-framework/pkg/mocks"
 	"github.com/stretchr/testify/require"
@@ -35,7 +34,6 @@ import (
 	"github.com/snyk/go-application-framework/pkg/local_workflows/code_workflow/sast_contract"
 
 	"github.com/snyk/snyk-ls/application/config"
-	"github.com/snyk/snyk-ls/infrastructure/learn/mock_learn"
 	"github.com/snyk/snyk-ls/internal/constants"
 	internal_er "github.com/snyk/snyk-ls/internal/observability/error_reporting"
 	"github.com/snyk/snyk-ls/internal/progress"
@@ -87,14 +85,11 @@ func UnitTestWithCtx(t *testing.T) (*config.Config, context.Context) {
 		progress.CleanupChannels()
 	})
 
-	// Create mock learn service and error reporter for tests
-	ctrl := gomock.NewController(t)
-	ls := mock_learn.NewMockService(ctrl)
-	ls.EXPECT().GetLesson(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
-
+	// Create error reporter for tests
+	// Note: Learn service is not provided here to avoid import cycle with infrastructure/learn tests.
+	// Tests that need a learn service should create their own mock (see oss_test.go getLearnMock for example).
 	ctx := ctx2.NewContextWithDependencies(t.Context(), map[string]any{
 		ctx2.DepConfig:        c,
-		ctx2.DepLearnService:  ls,
 		ctx2.DepErrorReporter: internal_er.NewTestErrorReporter(),
 	})
 	ctx = ctx2.NewContextWithLogger(ctx, c.Logger())