diff options
| -rw-r--r-- | src/guuid.go | 15 | ||||
| -rw-r--r-- | tests/guuid.go | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/guuid.go b/src/guuid.go index 0d20021..267affb 100644 --- a/src/guuid.go +++ b/src/guuid.go @@ -16,16 +16,13 @@ const ( uuidEncodedLength = (UUIDByteCount * 2) + uuidDashCount ) - var ( dashIndexes = []int { 8, 13, 18, 23 } emptyUUID = UUID {} -) -var ( - BadLengthError = errors.New("guuid: str isn't of the correct length") - BadDashCountError = errors.New("guuid: Bad count of dashes in string") - BadDashPositionError = errors.New("guuid: Bad char in string") + ErrBadLength = errors.New("guuid: str isn't of the correct length") + ErrBadDashCount = errors.New("guuid: Bad count of dashes in string") + ErrBadDashPosition = errors.New("guuid: Bad char in string") ) @@ -85,16 +82,16 @@ func (uuid UUID) String() string { func FromString(str string) (UUID, error) { if len(str) != uuidEncodedLength { - return emptyUUID, BadLengthError + return emptyUUID, ErrBadLength } if strings.Count(str, "-") != uuidDashCount { - return emptyUUID, BadDashCountError + return emptyUUID, ErrBadDashCount } for _, idx := range dashIndexes { if str[idx] != '-' { - return emptyUUID, BadDashPositionError + return emptyUUID, ErrBadDashPosition } } diff --git a/tests/guuid.go b/tests/guuid.go index ca20b49..c351bba 100644 --- a/tests/guuid.go +++ b/tests/guuid.go @@ -236,13 +236,13 @@ func test_FromString() { var err error _, err = FromString("") - assertEq(err, BadLengthError) + assertEq(err, ErrBadLength) _, err = FromString("---000000000000000000000000000000000") - assertEq(err, BadDashCountError) + assertEq(err, ErrBadDashCount) _, err = FromString("----00000000000000000000000000000000") - assertEq(err, BadDashPositionError) + assertEq(err, ErrBadDashPosition) _, err = FromString("00000000-0000-0000-0000-00000000000g") assertEq(err, hex.InvalidByteError('g')) @@ -253,6 +253,7 @@ func test_FromString() { } + func MainTest() { test_NewFrom() test_New() |