From b7500a8d08d0c1cda76344517a1cb0d534dcd846 Mon Sep 17 00:00:00 2001 From: Amir Hossein <77993374+Kamandlou@users.noreply.github.com> Date: Fri, 2 Sep 2022 10:31:55 +0430 Subject: [PATCH] unhandled error in hooks test (#2070) * fix unhandled errors * fix unhandled error in cache package test * omit variable type * omit variable type * rename variable because collide with the imported package name * handle file error on closing * fix unhandled in common_linux.go * fix unhandled errors in helpers_test.go * fix unhandled errors in listen_test.go * remove unused parameter in emptyHandler method * refactor path.go * unhandled error in hooks test --- hooks_test.go | 16 ++++++++++------ path.go | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hooks_test.go b/hooks_test.go index 5a800920d2..5ed9d82145 100644 --- a/hooks_test.go +++ b/hooks_test.go @@ -42,7 +42,8 @@ func Test_Hook_OnName(t *testing.T) { defer bytebufferpool.Put(buf) app.Hooks().OnName(func(r Route) error { - buf.WriteString(r.Name) + _, err := buf.WriteString(r.Name) + utils.AssertEqual(t, nil, err) return nil }) @@ -84,8 +85,8 @@ func Test_Hook_OnGroup(t *testing.T) { defer bytebufferpool.Put(buf) app.Hooks().OnGroup(func(g Group) error { - buf.WriteString(g.Prefix) - + _, err := buf.WriteString(g.Prefix) + utils.AssertEqual(t, nil, err) return nil }) @@ -104,7 +105,8 @@ func Test_Hook_OnGroupName(t *testing.T) { defer bytebufferpool.Put(buf) app.Hooks().OnGroupName(func(g Group) error { - buf.WriteString(g.name) + _, err := buf.WriteString(g.name) + utils.AssertEqual(t, nil, err) return nil }) @@ -143,7 +145,8 @@ func Test_Hook_OnShutdown(t *testing.T) { defer bytebufferpool.Put(buf) app.Hooks().OnShutdown(func() error { - buf.WriteString("shutdowning") + _, err := buf.WriteString("shutdowning") + utils.AssertEqual(t, nil, err) return nil }) @@ -163,7 +166,8 @@ func Test_Hook_OnListen(t *testing.T) { defer bytebufferpool.Put(buf) app.Hooks().OnListen(func() error { - buf.WriteString("ready") + _, err := buf.WriteString("ready") + utils.AssertEqual(t, nil, err) return nil }) diff --git a/path.go b/path.go index 2b9e0e4524..27f09f5f9e 100644 --- a/path.go +++ b/path.go @@ -60,7 +60,7 @@ const ( paramConstraintDataSeparator byte = ',' // separator of datas of type constraint for a parameter ) -// parameter constraint types +// TypeConstraint parameter constraint types type TypeConstraint int16 type Constraint struct { @@ -259,7 +259,7 @@ func (routeParser *routeParser) analyseParameterPart(pattern string) (string, *r // Check has constraint var constraints []*Constraint - if hasConstraint := (parameterConstraintStart != -1 && parameterConstraintEnd != -1); hasConstraint { + if hasConstraint := parameterConstraintStart != -1 && parameterConstraintEnd != -1; hasConstraint { constraintString := pattern[parameterConstraintStart+1 : parameterConstraintEnd] userConstraints := splitNonEscaped(constraintString, string(parameterConstraintSeparatorChars)) constraints = make([]*Constraint, 0, len(userConstraints))