From fd83011445094b9d8902def5207dbb1fc01f92b4 Mon Sep 17 00:00:00 2001 From: lash Date: Sat, 11 Jan 2025 15:02:03 +0000 Subject: [PATCH] Rehabilitate mock tests --- africastalking/server.go | 17 +++++++++++++++-- africastalking/server_test.go | 26 ++++++++++++-------------- go.mod | 5 +---- go.sum | 12 ++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/africastalking/server.go b/africastalking/server.go index 09578b4..370c73e 100644 --- a/africastalking/server.go +++ b/africastalking/server.go @@ -3,6 +3,7 @@ package at import ( "io" "net/http" + "strconv" "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/visedriver/request" @@ -14,12 +15,13 @@ var ( ) type ATSessionHandler struct { - *request.SessionHandler + //*httpsession.SessionHandler + request.RequestHandler } func NewATSessionHandler(h request.RequestHandler) *ATSessionHandler { return &ATSessionHandler{ - SessionHandler: request.ToSessionHandler(h), + RequestHandler: h, } } @@ -96,3 +98,14 @@ func (ash *ATSessionHandler) Output(rqs request.RequestSession) (request.Request _, err = rqs.Engine.Flush(rqs.Ctx, rqs.Writer) return rqs, err } + +func (ash *ATSessionHandler) WriteError(w http.ResponseWriter, code int, err error) { + s := err.Error() + w.Header().Set("Content-Length", strconv.Itoa(len(s))) + w.WriteHeader(code) + _, err = w.Write([]byte(s)) + if err != nil { + logg.Errorf("error writing error!!", "err", err, "olderr", s) + w.WriteHeader(500) + } +} diff --git a/africastalking/server_test.go b/africastalking/server_test.go index a8477b0..9ef7a9e 100644 --- a/africastalking/server_test.go +++ b/africastalking/server_test.go @@ -16,18 +16,18 @@ import ( "git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks" ) -func TestNewATSessionHandler(t *testing.T) { - mockHandler := &httpmocks.MockRequestHandler{} - ash := NewATSessionHandler(mockHandler) - - if ash == nil { - t.Fatal("NewATSessionHandler returned nil") - } - - if ash.SessionHandler == nil { - t.Fatal("SessionHandler is nil") - } -} +//func TestNewATSessionHandler(t *testing.T) { +// mockHandler := &httpmocks.MockRequestHandler{} +// ash := NewATSessionHandler(mockHandler) +// +// if ash == nil { +// t.Fatal("NewATSessionHandler returned nil") +// } +// +// if ash.HTTPRequestHandler == nil { +// t.Fatal("SessionHandler is nil") +// } +//} func TestATSessionHandler_ServeHTTP(t *testing.T) { tests := []struct { @@ -231,5 +231,3 @@ func TestATSessionHandler_Output(t *testing.T) { }) } } - - diff --git a/go.mod b/go.mod index 2096474..16bcbc4 100644 --- a/go.mod +++ b/go.mod @@ -4,21 +4,18 @@ go 1.23.0 require ( git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d - git.grassecon.net/grassrootseconomics/visedriver lash/purify-max + git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250111083710-dff662663d5a ) require ( - github.com/alecthomas/participle/v2 v2.0.0 // indirect github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect - github.com/grassrootseconomics/eth-custodial v1.3.0-beta // indirect github.com/grassrootseconomics/ussd-data-service v1.2.0-beta // indirect github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.7.1 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/joho/godotenv v1.5.1 // indirect github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/crypto v0.27.0 // indirect diff --git a/go.sum b/go.sum index 05d6647..3a0f348 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,9 @@ git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d h1:bPAOVZOX4frSGhfOdcj7kc555f8dc9DmMd2YAyC2AMw= git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= -git.grassecon.net/urdt/ussd v0.8.0-beta.11.0.20250109134950-b9712098eff5 h1:xDmrSUzN2IdfHt4C0gKGidACqI7t7+bKakiS+Qrd+tA= -git.grassecon.net/urdt/ussd v0.8.0-beta.11.0.20250109134950-b9712098eff5/go.mod h1:Xct45L7FUE4pYtLN4gmhkMCoafUNpcOJ7horP9kPDAc= +git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250111083710-dff662663d5a h1:diTfcG3r+gGX/QxzlkMk3usWcS+Hcf9IdBaoLWzcMk0= +git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250111083710-dff662663d5a/go.mod h1:E6W7ZOa7ZvVr0Bc5ot0LNSwpSPYq4hXlAIvEPy3AJ7U= github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= -github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g= -github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y= github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE= @@ -15,8 +13,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88= github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= -github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU= -github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo= github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk= github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0= github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo= @@ -31,8 +27,6 @@ github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs= github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY= github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk= github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s= @@ -43,8 +37,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=