Allow protofiles to be specified by fullpath (#129)

* Allow protofiles to be specified by fullpath Signed-off-by: Ricardo Seriani <[email protected]> * Remove helper func testdata and refactor tests Signed-off-by: Ricardo Seriani <[email protected]>
ktr0731 · Nov 15, 2018 · 0fa49ad · 0fa49ad
1 parent 267b27c
commit 0fa49ad
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/adapter/internal/protoparser/parser.go b/adapter/internal/protoparser/parser.go
@@ -6,8 +6,6 @@ import (
 )
 
 func ParseFile(fnames []string, paths []string) ([]*desc.FileDescriptor, error) {
-	paths = append(paths, ".")
-
 	p := &protoparse.Parser{
 		ImportPaths: paths,
 	}

diff --git a/adapter/protobuf/message_test.go b/adapter/protobuf/message_test.go
@@ -47,7 +47,7 @@ func TestMessage(t *testing.T) {
 	})
 
 	t.Run("importing", func(t *testing.T) {
-		libraryProto := testdata("importing", "library.proto")
+		libraryProto := "library.proto"
 		d, err := protoparser.ParseFile([]string{libraryProto}, []string{"testdata/importing"})
 		require.NoError(t, err)
 

diff --git a/adapter/protobuf/parser_test.go b/adapter/protobuf/parser_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestParseFile(t *testing.T) {
 	t.Run("importing", func(t *testing.T) {
-		fnames := []string{testdata("importing", "library.proto")}
+		fnames := []string{"library.proto"}
 		pkgs, err := ParseFile(fnames, []string{"testdata/importing"})
 		require.NoError(t, err)
 		assert.Len(t, pkgs, 1)

diff --git a/adapter/protobuf/protobuf_test.go b/adapter/protobuf/protobuf_test.go
@@ -43,7 +43,3 @@ func toEntitiesFrom(files []*desc.FileDescriptor) ([]*entity.Package, error) {
 
 	return pkgs, nil
 }
-
-func testdata(s ...string) string {
-	return filepath.Join(append([]string{"testdata"}, s...)...)
-}