Skip to content

More golint #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 14, 2018
Merged

More golint #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3349966
err declaration shadowed.
taik0 Mar 13, 2018
6270141
Must check agains %T (type), not %t.
taik0 Mar 13, 2018
3066a63
error strings should not end with punctuation
taik0 Mar 13, 2018
ea86a8b
Unreachable code.
taik0 Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,4 @@ func (g generatorWatchWrapper) Watch(c *cobra.Command, p []string) error {
return err
}
}

return nil
}
14 changes: 7 additions & 7 deletions cmd/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ func Test_defaultGeneratorFactory(t *testing.T) {
switch g.(type) {
case *generator.BasicGenerator:
default:
t.Errorf("unexpected generator type: %t", g)
t.Errorf("unexpected generator type: %T", g)
}
}

func Test_generatorWrapper_koErroredGenerator(t *testing.T) {
expectedError := fmt.Errorf("expect me!")
expectedError := fmt.Errorf("expect me")

subject := generatorWrapper{func(_, _ string) generator.Generator {
return erroredGenerator{expectedError}
Expand Down Expand Up @@ -101,7 +101,7 @@ func Test_generatorWrapper(t *testing.T) {
}

func Test_generatorWatchWrapper_koErroredGenerator(t *testing.T) {
expectedError := fmt.Errorf("expect me!")
expectedError := fmt.Errorf("expect me")

subject := generatorWatchWrapper{generatorWrapper{func(_, _ string) generator.Generator {
return erroredGenerator{expectedError}
Expand All @@ -122,7 +122,7 @@ func Test_generatorWatchWrapper_koErroredGeneratorAfterChange(t *testing.T) {
}
defer os.RemoveAll(name)

expectedError := fmt.Errorf("expect me!")
expectedError := fmt.Errorf("expect me")
var counter uint64
isos = "*"
basePath = name
Expand Down Expand Up @@ -155,10 +155,10 @@ func Test_generatorWatchWrapper_koErroredGeneratorAfterChange(t *testing.T) {
wg := &sync.WaitGroup{}
go func() {
wg.Add(1)
if err := subject.Watch(nil, []string{}); err == nil {
if werr := subject.Watch(nil, []string{}); werr == nil {
t.Error("expecting error!")
} else if err != expectedError {
t.Errorf("unexpected error! want: %s, got: %s", expectedError.Error(), err.Error())
} else if werr != expectedError {
t.Errorf("unexpected error! want: %s, got: %s", expectedError.Error(), werr.Error())
}
wg.Done()
}()
Expand Down
10 changes: 5 additions & 5 deletions cmd/serve_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ func Test_defaultEngineFactory(t *testing.T) {
t.Error(err)
return
}
if err := json.NewEncoder(f).Encode(&cfg); err != nil {
t.Error(err)
if jerr := json.NewEncoder(f).Encode(&cfg); jerr != nil {
t.Error(jerr)
return
}
f.Close()
Expand All @@ -34,12 +34,12 @@ func Test_defaultEngineFactory(t *testing.T) {
switch g.(type) {
case *gin.Engine:
default:
t.Errorf("unexpected engine type: %t", g)
t.Errorf("unexpected engine type: %T", g)
}
}

func Test_serveWrapper_koErroredEngineFactory(t *testing.T) {
expectedError := fmt.Errorf("expect me!")
expectedError := fmt.Errorf("expect me")
subject := serveWrapper{erroredEngineFactory(expectedError)}

if err := subject.Serve(nil, []string{}); err == nil {
Expand All @@ -62,7 +62,7 @@ func Test_serveWrapper_koErroredEngine(t *testing.T) {
return
}

expectedError := fmt.Errorf("expect me!")
expectedError := fmt.Errorf("expect me")
subject = serveWrapper{customEngineFactory(erroredEngine{expectedError})}

if err := subject.Serve(nil, []string{}); err == nil {
Expand Down