Skip to content

Commit

Permalink
rename certificate test package to not be different
Browse files Browse the repository at this point in the history
i'm not entirely sure why we do this, but hopefully it's okay to go with
the more idiomatic testing strategy here.
  • Loading branch information
ostlerc committed Feb 23, 2017
1 parent 3374efd commit dbd6d2a
Showing 1 changed file with 17 additions and 18 deletions.
35 changes: 17 additions & 18 deletions certificate/certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"io/ioutil"
"testing"

"github.com/sideshow/apns2/certificate"
"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -74,85 +73,85 @@ func TestParsePrivateKey(t *testing.T) {
}

func TestValidCertificateFromP12File(t *testing.T) {
cer, err := certificate.FromP12File("_fixtures/certificate-valid.p12", "")
cer, err := FromP12File("_fixtures/certificate-valid.p12", "")
assert.Nil(t, err)
assert.Nil(t, verifyHostname(cer))
}

func TestValidCertificateFromP12Bytes(t *testing.T) {
bytes, _ := ioutil.ReadFile("_fixtures/certificate-valid.p12")
cer, err := certificate.FromP12Bytes(bytes, "")
cer, err := FromP12Bytes(bytes, "")
assert.NoError(t, err)
assert.Nil(t, verifyHostname(cer))
}

func TestEncryptedValidCertificateFromP12File(t *testing.T) {
cer, err := certificate.FromP12File("_fixtures/certificate-valid-encrypted.p12", "password")
cer, err := FromP12File("_fixtures/certificate-valid-encrypted.p12", "password")
assert.NoError(t, err)
assert.Nil(t, verifyHostname(cer))
}

func TestNoSuchFileP12File(t *testing.T) {
cer, err := certificate.FromP12File("", "")
cer, err := FromP12File("", "")
assert.Equal(t, errors.New("open : no such file or directory").Error(), err.Error())
assert.Equal(t, tls.Certificate{}, cer)
}

func TestBadPasswordP12File(t *testing.T) {
cer, err := certificate.FromP12File("_fixtures/certificate-valid-encrypted.p12", "")
cer, err := FromP12File("_fixtures/certificate-valid-encrypted.p12", "")
assert.Equal(t, tls.Certificate{}, cer)
assert.Equal(t, errors.New("pkcs12: decryption password incorrect").Error(), err.Error())
}

// PEM

func TestValidCertificateFromPemFile(t *testing.T) {
cer, err := certificate.FromPemFile("_fixtures/certificate-valid.pem", "")
cer, err := FromPemFile("_fixtures/certificate-valid.pem", "")
assert.NoError(t, err)
assert.Nil(t, verifyHostname(cer))
}

func TestValidCertificateFromPemBytes(t *testing.T) {
bytes, _ := ioutil.ReadFile("_fixtures/certificate-valid.pem")
cer, err := certificate.FromPemBytes(bytes, "")
cer, err := FromPemBytes(bytes, "")
assert.NoError(t, err)
assert.Nil(t, verifyHostname(cer))
}

func TestEncryptedValidCertificateFromPemFile(t *testing.T) {
cer, err := certificate.FromPemFile("_fixtures/certificate-valid-encrypted.pem", "password")
cer, err := FromPemFile("_fixtures/certificate-valid-encrypted.pem", "password")
assert.NoError(t, err)
assert.Nil(t, verifyHostname(cer))
}

func TestNoSuchFilePemFile(t *testing.T) {
cer, err := certificate.FromPemFile("", "")
cer, err := FromPemFile("", "")
assert.Equal(t, tls.Certificate{}, cer)
assert.Equal(t, errors.New("open : no such file or directory").Error(), err.Error())
}

func TestBadPasswordPemFile(t *testing.T) {
cer, err := certificate.FromPemFile("_fixtures/certificate-valid-encrypted.pem", "badpassword")
cer, err := FromPemFile("_fixtures/certificate-valid-encrypted.pem", "badpassword")
assert.Equal(t, tls.Certificate{}, cer)
assert.Equal(t, certificate.ErrFailedToDecryptKey, err)
assert.Equal(t, ErrFailedToDecryptKey, err)
}

func TestBadKeyPemFile(t *testing.T) {
cer, err := certificate.FromPemFile("_fixtures/certificate-bad-key.pem", "")
cer, err := FromPemFile("_fixtures/certificate-bad-key.pem", "")
assert.Equal(t, tls.Certificate{}, cer)
assert.Equal(t, certificate.ErrFailedToParsePKCS1PrivateKey, err)
assert.Equal(t, ErrFailedToParsePKCS1PrivateKey, err)
}

func TestNoKeyPemFile(t *testing.T) {
cer, err := certificate.FromPemFile("_fixtures/certificate-no-key.pem", "")
cer, err := FromPemFile("_fixtures/certificate-no-key.pem", "")
assert.Equal(t, tls.Certificate{}, cer)
assert.Equal(t, certificate.ErrNoPrivateKey, err)
assert.Equal(t, ErrNoPrivateKey, err)
}

func TestNoCertificatePemFile(t *testing.T) {
cer, err := certificate.FromPemFile("_fixtures/certificate-no-certificate.pem", "")
cer, err := FromPemFile("_fixtures/certificate-no-pem", "")
assert.Equal(t, tls.Certificate{}, cer)
assert.Equal(t, certificate.ErrNoCertificate, err)
assert.Equal(t, ErrNoCertificate, err)
}

func verifyHostname(cert tls.Certificate) error {
Expand Down

0 comments on commit dbd6d2a

Please sign in to comment.