fix, Default to all repositories if none are selected in CLI

Fixes #163
symflower · Jun 14, 2024 · f9baaa9 · f9baaa9
1 parent 0afea34
commit f9baaa9
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 21 deletions.
diff --git a/cmd/eval-dev-quality/cmd/evaluate.go b/cmd/eval-dev-quality/cmd/evaluate.go
@@ -223,31 +223,41 @@ func (command *Evaluate) Initialize(args []string) (evaluationContext *evaluate.
 
 	// Gather repositories and update language selection accordingly.
 	{
-		commandRepositories := map[string]bool{}
-		commandRepositoriesLanguages := map[string]bool{}
-		for _, r := range command.Repositories {
-			languageIDOfRepository := strings.SplitN(r, string(os.PathSeparator), 2)[0]
-			if _, ok := languagesSelected[languageIDOfRepository]; ok {
-				commandRepositories[r] = true
-				commandRepositoriesLanguages[languageIDOfRepository] = true
-			} else {
-				command.logger.Printf("Excluded repository %s because its language %q is not enabled for this evaluation", r, languageIDOfRepository)
+		if len(command.Repositories) == 0 {
+			for _, l := range command.Languages {
+				repositories, err := language.RepositoriesForLanguage(language.Languages[l], command.TestdataPath)
+				if err != nil {
+					command.logger.Panicf("ERROR: %s", err)
+				}
+				command.Repositories = repositories
 			}
-		}
-		for languageID := range languagesSelected {
-			if len(command.Repositories) == 0 || commandRepositoriesLanguages[languageID] {
-				commandRepositories[filepath.Join(languageID, evaluate.RepositoryPlainName)] = true
-			} else {
-				command.Languages = slices.DeleteFunc(command.Languages, func(l string) bool {
-					return l == languageID
-				})
-				delete(languagesSelected, languageID)
-				command.logger.Printf("Excluded language %q because it is not part of the selected repositories", languageID)
+		} else {
+			commandRepositories := map[string]bool{}
+			commandRepositoriesLanguages := map[string]bool{}
+			for _, r := range command.Repositories {
+				languageIDOfRepository := strings.SplitN(r, string(os.PathSeparator), 2)[0]
+				if _, ok := languagesSelected[languageIDOfRepository]; ok {
+					commandRepositories[r] = true
+					commandRepositoriesLanguages[languageIDOfRepository] = true
+				} else {
+					command.logger.Printf("Excluded repository %s because its language %q is not enabled for this evaluation", r, languageIDOfRepository)
+				}
+			}
+			for languageID := range languagesSelected {
+				if commandRepositoriesLanguages[languageID] { // Also add the plain repository in case we already have repositories for this language.
+					commandRepositories[filepath.Join(languageID, evaluate.RepositoryPlainName)] = true
+				} else {
+					command.Languages = slices.DeleteFunc(command.Languages, func(l string) bool {
+						return l == languageID
+					})
+					delete(languagesSelected, languageID)
+					command.logger.Printf("Excluded language %q because it is not part of the selected repositories", languageID)
+				}
 			}
 
+			command.Repositories = maps.Keys(commandRepositories)
+			sort.Strings(command.Repositories)
 		}
-		command.Repositories = maps.Keys(commandRepositories)
-		sort.Strings(command.Repositories)
 		evaluationContext.RepositoryPaths = command.Repositories
 	}
 

diff --git a/cmd/eval-dev-quality/cmd/evaluate_test.go b/cmd/eval-dev-quality/cmd/evaluate_test.go
@@ -191,6 +191,8 @@ func TestEvaluateExecute(t *testing.T) {
 			Arguments: []string{
 				"--language", "golang",
 				"--model", "symflower/symbolic-execution",
+				"--repository", filepath.Join("golang", "plain"),
+				"--repository", filepath.Join("java", "plain"),
 			},
 
 			ExpectedOutputValidate: func(t *testing.T, output string, resultPath string) {
@@ -270,6 +272,8 @@ func TestEvaluateExecute(t *testing.T) {
 
 			Arguments: []string{
 				"--model", "symflower/symbolic-execution",
+				"--repository", filepath.Join("golang", "plain"),
+				"--repository", filepath.Join("java", "plain"),
 			},
 
 			ExpectedOutputValidate: func(t *testing.T, output string, resultPath string) {
@@ -720,6 +724,7 @@ func TestEvaluateExecute(t *testing.T) {
 		Arguments: []string{
 			"--language", "golang",
 			"--model", "symflower/symbolic-execution",
+			"--repository", filepath.Join("golang", "plain"),
 		},
 
 		ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
@@ -742,6 +747,7 @@ func TestEvaluateExecute(t *testing.T) {
 		Arguments: []string{
 			"--language", "golang",
 			"--model", "symflower/symbolic-execution",
+			"--repository", filepath.Join("golang", "plain"),
 		},
 
 		ExpectedResultFiles: map[string]func(t *testing.T, filePath string, data string){
@@ -918,4 +924,25 @@ func TestEvaluateInitialize(t *testing.T) {
 			}, context.Languages)
 		},
 	})
+	validate(t, &testCase{
+		Name: "Selecting no repository defaults to all",
+
+		Command: makeValidCommand(func(command *Evaluate) {
+			command.Repositories = []string{}
+		}),
+
+		ValidateCommand: func(t *testing.T, command *Evaluate) {
+			// Check if all Go repositories are indeed selected.
+			directories, err := os.ReadDir(filepath.Join("..", "..", "..", "testdata", "golang"))
+			require.NoError(t, err)
+			relativeRepositoryPath := make([]string, len(directories))
+			for i, directory := range directories {
+				relativeRepositoryPath[i] = filepath.Join("golang", directory.Name())
+			}
+
+			for _, golangRepository := range relativeRepositoryPath {
+				assert.Contains(t, command.Repositories, golangRepository)
+			}
+		},
+	})
 }