From c088a508ab66a1afd574d5b760b4f84bf5bee67e Mon Sep 17 00:00:00 2001 From: Lukasz Janyst Date: Mon, 9 May 2022 17:34:51 +0200 Subject: [PATCH] cleanup: Fix tests --- pkg/message/build_test.go | 126 +++++++++++----------- pkg/pmapi/dialer_pinning_reporter_test.go | 1 - pkg/store/store_test.go | 4 +- pkg/testutil/util.go | 35 ++++++ pkg/users/users_login_test.go | 4 +- pkg/users/users_test.go | 4 +- 6 files changed, 103 insertions(+), 71 deletions(-) create mode 100644 pkg/testutil/util.go diff --git a/pkg/message/build_test.go b/pkg/message/build_test.go index ea09670..654fd09 100644 --- a/pkg/message/build_test.go +++ b/pkg/message/build_test.go @@ -26,9 +26,9 @@ import ( "time" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ljanyst/peroxide/pkg/message/mocks" - tests "github.com/ljanyst/peroxide/test" "github.com/golang/mock/gomock" + "github.com/ljanyst/peroxide/pkg/message/mocks" + "github.com/ljanyst/peroxide/pkg/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -40,7 +40,7 @@ func TestBuildPlainMessage(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -62,7 +62,7 @@ func TestBuildPlainMessageWithLongKey(t *testing.T) { b := NewBuilder(1, 1) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) msg.Header["ReallyVeryVeryVeryVeryVeryLongLongLongLongLongLongLongKeyThatWillHaveNotSoLongValue"] = []string{"value"} @@ -86,7 +86,7 @@ func TestBuildHTMLMessage(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -110,7 +110,7 @@ func TestBuildPlainEncryptedMessage(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-plaintext.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -141,7 +141,7 @@ func TestBuildPlainEncryptedMessageMissingHeader(t *testing.T) { body := readerToString(getFileReader("plaintext-missing-header.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Now()) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -164,7 +164,7 @@ func TestBuildPlainEncryptedMessageInvalidHeader(t *testing.T) { body := readerToString(getFileReader("plaintext-invalid-header.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Now()) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -187,8 +187,8 @@ func TestBuildPlainSignedEncryptedMessageMissingHeader(t *testing.T) { body := readerToString(getFileReader("plaintext-missing-header.eml")) - kr := tests.MakeKeyRing(t) - sig := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) + sig := testutil.MakeKeyRing(t) enc, err := kr.Encrypt(crypto.NewPlainMessageFromString(body), sig) require.NoError(t, err) @@ -230,8 +230,8 @@ func TestBuildPlainSignedEncryptedMessageInvalidHeader(t *testing.T) { body := readerToString(getFileReader("plaintext-invalid-header.eml")) - kr := tests.MakeKeyRing(t) - sig := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) + sig := testutil.MakeKeyRing(t) enc, err := kr.Encrypt(crypto.NewPlainMessageFromString(body), sig) require.NoError(t, err) @@ -273,7 +273,7 @@ func TestBuildPlainEncryptedLatin2Message(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-plaintext-latin2.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -301,7 +301,7 @@ func TestBuildHTMLEncryptedMessage(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-html.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -333,8 +333,8 @@ func TestBuildPlainSignedMessage(t *testing.T) { body := readerToString(getFileReader("text_plain.eml")) - kr := tests.MakeKeyRing(t) - sig := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) + sig := testutil.MakeKeyRing(t) enc, err := kr.Encrypt(crypto.NewPlainMessageFromString(body), sig) require.NoError(t, err) @@ -377,8 +377,8 @@ func TestBuildPlainSignedBase64Message(t *testing.T) { body := readerToString(getFileReader("text_plain_base64.eml")) - kr := tests.MakeKeyRing(t) - sig := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) + sig := testutil.MakeKeyRing(t) enc, err := kr.Encrypt(crypto.NewPlainMessageFromString(body), sig) require.NoError(t, err) @@ -422,7 +422,7 @@ func TestBuildSignedPlainEncryptedMessage(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-signed-plaintext.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -465,7 +465,7 @@ func TestBuildSignedHTMLEncryptedMessage(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-signed-html.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -510,7 +510,7 @@ func TestBuildSignedPlainEncryptedMessageWithPubKey(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-signed-plaintext-with-pubkey.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -562,7 +562,7 @@ func TestBuildSignedHTMLEncryptedMessageWithPubKey(t *testing.T) { body := readerToString(getFileReader("pgp-mime-body-signed-html-with-pubkey.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -615,7 +615,7 @@ func TestBuildSignedMultipartAlternativeEncryptedMessageWithPubKey(t *testing.T) body := readerToString(getFileReader("pgp-mime-body-signed-multipart-alternative-with-pubkey.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -684,7 +684,7 @@ func TestBuildSignedEmbeddedMessageRFC822EncryptedMessageWithPubKey(t *testing.T body := readerToString(getFileReader("pgp-mime-body-signed-embedded-message-rfc822-with-pubkey.eml")) - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -739,7 +739,7 @@ func TestBuildHTMLMessageWithAttachment(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) att := addTestAttachment(t, kr, msg, "attachID", "file.png", "image/png", "attachment", "attachment") @@ -769,7 +769,7 @@ func TestBuildHTMLMessageWithRFC822Attachment(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) att := addTestAttachment(t, kr, msg, "attachID", "file.eml", "message/rfc822", "attachment", "... message/rfc822 ...") @@ -799,7 +799,7 @@ func TestBuildHTMLMessageWithInlineAttachment(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) inl := addTestAttachment(t, kr, msg, "inlineID", "file.png", "image/png", "inline", "inline") @@ -832,7 +832,7 @@ func TestBuildHTMLMessageWithComplexAttachments(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) inl0 := addTestAttachment(t, kr, msg, "inlineID0", "inline0.png", "image/png", "inline", "inline0") inl1 := addTestAttachment(t, kr, msg, "inlineID1", "inline1.png", "image/png", "inline", "inline1") @@ -889,7 +889,7 @@ func TestBuildAttachmentWithExoticFilename(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) att := addTestAttachment(t, kr, msg, "attachID", `I řeally šhould leařn czech.png`, "image/png", "attachment", "attachment") @@ -917,7 +917,7 @@ func TestBuildAttachmentWithLongFilename(t *testing.T) { veryLongName := strings.Repeat("a", 200) + ".png" - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) att := addTestAttachment(t, kr, msg, "attachID", veryLongName, "image/png", "attachment", "attachment") @@ -943,7 +943,7 @@ func TestBuildMessageDate(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -962,7 +962,7 @@ func TestBuildMessageWithInvalidDate(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Create a message with "invalid" (according to applemail) date (before unix time 0). msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Unix(-1, 0)) @@ -1001,7 +1001,7 @@ func TestBuildMessageInternalID(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) @@ -1020,7 +1020,7 @@ func TestBuildMessageExternalID(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Set the message's external ID; this should be used preferentially to set the Message-Id header field. @@ -1042,7 +1042,7 @@ func TestBuild8BitBody(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Set an 8-bit body; the charset should be set to UTF-8. msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "I řeally šhould leařn czech", time.Now()) @@ -1063,7 +1063,7 @@ func TestBuild8BitSubject(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Set an 8-bit subject; it should be RFC2047-encoded. @@ -1087,7 +1087,7 @@ func TestBuild8BitSender(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Set an 8-bit sender; it should be RFC2047-encoded. @@ -1114,7 +1114,7 @@ func TestBuild8BitRecipients(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Set an 8-bit sender; it should be RFC2047-encoded. @@ -1141,7 +1141,7 @@ func TestBuildIncludeMessageIDReference(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Add references. @@ -1175,7 +1175,7 @@ func TestBuildMessageIsDeterministic(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) inl := addTestAttachment(t, kr, msg, "inlineID", "file.png", "image/png", "inline", "inline") att := addTestAttachment(t, kr, msg, "attachID", "attach.png", "image/png", "attachment", "attachment") @@ -1200,7 +1200,7 @@ func TestBuildParallel(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg1 := newTestMessage(t, kr, "messageID1", "addressID", "text/plain", "body1", time.Now()) msg2 := newTestMessage(t, kr, "messageID2", "addressID", "text/plain", "body2", time.Now()) @@ -1228,7 +1228,7 @@ func TestBuildParallelSameMessage(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Jobs for the same messageID are shared so fetcher is only called once. @@ -1258,10 +1258,10 @@ func TestBuildUndecryptableMessage(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Use a different keyring for encrypting the message; it won't be decryptable. - msg := newTestMessage(t, tests.MakeKeyRing(t), "messageID", "addressID", "text/plain", "body", time.Now()) + msg := newTestMessage(t, testutil.MakeKeyRing(t), "messageID", "addressID", "text/plain", "body", time.Now()) job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg), msg.ID, ForegroundPriority) defer done() @@ -1277,11 +1277,11 @@ func TestBuildUndecryptableAttachment(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Use a different keyring for encrypting the attachment; it won't be decryptable. - att := addTestAttachment(t, tests.MakeKeyRing(t), msg, "attachID", "file.png", "image/png", "attachment", "attachment") + att := addTestAttachment(t, testutil.MakeKeyRing(t), msg, "attachID", "file.png", "image/png", "attachment", "attachment") job, done := b.NewJob(context.Background(), newTestFetcher(m, kr, msg, att), msg.ID, ForegroundPriority) defer done() @@ -1297,10 +1297,10 @@ func TestBuildCustomMessagePlain(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Use a different keyring for encrypting the message; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) msg := newTestMessage(t, foreignKR, "messageID", "addressID", "text/plain", "body", time.Now()) // Tell the job to ignore decryption errors; a custom message will be returned instead of an error. @@ -1333,10 +1333,10 @@ func TestBuildCustomMessageHTML(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Use a different keyring for encrypting the message; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) msg := newTestMessage(t, foreignKR, "messageID", "addressID", "text/html", "body", time.Now()) // Tell the job to ignore decryption errors; a custom message will be returned instead of an error. @@ -1369,12 +1369,12 @@ func TestBuildCustomMessageEncrypted(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) body := readerToString(getFileReader("pgp-mime-body-plaintext.eml")) // Use a different keyring for encrypting the message; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) msg := newTestMessage(t, foreignKR, "messageID", "addressID", "multipart/mixed", body, time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC)) msg.Subject = "this is a subject to make sure we preserve subject" @@ -1418,10 +1418,10 @@ func TestBuildCustomMessagePlainWithAttachment(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Use a different keyring for encrypting the message; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) msg := newTestMessage(t, foreignKR, "messageID", "addressID", "text/plain", "body", time.Now()) att := addTestAttachment(t, foreignKR, msg, "attachID", "file.png", "image/png", "attachment", "attachment") @@ -1463,10 +1463,10 @@ func TestBuildCustomMessageHTMLWithAttachment(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Use a different keyring for encrypting the message; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) msg := newTestMessage(t, foreignKR, "messageID", "addressID", "text/html", "body", time.Now()) att := addTestAttachment(t, foreignKR, msg, "attachID", "file.png", "image/png", "attachment", "attachment") @@ -1508,10 +1508,10 @@ func TestBuildCustomMessageOnlyBodyIsUndecryptable(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) // Use a different keyring for encrypting the message; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) msg := newTestMessage(t, foreignKR, "messageID", "addressID", "text/html", "body", time.Now()) // Use the original keyring for encrypting the attachment; it should decrypt fine. @@ -1555,11 +1555,11 @@ func TestBuildCustomMessageOnlyAttachmentIsUndecryptable(t *testing.T) { defer b.Done() // Use the original keyring for encrypting the message; it should decrypt fine. - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "body", time.Now()) // Use a different keyring for encrypting the attachment; it won't be decryptable. - foreignKR := tests.MakeKeyRing(t) + foreignKR := testutil.MakeKeyRing(t) att := addTestAttachment(t, foreignKR, msg, "attachID", "file.png", "image/png", "attachment", "attachment") // Tell the job to ignore decryption errors; a custom message will be returned instead of an error. @@ -1599,7 +1599,7 @@ func TestBuildFetchMessageFail(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Pretend the message cannot be fetched. @@ -1622,7 +1622,7 @@ func TestBuildFetchAttachmentFail(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) _ = addTestAttachment(t, kr, msg, "attachID", "file.png", "image/png", "attachment", "attachment") @@ -1647,7 +1647,7 @@ func TestBuildNoSuchKeyRing(t *testing.T) { b := NewBuilder(2, 2) defer b.Done() - kr := tests.MakeKeyRing(t) + kr := testutil.MakeKeyRing(t) msg := newTestMessage(t, kr, "messageID", "addressID", "text/plain", "body", time.Now()) // Pretend there is no available keyring. diff --git a/pkg/pmapi/dialer_pinning_reporter_test.go b/pkg/pmapi/dialer_pinning_reporter_test.go index c13414a..c14faee 100644 --- a/pkg/pmapi/dialer_pinning_reporter_test.go +++ b/pkg/pmapi/dialer_pinning_reporter_test.go @@ -36,7 +36,6 @@ func TestTLSReporter_DoubleReport(t *testing.T) { cfg := Config{ AppVersion: "3", - UserAgent: "useragent", } r := newTLSReporter(cfg, TrustedAPIPins) diff --git a/pkg/store/store_test.go b/pkg/store/store_test.go index 226edd9..093d5fb 100644 --- a/pkg/store/store_test.go +++ b/pkg/store/store_test.go @@ -34,7 +34,7 @@ import ( pmapimocks "github.com/ljanyst/peroxide/pkg/pmapi/mocks" "github.com/ljanyst/peroxide/pkg/store/cache" storemocks "github.com/ljanyst/peroxide/pkg/store/mocks" - tests "github.com/ljanyst/peroxide/test" + "github.com/ljanyst/peroxide/pkg/testutil" "github.com/stretchr/testify/require" ) @@ -182,7 +182,7 @@ func (mocks *mocksForStore) newStoreNoEvents(t *testing.T, combinedMode bool, ms mocks.user.EXPECT().GetClient().AnyTimes().Return(mocks.client) - testUserKeyring := tests.MakeKeyRing(t) + testUserKeyring := testutil.MakeKeyRing(t) mocks.client.EXPECT().GetUserKeyRing().Return(testUserKeyring, nil).AnyTimes() mocks.client.EXPECT().Addresses().Return(pmapi.AddressList{ {ID: addrID1, Email: addr1, Type: pmapi.OriginalAddress, Receive: true}, diff --git a/pkg/testutil/util.go b/pkg/testutil/util.go new file mode 100644 index 0000000..77e5478 --- /dev/null +++ b/pkg/testutil/util.go @@ -0,0 +1,35 @@ +// Copyright (c) 2022 Proton Technologies AG +// +// This file is part of ProtonMail Bridge. +// +// ProtonMail Bridge is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ProtonMail Bridge is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with ProtonMail Bridge. If not, see . + +package testutil + +import ( + "testing" + + "github.com/ProtonMail/gopenpgp/v2/crypto" + "github.com/stretchr/testify/require" +) + +func MakeKeyRing(t *testing.T) *crypto.KeyRing { + key, err := crypto.GenerateKey("name", "email", "rsa", 2048) + require.NoError(t, err) + + kr, err := crypto.NewKeyRing(key) + require.NoError(t, err) + + return kr +} diff --git a/pkg/users/users_login_test.go b/pkg/users/users_login_test.go index 69c73a1..2f349c0 100644 --- a/pkg/users/users_login_test.go +++ b/pkg/users/users_login_test.go @@ -20,10 +20,9 @@ package users import ( "testing" + gomock "github.com/golang/mock/gomock" "github.com/ljanyst/peroxide/pkg/events" - "github.com/ljanyst/peroxide/pkg/metrics" "github.com/ljanyst/peroxide/pkg/pmapi" - gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" r "github.com/stretchr/testify/require" ) @@ -52,7 +51,6 @@ func TestUsersFinishLoginNewUser(t *testing.T) { mockAddingConnectedUser(t, m) mockEventLoopNoAction(m) - m.clientManager.EXPECT().SendSimpleMetric(gomock.Any(), string(metrics.Setup), string(metrics.NewUser), string(metrics.NoLabel)) m.eventListener.EXPECT().Emit(events.UserRefreshEvent, testCredentials.UserID) checkUsersFinishLogin(t, m, testAuthRefresh, testCredentials.MailboxPassword, testCredentials.UserID, nil) diff --git a/pkg/users/users_test.go b/pkg/users/users_test.go index 33158c0..cd8de10 100644 --- a/pkg/users/users_test.go +++ b/pkg/users/users_test.go @@ -33,9 +33,9 @@ import ( pmapimocks "github.com/ljanyst/peroxide/pkg/pmapi/mocks" "github.com/ljanyst/peroxide/pkg/store" "github.com/ljanyst/peroxide/pkg/store/cache" + "github.com/ljanyst/peroxide/pkg/testutil" "github.com/ljanyst/peroxide/pkg/users/credentials" usersmocks "github.com/ljanyst/peroxide/pkg/users/mocks" - tests "github.com/ljanyst/peroxide/test" "github.com/sirupsen/logrus" r "github.com/stretchr/testify/require" ) @@ -299,7 +299,7 @@ func mockInitConnectedUser(t *testing.T, m mocks) { m.pmapiClient.EXPECT().ListLabels(gomock.Any()).Return([]*pmapi.Label{}, nil), m.pmapiClient.EXPECT().CountMessages(gomock.Any(), "").Return([]*pmapi.MessagesCount{}, nil), m.pmapiClient.EXPECT().Addresses().Return([]*pmapi.Address{testPMAPIAddress}), - m.pmapiClient.EXPECT().GetUserKeyRing().Return(tests.MakeKeyRing(t), nil).AnyTimes(), + m.pmapiClient.EXPECT().GetUserKeyRing().Return(testutil.MakeKeyRing(t), nil).AnyTimes(), ) }