From edaff0ec0677c15a4ba572d14c0a8b25c41034a4 Mon Sep 17 00:00:00 2001 From: WA Date: Wed, 4 Jun 2025 12:04:01 +0200 Subject: [PATCH] xxy --- tests/t_test.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/t_test.go b/tests/t_test.go index cd328ef..a7fe4b3 100644 --- a/tests/t_test.go +++ b/tests/t_test.go @@ -31,7 +31,7 @@ const lifet = 180 var sm *session.Manager //current session impl. var testserver *httptest.Server //httptest server h2 var testclient *http.Client //httptest client h2 -var cursid string +//var cursid string type TestServer struct{} @@ -46,6 +46,7 @@ func (ts *TestServer) Serve() { mux.HandleFunc("/deletesessionvar", ts.deleteSessionValue) mux.HandleFunc("/validatedeletedvar", ts.validateDeletedValue) mux.HandleFunc("/sessionGC", ts.sessionGC) //ck + mux.HandleFunc("/", ts.root) testserver = httptest.NewUnstartedServer(mux) testserver.EnableHTTP2 = true testserver.StartTLS() @@ -136,7 +137,6 @@ func (ts *TestServer) validateUpdatedValue(w http.ResponseWriter, r *http.Reques if sess, err = sm.SessionStart(w, r); err != nil { io.WriteString(w, err.Error()) } - fmt.Println(sess) var n any if n, err = sess.Get("Vek"); err != nil { io.WriteString(w, err.Error()) @@ -184,6 +184,10 @@ func (ts *TestServer) sessionGC(w http.ResponseWriter, r *http.Request) { io.WriteString(w, "OK") } +func (ts *TestServer) root(w http.ResponseWriter, r *http.Request) { + +} + func MkRequest(method, path string) (body []byte, err error) { var req *http.Request uri := fmt.Sprintf("%s%s", testserver.URL, path) @@ -197,7 +201,7 @@ func MkRequest(method, path string) (body []byte, err error) { return io.ReadAll(res.Body) } -func CheckRequest(path string) (err error) { +func CheckRequestOK(path string) (err error) { var res []byte if res, err = MkRequest("GET", path); err != nil { return fmt.Errorf("Make request: %s failed: %v", path, err) @@ -209,7 +213,7 @@ func CheckRequest(path string) (err error) { } func t1(t *testing.T) { - if err := CheckRequest("/startsession"); err != nil { + if err := CheckRequestOK("/startsession"); err != nil { t.Error(err) } uri, _ := url.Parse(testserver.URL + "/startsession") @@ -220,7 +224,7 @@ func t1(t *testing.T) { } func t2(t *testing.T) { - if err := CheckRequest("/destroysession"); err != nil { + if err := CheckRequestOK("/destroysession"); err != nil { t.Error(err) } uri, _ := url.Parse(testserver.URL + "/destroysession") @@ -231,43 +235,43 @@ func t2(t *testing.T) { } func t3(t *testing.T) { - if err := CheckRequest("/setsessionvar"); err != nil { + if err := CheckRequestOK("/setsessionvar"); err != nil { t.Error(err) } } func t4(t *testing.T) { - if err := CheckRequest("/getsessionvar"); err != nil { + if err := CheckRequestOK("/getsessionvar"); err != nil { t.Error(err) } } func t5(t *testing.T) { - if err := CheckRequest("/updatesessionvar"); err != nil { + if err := CheckRequestOK("/updatesessionvar"); err != nil { t.Error(err) } } func t6(t *testing.T) { - if err := CheckRequest("/validateupdatedvar"); err != nil { + if err := CheckRequestOK("/validateupdatedvar"); err != nil { t.Error(err) } } func t7(t *testing.T) { - if err := CheckRequest("/deletesessionvar"); err != nil { + if err := CheckRequestOK("/deletesessionvar"); err != nil { t.Error(err) } } func t8(t *testing.T) { - if err := CheckRequest("/validatedeletedvar"); err != nil { + if err := CheckRequestOK("/validatedeletedvar"); err != nil { t.Error(err) } } func t9(t *testing.T) { - if err := CheckRequest("/sessionGC"); err != nil { + if err := CheckRequestOK("/sessionGC"); err != nil { t.Error(err) } //TODO check ck invalidation