diff --git a/go.sum b/go.sum index 1026877..bd6f62f 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,7 @@ golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -15,6 +16,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/nrseg_test.go b/nrseg_test.go new file mode 100644 index 0000000..971d57e --- /dev/null +++ b/nrseg_test.go @@ -0,0 +1,95 @@ +package nrseg + +import ( + "io" + "io/ioutil" + "os" + "path/filepath" + "testing" + + "github.com/google/go-cmp/cmp" +) + +func TestNrseg_run(t *testing.T) { + type fields struct { + path string + outStream io.Writer + errStream io.Writer + } + tests := [...]struct { + name string + want string + fields fields + }{ + { + name: "basic", + want: "./testdata/want", + fields: fields{ + path: "./testdata/input", + outStream: os.Stdout, + errStream: os.Stderr, + }, + }, + } + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + dist := os.TempDir() + n := &nrseg{ + in: tt.fields.path, + dist: dist, + outStream: tt.fields.outStream, + errStream: tt.fields.errStream, + } + if err := n.run(); err != nil { + t.Fatalf("run() error = %v", err) + } + // validate(t, dist, tt.want) + validate(t, n.in, tt.want) + }) + } +} + +func validate(t *testing.T, gotpath, wantpath string) { + filepath.Walk(gotpath, func(path string, info os.FileInfo, err error) error { + if info.IsDir() { + return nil + } + if filepath.Ext(path) != ".go" { + return nil + } + rel, err := filepath.Rel(gotpath, path) + if err != nil { + t.Errorf("fileapth.Rel(): not want error at %q: %v", path, err) + return err + } + wfp := filepath.Join(wantpath, rel) + wf, err := os.Open(wfp) + if err != nil { + t.Errorf("cannot open the wanted file %q: %v", path, err) + return err + } + defer wf.Close() + want, err := ioutil.ReadAll(wf) + if err != nil { + t.Errorf("cannot read the wanted file %q: %v", path, err) + return err + } + + gf, err := os.Open(path) + if err != nil { + t.Errorf("cannot read the got file %q: %v", path, err) + return err + } + got, err := ioutil.ReadAll(gf) + if err != nil { + t.Errorf("cannot read the got file %q: %v", path, err) + return err + } + if diff := cmp.Diff(got, want); len(diff) != 0 { + t.Errorf("%q -got +want %v", path, diff) + } + + return nil + }) +} diff --git a/testdata/input/basic.go b/testdata/input/basic.go new file mode 100644 index 0000000..b984bd2 --- /dev/null +++ b/testdata/input/basic.go @@ -0,0 +1,23 @@ +package input + +import ( + "context" + "fmt" + "net/http" +) + +type S struct{} + +func (s *S) SampleMethod(ctx context.Context) { + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleFunc(ctx context.Context) { + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleHandler(w http.ResponseWriter, req *http.Request) { + fmt.Fprintf(w, "Hello, %q", req.URL.Path) +} diff --git a/testdata/input/go.mod b/testdata/input/go.mod new file mode 100644 index 0000000..174e624 --- /dev/null +++ b/testdata/input/go.mod @@ -0,0 +1,3 @@ +module github.com/budougumi0617/nrseg/testdata/input + +go 1.15 diff --git a/testdata/input/go.sum b/testdata/input/go.sum new file mode 100644 index 0000000..e69de29 diff --git a/testdata/input/testdata/must_not_change.go b/testdata/input/testdata/must_not_change.go new file mode 100644 index 0000000..1b5b109 --- /dev/null +++ b/testdata/input/testdata/must_not_change.go @@ -0,0 +1,23 @@ +package main + +import ( + "context" + "fmt" + "net/http" +) + +type MustNotChange struct{} + +func (m *MustNotChange) SampleMethod(ctx context.Context) { + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleFunc(ctx context.Context) { + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleHandler(w http.ResponseWriter, req *http.Request) { + fmt.Fprintf(w, "Hello, %q", req.URL.Path) +} diff --git a/testdata/want/basic.go b/testdata/want/basic.go new file mode 100644 index 0000000..bb23ad1 --- /dev/null +++ b/testdata/want/basic.go @@ -0,0 +1,28 @@ +package input + +import ( + "context" + "fmt" + "net/http" + + "github.com/newrelic/go-agent/v3/newrelic" +) + +type S struct{} + +func (s *S) SampleMethod(ctx context.Context) { + defer newrelic.FromContext(ctx).StartSegment("sample_method").End() + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleFunc(ctx context.Context) { + defer newrelic.FromContext(ctx).StartSegment("sample_func").End() + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleHandler(w http.ResponseWriter, req *http.Request) { + defer newrelic.FromContext(req.Context()).StartSegment("sample_handler").End() + fmt.Fprintf(w, "Hello, %q", req.URL.Path) +} diff --git a/testdata/want/go.mod b/testdata/want/go.mod new file mode 100644 index 0000000..4427fd1 --- /dev/null +++ b/testdata/want/go.mod @@ -0,0 +1,5 @@ +module github.com/budougumi0617/nrseg/testdata/want + +go 1.15 + +require github.com/newrelic/go-agent/v3 v3.9.0 // indirect diff --git a/testdata/want/go.sum b/testdata/want/go.sum new file mode 100644 index 0000000..4f393c4 --- /dev/null +++ b/testdata/want/go.sum @@ -0,0 +1,52 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/newrelic/go-agent v1.11.0 h1:jnd8+H6dB+93UTJHFT1wJoij5spKNN/xZ0nkw0kvt7o= +github.com/newrelic/go-agent v3.9.0+incompatible h1:W2Zummx9jNATZVX6QVjYksX1TwxJGf4E6x1Wf3CG/jY= +github.com/newrelic/go-agent/v3 v3.9.0 h1:5bcTbdk/Up5cIYIkQjCG92Y+uNoett9wmhuz4kPiFlM= +github.com/newrelic/go-agent/v3 v3.9.0/go.mod h1:1A1dssWBwzB7UemzRU6ZVaGDsI+cEn5/bNxI0wiYlIc= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/testdata/want/testdata/must_not_change.go b/testdata/want/testdata/must_not_change.go new file mode 100644 index 0000000..1b5b109 --- /dev/null +++ b/testdata/want/testdata/must_not_change.go @@ -0,0 +1,23 @@ +package main + +import ( + "context" + "fmt" + "net/http" +) + +type MustNotChange struct{} + +func (m *MustNotChange) SampleMethod(ctx context.Context) { + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleFunc(ctx context.Context) { + fmt.Println("Hello, playground") + fmt.Println("end function") +} + +func SampleHandler(w http.ResponseWriter, req *http.Request) { + fmt.Fprintf(w, "Hello, %q", req.URL.Path) +}