mirror of
https://github.com/opencontainers/go-digest.git
synced 2025-04-18 03:24:02 +03:00
remove import aliases
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
f5b4cdae29
commit
3d866abde6
@ -21,7 +21,7 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
"github.com/opencontainers/go-digest"
|
||||
)
|
||||
|
||||
var (
|
||||
|
@ -21,7 +21,7 @@ import (
|
||||
"math/rand"
|
||||
"testing"
|
||||
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
"github.com/opencontainers/go-digest"
|
||||
)
|
||||
|
||||
func assertEqualDigests(t *testing.T, d1, d2 digest.Digest) {
|
||||
|
@ -23,7 +23,7 @@ import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
pkgdigest "github.com/opencontainers/go-digest"
|
||||
"github.com/opencontainers/go-digest"
|
||||
)
|
||||
|
||||
type TestCase struct {
|
||||
@ -32,14 +32,14 @@ type TestCase struct {
|
||||
// If err is non-nil, then the parsing of Input is expected to return this error
|
||||
Err error
|
||||
// Algorithm should be an available or registered algorithm
|
||||
Algorithm pkgdigest.Algorithm
|
||||
Algorithm digest.Algorithm
|
||||
// Encoded is the the encoded portion of the digest to expect, for example e58fcf7418d4390dec8e8fb69d88c06ec07039d651fedd3aa72af9972e7d046b
|
||||
Encoded string
|
||||
}
|
||||
|
||||
func RunTestCase(t *testing.T, testcase TestCase) {
|
||||
digest, err := pkgdigest.Parse(testcase.Input)
|
||||
if errors.Is(err, testcase.Err) {
|
||||
dgst, err := digest.Parse(testcase.Input)
|
||||
if !errors.Is(err, testcase.Err) {
|
||||
t.Fatalf("error differed from expected while parsing %q: %v != %v", testcase.Input, err, testcase.Err)
|
||||
}
|
||||
|
||||
@ -47,26 +47,26 @@ func RunTestCase(t *testing.T, testcase TestCase) {
|
||||
return
|
||||
}
|
||||
|
||||
if digest.Algorithm() != testcase.Algorithm {
|
||||
t.Fatalf("incorrect Algorithm for parsed digest: %q != %q", digest.Algorithm(), testcase.Algorithm)
|
||||
if dgst.Algorithm() != testcase.Algorithm {
|
||||
t.Fatalf("incorrect Algorithm for parsed digest: %q != %q", dgst.Algorithm(), testcase.Algorithm)
|
||||
}
|
||||
|
||||
if digest.Encoded() != testcase.Encoded {
|
||||
t.Fatalf("incorrect hex for parsed digest: %q != %q", digest.Encoded(), testcase.Encoded)
|
||||
if dgst.Encoded() != testcase.Encoded {
|
||||
t.Fatalf("incorrect hex for parsed digest: %q != %q", dgst.Encoded(), testcase.Encoded)
|
||||
}
|
||||
|
||||
// Parse string return value and check equality
|
||||
newParsed, err := pkgdigest.Parse(digest.String())
|
||||
newParsed, err := digest.Parse(dgst.String())
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error parsing Input %q: %v", testcase.Input, err)
|
||||
}
|
||||
|
||||
if newParsed != digest {
|
||||
t.Fatalf("expected equal: %q != %q", newParsed, digest)
|
||||
if newParsed != dgst {
|
||||
t.Fatalf("expected equal: %q != %q", newParsed, dgst)
|
||||
}
|
||||
|
||||
newFromHex := pkgdigest.NewDigestFromEncoded(newParsed.Algorithm(), newParsed.Encoded())
|
||||
if newFromHex != digest {
|
||||
t.Fatalf("%v != %v", newFromHex, digest)
|
||||
newFromHex := digest.NewDigestFromEncoded(newParsed.Algorithm(), newParsed.Encoded())
|
||||
if newFromHex != dgst {
|
||||
t.Fatalf("%v != %v", newFromHex, dgst)
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user