From d98b6318ace5f8a00a6d1776be2e78782f7eb429 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:37:42 +0200 Subject: [bugfix] Use gtserror package for WrongType errs (#1930) * [bugfix] Use gtserror package for WrongType errs * test --- internal/ap/normalize_test.go | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'internal/ap/normalize_test.go') diff --git a/internal/ap/normalize_test.go b/internal/ap/normalize_test.go index 2c9a1907a..cde807f21 100644 --- a/internal/ap/normalize_test.go +++ b/internal/ap/normalize_test.go @@ -18,48 +18,16 @@ package ap_test import ( - "context" - "encoding/json" "testing" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/activity/streams" "github.com/superseriousbusiness/activity/streams/vocab" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/testrig" ) type NormalizeTestSuite struct { - suite.Suite -} - -func (suite *NormalizeTestSuite) jsonToType(rawJson string) (vocab.Type, map[string]interface{}) { - var raw map[string]interface{} - err := json.Unmarshal([]byte(rawJson), &raw) - if err != nil { - panic(err) - } - - t, err := streams.ToType(context.Background(), raw) - if err != nil { - panic(err) - } - - return t, raw -} - -func (suite *NormalizeTestSuite) typeToJson(t vocab.Type) string { - m, err := ap.Serialize(t) - if err != nil { - suite.FailNow(err.Error()) - } - - b, err := json.MarshalIndent(m, "", " ") - if err != nil { - suite.FailNow(err.Error()) - } - - return string(b) + APTestSuite } func (suite *NormalizeTestSuite) getStatusable() (vocab.ActivityStreamsNote, map[string]interface{}) { -- cgit v1.2.3