Add test for prototool files (uber#432)

sakshamsaxena · Apr 15, 2019 · 30bfb8c · 30bfb8c
1 parent 7940d2e
commit 30bfb8c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/internal/cmd/cmd_test.go b/internal/cmd/cmd_test.go
@@ -1737,6 +1737,11 @@ func TestDiffLintGroups(t *testing.T) {
 	)
 }
 
+func TestFiles(t *testing.T) {
+	assertExact(t, false, false, 0, `testdata/foo/bar/dep.proto
+testdata/foo/success.proto`, "files", "testdata/foo")
+}
+
 func TestGenerateDescriptorSetSameDirAsConfigFile(t *testing.T) {
 	t.Parallel()
 	// https://github.com/uber/prototool/issues/389

diff --git a/internal/exec/runner.go b/internal/exec/runner.go
@@ -221,15 +221,20 @@ func (r *runner) Files(args []string) error {
 	if err != nil {
 		return err
 	}
+	var allFiles []string
 	for dirPath, files := range meta.ProtoSet.DirPathToFiles {
 		// skip those files not under the directory
 		if !strings.HasPrefix(dirPath, meta.ProtoSet.DirPath) {
 			continue
 		}
 		for _, file := range files {
-			if err := r.println(file.DisplayPath); err != nil {
-				return err
-			}
+			allFiles = append(allFiles, file.DisplayPath)
+		}
+	}
+	sort.Strings(allFiles)
+	for _, file := range allFiles {
+		if err := r.println(file); err != nil {
+			return err
 		}
 	}
 	return nil