Skip to content

Commit

Permalink
enable testpackage linter (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
enrichman authored Oct 28, 2022
1 parent 77cf329 commit 059c378
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 20 deletions.
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ linters:
- exhaustruct
- godox
- paralleltest
- testpackage
9 changes: 5 additions & 4 deletions pkg/file/file_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package file
package file_test

import (
"fmt"
"os"
"path"
"testing"

"github.com/enrichman/stegosecrets/pkg/file"
"github.com/stretchr/testify/require"
)

Expand All @@ -16,7 +17,7 @@ func Test_WriteFileChecksum(t *testing.T) {
err := os.WriteFile(original, []byte("content"), 0o600)
require.NoError(t, err)

err = WriteFileChecksum(original)
err = file.WriteFileChecksum(original)
require.NoError(t, err)

checksum, err := os.ReadFile(fmt.Sprintf("%s.checksum", original))
Expand All @@ -31,10 +32,10 @@ func Test_WriteKey(t *testing.T) {
keyFile := path.Join(tmpDir, "file")

expectedKey := []byte("test")
err := WriteKey(expectedKey, keyFile)
err := file.WriteKey(expectedKey, keyFile)
require.NoError(t, err)

key, err := ReadKey(keyFile + ".key")
key, err := file.ReadKey(keyFile + ".key")
require.NoError(t, err)
require.Equal(t, expectedKey, key)
}
7 changes: 4 additions & 3 deletions pkg/image/image_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package image
package image_test

import (
"bytes"
"image"
"image/jpeg"
"testing"

stegoimage "github.com/enrichman/stegosecrets/pkg/image"
"github.com/stretchr/testify/require"
)

Expand All @@ -19,10 +20,10 @@ func Test_EncodeDecodeSecret(t *testing.T) {
require.NoError(t, err)

var imageOut bytes.Buffer
err = EncodeSecret(secret, &imageBuff, &imageOut)
err = stegoimage.EncodeSecret(secret, &imageBuff, &imageOut)
require.NoError(t, err)

out, err := DecodeSecret(&imageOut)
out, err := stegoimage.DecodeSecret(&imageOut)
require.NoError(t, err)

require.Equal(t, secret, out)
Expand Down
29 changes: 17 additions & 12 deletions pkg/stego/aes_test.go
Original file line number Diff line number Diff line change
@@ -1,39 +1,44 @@
package stego
package stego_test

import (
"testing"

"github.com/enrichman/stegosecrets/pkg/stego"
"github.com/stretchr/testify/require"
)

func Test_EncryptDecrypt(t *testing.T) {
key, err := GenerateMasterKey()
key, err := stego.GenerateMasterKey()
require.NoError(t, err)

message := []byte("test message")
encrypted, err := Encrypt(key, message)
encrypted, err := stego.Encrypt(key, message)
require.NoError(t, err)

decrypted, err := Decrypt(key, encrypted)
decrypted, err := stego.Decrypt(key, encrypted)
require.NoError(t, err)
require.Equal(t, message, decrypted)
}

func GenerateMasterKey() {
panic("unimplemented")
}

func Test_EncryptDecryptEmptyMessage(t *testing.T) {
key, err := GenerateMasterKey()
key, err := stego.GenerateMasterKey()
require.NoError(t, err)

message := []byte{}
encrypted, err := Encrypt(key, message)
encrypted, err := stego.Encrypt(key, message)
require.NoError(t, err)

decrypted, err := Decrypt(key, encrypted)
decrypted, err := stego.Decrypt(key, encrypted)
require.NoError(t, err)
require.Equal(t, message, decrypted)
}

func Benchmark_Encrypt(b *testing.B) {
key, err := GenerateMasterKey()
key, err := stego.GenerateMasterKey()
if err != nil {
b.Fatal(err)
}
Expand All @@ -43,28 +48,28 @@ func Benchmark_Encrypt(b *testing.B) {
b.ReportAllocs()

for i := 0; i < b.N; i++ {
_, err := Encrypt(key, message)
_, err := stego.Encrypt(key, message)
if err != nil {
b.Fatal(err)
}
}
}

func Benchmark_Decrypt(b *testing.B) {
key, err := GenerateMasterKey()
key, err := stego.GenerateMasterKey()
if err != nil {
b.Fatal(err)
}

encr, err := Encrypt(key, []byte("test message"))
encr, err := stego.Encrypt(key, []byte("test message"))
if err != nil {
b.Fatal(err)
}

b.ReportAllocs()

for i := 0; i < b.N; i++ {
_, err := Decrypt(key, encr)
_, err := stego.Decrypt(key, encr)
if err != nil {
b.Fatal(err)
}
Expand Down

0 comments on commit 059c378

Please sign in to comment.