From b06eba3df09a8fcd777b8fe350c2b184758963d1 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:10:14 -0500 Subject: Use checkmate for tests --- internal/sqlparse/sqlparse_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/sqlparse') diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 51b93b1..644a79f 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/eugenetriguba/bolt/internal/sqlparse" - "gotest.tools/v3/assert" + "github.com/eugenetriguba/checkmate" ) func TestSqlParser_Parse(t *testing.T) { @@ -49,8 +49,8 @@ func TestSqlParser_Parse(t *testing.T) { sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) execOptions, err := sqlParser.Parse() - assert.NilError(t, err) + checkmate.AssertNil(t, err) - assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) + checkmate.AssertDeepEqual(t, execOptions, tc.expectedExecutionOptions) } } -- cgit v1.2.3 From 345e28bd44ba6a38bf7ee9bfe2066f333bbbe894 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:29:00 -0500 Subject: Update to checkmate v0.2.0 --- internal/sqlparse/sqlparse_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/sqlparse') diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 644a79f..17e2f10 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/eugenetriguba/bolt/internal/sqlparse" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestSqlParser_Parse(t *testing.T) { @@ -49,8 +49,8 @@ func TestSqlParser_Parse(t *testing.T) { sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) execOptions, err := sqlParser.Parse() - checkmate.AssertNil(t, err) + assert.Nil(t, err) - checkmate.AssertDeepEqual(t, execOptions, tc.expectedExecutionOptions) + assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) } } -- cgit v1.2.3 From 8aa1cc45980e12c7fb7de25419af358a784f80c6 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 17:28:44 -0500 Subject: Add sqlparse scanner error condition test --- internal/sqlparse/sqlparse_test.go | 40 +++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) (limited to 'internal/sqlparse') diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 17e2f10..5fe58fa 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -1,6 +1,9 @@ package sqlparse_test import ( + "bytes" + "errors" + "io" "strings" "testing" @@ -9,12 +12,10 @@ import ( ) func TestSqlParser_Parse(t *testing.T) { - type test struct { + testCases := []struct { buffer string expectedExecutionOptions *sqlparse.ExecutionOptions - } - - tests := []test{ + }{ { buffer: "-- bolt: no-transaction", expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, @@ -45,7 +46,7 @@ func TestSqlParser_Parse(t *testing.T) { }, } - for _, tc := range tests { + for _, tc := range testCases { sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) execOptions, err := sqlParser.Parse() @@ -54,3 +55,32 @@ func TestSqlParser_Parse(t *testing.T) { assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) } } + +type ErrReader struct { + Reader io.Reader + ErrCond string +} + +func (er *ErrReader) Read(p []byte) (int, error) { + n, err := er.Reader.Read(p) + if err != nil { + return n, err + } + + if bytes.Contains(p[:n], []byte(er.ErrCond)) { + return n, errors.New("error: unwanted input encountered") + } + + return n, nil +} + +func TestSqlParserParseError(t *testing.T) { + reader := &ErrReader{ + Reader: strings.NewReader(" "), + ErrCond: " ", + } + sqlParser := sqlparse.NewSqlParser(reader) + _, err := sqlParser.Parse() + assert.NotNil(t, err) + assert.ErrorContains(t, err, "unwanted input encountered") +} -- cgit v1.2.3 From fb84192eef75c909d031aa867d407f1b7797e9db Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 19:57:15 -0500 Subject: Add more wrapped errors --- internal/sqlparse/sqlparse.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'internal/sqlparse') diff --git a/internal/sqlparse/sqlparse.go b/internal/sqlparse/sqlparse.go index 9ded618..25960c5 100644 --- a/internal/sqlparse/sqlparse.go +++ b/internal/sqlparse/sqlparse.go @@ -2,6 +2,7 @@ package sqlparse import ( "bufio" + "fmt" "io" "strings" ) @@ -37,7 +38,7 @@ func (sp *SqlParser) Parse() (*ExecutionOptions, error) { } if err := scanner.Err(); err != nil { - return nil, err + return nil, fmt.Errorf("parsing sql file encountered an error: %w", err) } return options, nil -- cgit v1.2.3 From bf1d3b3e1fc42132678b244e479839416a03a6ce Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 29 Feb 2024 19:53:20 -0500 Subject: Add service tests --- internal/sqlparse/sqlparse.go | 18 ++++++++++-------- internal/sqlparse/sqlparse_test.go | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'internal/sqlparse') diff --git a/internal/sqlparse/sqlparse.go b/internal/sqlparse/sqlparse.go index 25960c5..e986068 100644 --- a/internal/sqlparse/sqlparse.go +++ b/internal/sqlparse/sqlparse.go @@ -7,22 +7,24 @@ import ( "strings" ) -type SqlParser struct { - reader io.Reader +type SqlParser interface { + Parse(reader io.Reader) (ExecutionOptions, error) } type ExecutionOptions struct { UseTransaction bool } -func NewSqlParser(reader io.Reader) *SqlParser { - return &SqlParser{reader: reader} +type sqlParser struct{} + +func NewSqlParser() SqlParser { + return sqlParser{} } -func (sp *SqlParser) Parse() (*ExecutionOptions, error) { - options := &ExecutionOptions{UseTransaction: true} +func (sp sqlParser) Parse(reader io.Reader) (ExecutionOptions, error) { + options := ExecutionOptions{UseTransaction: true} - scanner := bufio.NewScanner(sp.reader) + scanner := bufio.NewScanner(reader) if scanner.Scan() { firstLine := strings.ToLower(strings.TrimSpace(scanner.Text())) if strings.HasPrefix(firstLine, "-- bolt:") { @@ -38,7 +40,7 @@ func (sp *SqlParser) Parse() (*ExecutionOptions, error) { } if err := scanner.Err(); err != nil { - return nil, fmt.Errorf("parsing sql file encountered an error: %w", err) + return options, fmt.Errorf("parsing sql file encountered an error: %w", err) } return options, nil diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 5fe58fa..12a435d 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -14,42 +14,42 @@ import ( func TestSqlParser_Parse(t *testing.T) { testCases := []struct { buffer string - expectedExecutionOptions *sqlparse.ExecutionOptions + expectedExecutionOptions sqlparse.ExecutionOptions }{ { buffer: "-- bolt: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: false}, }, { buffer: "-- BOLT: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: false}, }, { buffer: "\n-- bolt: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "--bolt: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "-- bolt : no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "-- bolt: no-transaction no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: false}, }, } for _, tc := range testCases { - sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) + sqlParser := sqlparse.NewSqlParser() - execOptions, err := sqlParser.Parse() + execOptions, err := sqlParser.Parse(strings.NewReader(tc.buffer)) assert.Nil(t, err) assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) @@ -79,8 +79,8 @@ func TestSqlParserParseError(t *testing.T) { Reader: strings.NewReader(" "), ErrCond: " ", } - sqlParser := sqlparse.NewSqlParser(reader) - _, err := sqlParser.Parse() + sqlParser := sqlparse.NewSqlParser() + _, err := sqlParser.Parse(reader) assert.NotNil(t, err) assert.ErrorContains(t, err, "unwanted input encountered") } -- cgit v1.2.3