diff --git a/evaluate/task/symflower-repair.go b/evaluate/task/symflower-repair.go new file mode 100644 index 000000000..93c550b74 --- /dev/null +++ b/evaluate/task/symflower-repair.go @@ -0,0 +1,51 @@ +package task + +import ( + "context" + "time" + + pkgerrors "github.com/pkg/errors" + "github.com/symflower/eval-dev-quality/evaluate/metrics" + "github.com/symflower/eval-dev-quality/language" + "github.com/symflower/eval-dev-quality/log" + "github.com/symflower/eval-dev-quality/tools" + "github.com/symflower/eval-dev-quality/util" +) + +// symflowerRepair runs the "symflower repair" command. +func symflowerRepair(logger *log.Logger, modelAssessment metrics.Assessments, repositoryPath string, language language.Language) (assessments metrics.Assessments, problems []error, err error) { + assessments = metrics.NewAssessments() + + start := time.Now() + output, err := util.CommandWithResult(context.Background(), logger, &util.Command{ + Command: []string{ + tools.SymflowerPath, "repair", + "--language", language.ID(), + "--workspace", repositoryPath, + }, + + Directory: repositoryPath, + }) + if err != nil { + return nil, nil, pkgerrors.WithStack(err) + } + duration := time.Since(start) + + logger.Printf("with symflower repair: %s", output) + + // The processing time is summed with the one from the model. + assessments[metrics.AssessmentKeyProcessingTime] = modelAssessment[metrics.AssessmentKeyProcessingTime] + uint64(duration.Milliseconds()) + + coverage, ps, err := language.Execute(logger, repositoryPath) + problems = append(problems, ps...) + if err != nil { + return nil, ps, pkgerrors.WithStack(err) + } + + logger.Printf("with symflower repair: Executes tests with %d coverage objects", coverage) + assessments.Award(metrics.AssessmentKeyFilesExecuted) + assessments.Award(metrics.AssessmentKeyResponseNoError) + assessments.AwardPoints(metrics.AssessmentKeyCoverage, coverage) + + return assessments, problems, err +} diff --git a/evaluate/task/task-write-test.go b/evaluate/task/task-write-test.go index 2b991dead..675ca9288 100644 --- a/evaluate/task/task-write-test.go +++ b/evaluate/task/task-write-test.go @@ -63,6 +63,7 @@ func (t *TaskWriteTests) Run(repository evaltask.Repository) (repositoryAssessme } modelAssessment := metrics.NewAssessments() + symflowerAssessment := metrics.NewAssessments() for _, filePath := range filePaths { if err := repository.Reset(t.Logger); err != nil { t.Logger.Panicf("ERROR: unable to reset temporary repository path: %s", err) @@ -93,7 +94,15 @@ func (t *TaskWriteTests) Run(repository evaltask.Repository) (repositoryAssessme if err != nil { problems = append(problems, pkgerrors.WithMessage(err, filePath)) - continue + assessments, ps, err := symflowerRepair(log, modelAssessment, dataPath, t.Language) + problems = append(problems, ps...) + if err != nil { + problems = append(problems, err) + + continue + } + + symflowerAssessment.Add(assessments) } log.Printf("Executes tests with %d coverage objects", coverage) modelAssessment.Award(metrics.AssessmentKeyFilesExecuted) @@ -104,5 +113,9 @@ func (t *TaskWriteTests) Run(repository evaltask.Repository) (repositoryAssessme IdentifierWriteTests: modelAssessment, } + if len(symflowerAssessment) > 0 { + repositoryAssessment[IdentifierWriteTestsSymflowerRepair] = symflowerAssessment + } + return repositoryAssessment, problems, nil } diff --git a/evaluate/task/task-write-test_test.go b/evaluate/task/task-write-test_test.go index 5b5b2cdc6..bec4e3a13 100644 --- a/evaluate/task/task-write-test_test.go +++ b/evaluate/task/task-write-test_test.go @@ -14,6 +14,8 @@ import ( "github.com/symflower/eval-dev-quality/log" modeltesting "github.com/symflower/eval-dev-quality/model/testing" "github.com/symflower/eval-dev-quality/task" + "github.com/zimmski/osutil" + "github.com/zimmski/osutil/bytesutil" ) func TestTaskWriteTestsRun(t *testing.T) { @@ -77,4 +79,73 @@ func TestTaskWriteTestsRun(t *testing.T) { }, }) }) + + t.Run("Symflower Repair", func(t *testing.T) { + t.Run("Go", func(t *testing.T) { + validateGo := func(t *testing.T, testName string, testFileContent string, expectedAssessments map[task.Identifier]metrics.Assessments) { + temporaryDirectoryPath := t.TempDir() + repositoryPath := filepath.Join(temporaryDirectoryPath, "golang", "plain") + require.NoError(t, osutil.CopyTree(filepath.Join("..", "..", "testdata", "golang", "plain"), repositoryPath)) + + modelMock := modeltesting.NewMockModelNamed(t, "mocked-model") + modelMock.RegisterGenerateSuccess(t, IdentifierWriteTests, "plain_test.go", testFileContent, metricstesting.AssessmentsWithProcessingTime).Once() + + validate(t, &tasktesting.TestCaseTask{ + Name: testName, + + Model: modelMock, + Language: &golang.Language{}, + TestDataPath: temporaryDirectoryPath, + RepositoryPath: filepath.Join("golang", "plain"), + + ExpectedRepositoryAssessment: expectedAssessments, + ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){ + filepath.Join(string(IdentifierWriteTests), "mocked-model", "golang", "golang", "plain.log"): func(t *testing.T, filePath, data string) { + assert.Contains(t, data, "Evaluating model \"mocked-model\"") + assert.Contains(t, data, "PASS: TestTaskB") + }, + }, + }) + } + { + expectedAssessments := map[task.Identifier]metrics.Assessments{ + IdentifierWriteTests: metrics.Assessments{ + metrics.AssessmentKeyFilesExecuted: 1, + metrics.AssessmentKeyResponseNoError: 1, + metrics.AssessmentKeyCoverage: 10, + }, + } + validateGo(t, "Model generated correct test", bytesutil.StringTrimIndentations(` + package plain + + import "testing" + + func TestPlain(t *testing.T) { + plain() + } + `), expectedAssessments) + } + { + expectedAssessments := map[task.Identifier]metrics.Assessments{ + IdentifierWriteTests: metrics.Assessments{ + metrics.AssessmentKeyFilesExecuted: 0, // TODO update the assessments. + metrics.AssessmentKeyResponseNoError: 1, + metrics.AssessmentKeyCoverage: 0, // TODO update the assessments. + }, + } + validateGo(t, "Model generated test with unused import", bytesutil.StringTrimIndentations(` + package plain + + import ( + "testing" + "strings" + ) + + func TestPlain(t *testing.T) { + plain() + } + `), expectedAssessments) + } + }) + }) } diff --git a/evaluate/task/task.go b/evaluate/task/task.go index 5ddda6ef5..30ab86f57 100644 --- a/evaluate/task/task.go +++ b/evaluate/task/task.go @@ -33,6 +33,8 @@ func registerIdentifier(name string) (identifier evaltask.Identifier) { var ( // IdentifierWriteTests holds the identifier for the "write test" task. IdentifierWriteTests = registerIdentifier("write-tests") + // IdentifierWriteTestsSymflowerRepair holds the identifier for the "write test" task with the "symflower repair" applied. + IdentifierWriteTestsSymflowerRepair = registerIdentifier("write-tests-symflower-repair") // IdentifierCodeRepair holds the identifier for the "code repair" task. IdentifierCodeRepair = registerIdentifier("code-repair") )