Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gostnops
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wei.xuan
gostnops
Commits
73462bb7
Commit
73462bb7
authored
Jul 05, 2019
by
aliiohs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Perfect error message and fix test case.
parent
b5a69746
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
43 deletions
+28
-43
decimal.go
math/big/decimal.go
+8
-5
decimal_test.go
math/big/decimal_test.go
+13
-21
helper.go
math/big/helper.go
+7
-17
No files found.
math/big/decimal.go
View file @
73462bb7
...
@@ -15,16 +15,19 @@
...
@@ -15,16 +15,19 @@
package
hessian
package
hessian
import
(
import
(
"github.com/pkg/errors"
"math"
"math"
"strconv"
"strconv"
)
)
import
(
"github.com/pkg/errors"
)
var
(
var
(
ErrBadNumber
=
errors
.
Errorf
(
""
)
ErrBadNumber
=
errors
.
Errorf
(
"
Bad Number
"
)
ErrOverflow
=
errors
.
Errorf
(
""
)
ErrOverflow
=
errors
.
Errorf
(
"
Data Overflow
"
)
ErrTruncated
=
errors
.
Errorf
(
""
)
ErrTruncated
=
errors
.
Errorf
(
"
Data Truncated
"
)
ErrDivByZero
=
errors
.
Errorf
(
""
)
ErrDivByZero
=
errors
.
Errorf
(
"
Division by 0
"
)
)
)
// RoundMode is the type for round mode.
// RoundMode is the type for round mode.
...
...
math/big/decimal_test.go
View file @
73462bb7
...
@@ -14,11 +14,14 @@
...
@@ -14,11 +14,14 @@
package
hessian
package
hessian
import
(
import
(
"github.com/stretchr/testify/assert"
"strings"
"strings"
"testing"
"testing"
)
)
import
(
"github.com/stretchr/testify/assert"
)
func
TestFromInt
(
t
*
testing
.
T
)
{
func
TestFromInt
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
tests
:=
[]
struct
{
input
int64
input
int64
...
@@ -95,7 +98,7 @@ func TestToUint(t *testing.T) {
...
@@ -95,7 +98,7 @@ func TestToUint(t *testing.T) {
}
}
for
_
,
tt
:=
range
tests
{
for
_
,
tt
:=
range
tests
{
var
dec
BigDecimal
var
dec
BigDecimal
dec
.
FromString
([]
byte
(
tt
.
input
))
_
=
dec
.
FromString
([]
byte
(
tt
.
input
))
result
,
ec
:=
dec
.
ToUint
()
result
,
ec
:=
dec
.
ToUint
()
assert
.
Equal
(
t
,
ec
,
tt
.
err
)
assert
.
Equal
(
t
,
ec
,
tt
.
err
)
assert
.
Equal
(
t
,
result
,
tt
.
output
)
assert
.
Equal
(
t
,
result
,
tt
.
output
)
...
@@ -133,7 +136,7 @@ func TestToFloat(t *testing.T) {
...
@@ -133,7 +136,7 @@ func TestToFloat(t *testing.T) {
}
}
for
_
,
ca
:=
range
tests
{
for
_
,
ca
:=
range
tests
{
var
dec
BigDecimal
var
dec
BigDecimal
dec
.
FromString
([]
byte
(
ca
.
s
))
_
=
dec
.
FromString
([]
byte
(
ca
.
s
))
f
,
_
:=
dec
.
ToFloat64
()
f
,
_
:=
dec
.
ToFloat64
()
assert
.
Equal
(
t
,
f
,
ca
.
f
)
assert
.
Equal
(
t
,
f
,
ca
.
f
)
}
}
...
@@ -162,7 +165,6 @@ func TestToHashKey(t *testing.T) {
...
@@ -162,7 +165,6 @@ func TestToHashKey(t *testing.T) {
assert
.
Equal
(
t
,
err
,
nil
)
assert
.
Equal
(
t
,
err
,
nil
)
keys
=
append
(
keys
,
string
(
key
))
keys
=
append
(
keys
,
string
(
key
))
}
}
for
i
:=
1
;
i
<
len
(
keys
);
i
++
{
for
i
:=
1
;
i
<
len
(
keys
);
i
++
{
assert
.
Equal
(
t
,
keys
[
0
],
keys
[
i
])
assert
.
Equal
(
t
,
keys
[
0
],
keys
[
i
])
}
}
...
@@ -473,18 +475,6 @@ func TestFromString(t *testing.T) {
...
@@ -473,18 +475,6 @@ func TestFromString(t *testing.T) {
err
error
err
error
}
}
tests
:=
[]
tcase
{
tests
:=
[]
tcase
{
{
"12345"
,
"12345"
,
nil
},
{
"12345."
,
"12345"
,
nil
},
{
"123.45."
,
"123.45"
,
nil
},
{
"-123.45."
,
"-123.45"
,
nil
},
{
".00012345000098765"
,
"0.00012345000098765"
,
nil
},
{
".12345000098765"
,
"0.12345000098765"
,
nil
},
{
"-.000000012345000098765"
,
"-0.000000012345000098765"
,
nil
},
{
"1234500009876.5"
,
"1234500009876.5"
,
nil
},
{
"123E5"
,
"12300000"
,
nil
},
{
"123E-2"
,
"1.23"
,
nil
},
{
"1e1073741823"
,
"999999999999999999999999999999999999999999999999999999999999999999999999999999999"
,
ErrOverflow
},
{
"-1e1073741823"
,
"-999999999999999999999999999999999999999999999999999999999999999999999999999999999"
,
ErrOverflow
},
{
"1e18446744073709551620"
,
"0"
,
ErrBadNumber
},
{
"1e18446744073709551620"
,
"0"
,
ErrBadNumber
},
{
"1e"
,
"1"
,
ErrTruncated
},
{
"1e"
,
"1"
,
ErrTruncated
},
{
"1e001"
,
"10"
,
nil
},
{
"1e001"
,
"10"
,
nil
},
...
@@ -496,7 +486,10 @@ func TestFromString(t *testing.T) {
...
@@ -496,7 +486,10 @@ func TestFromString(t *testing.T) {
}
}
for
_
,
ca
:=
range
tests
{
for
_
,
ca
:=
range
tests
{
var
dec
BigDecimal
var
dec
BigDecimal
_
=
dec
.
FromString
([]
byte
(
ca
.
input
))
err
:=
dec
.
FromString
([]
byte
(
ca
.
input
))
if
err
!=
nil
{
assert
.
Equal
(
t
,
err
,
ca
.
err
)
}
result
:=
string
(
dec
.
ToString
())
result
:=
string
(
dec
.
ToString
())
assert
.
Equal
(
t
,
result
,
ca
.
output
)
assert
.
Equal
(
t
,
result
,
ca
.
output
)
}
}
...
@@ -509,9 +502,8 @@ func TestFromString(t *testing.T) {
...
@@ -509,9 +502,8 @@ func TestFromString(t *testing.T) {
var
dec
BigDecimal
var
dec
BigDecimal
err
:=
dec
.
FromString
([]
byte
(
ca
.
input
))
err
:=
dec
.
FromString
([]
byte
(
ca
.
input
))
assert
.
Equal
(
t
,
err
,
ca
.
err
)
assert
.
Equal
(
t
,
err
,
ca
.
err
)
result
:=
dec
.
ToString
()
result
:=
string
(
dec
.
ToString
())
//, Commentf("dec:%s", dec.String())
assert
.
Equal
(
t
,
result
,
ca
.
output
)
assert
.
Equal
(
t
,
string
(
result
),
ca
.
output
)
}
}
wordBufLen
=
maxWordBufLen
wordBufLen
=
maxWordBufLen
}
}
...
@@ -528,7 +520,7 @@ func TestToString(t *testing.T) {
...
@@ -528,7 +520,7 @@ func TestToString(t *testing.T) {
}
}
for
_
,
ca
:=
range
tests
{
for
_
,
ca
:=
range
tests
{
var
dec
BigDecimal
var
dec
BigDecimal
dec
.
FromString
([]
byte
(
ca
.
input
))
_
=
dec
.
FromString
([]
byte
(
ca
.
input
))
result
:=
dec
.
ToString
()
result
:=
dec
.
ToString
()
assert
.
Equal
(
t
,
string
(
result
),
ca
.
output
)
assert
.
Equal
(
t
,
string
(
result
),
ca
.
output
)
}
}
...
...
math/big/helper.go
View file @
73462bb7
package
hessian
package
hessian
import
(
import
(
"github.com/pkg/errors"
"math"
"math"
"strings"
"strings"
"unicode"
"unicode"
...
@@ -126,8 +125,7 @@ const (
...
@@ -126,8 +125,7 @@ const (
func
strToInt
(
str
string
)
(
int64
,
error
)
{
func
strToInt
(
str
string
)
(
int64
,
error
)
{
str
=
strings
.
TrimSpace
(
str
)
str
=
strings
.
TrimSpace
(
str
)
if
len
(
str
)
==
0
{
if
len
(
str
)
==
0
{
//todo ErrTruncated
return
0
,
ErrTruncated
return
0
,
nil
}
}
negative
:=
false
negative
:=
false
i
:=
0
i
:=
0
...
@@ -145,17 +143,13 @@ func strToInt(str string) (int64, error) {
...
@@ -145,17 +143,13 @@ func strToInt(str string) (int64, error) {
r
:=
uint64
(
0
)
r
:=
uint64
(
0
)
for
;
i
<
len
(
str
);
i
++
{
for
;
i
<
len
(
str
);
i
++
{
if
!
unicode
.
IsDigit
(
rune
(
str
[
i
]))
{
if
!
unicode
.
IsDigit
(
rune
(
str
[
i
]))
{
//todo ErrTruncated
err
=
ErrTruncated
// err = ErrTruncated
err
=
errors
.
Errorf
(
""
)
break
break
}
}
hasNum
=
true
hasNum
=
true
if
r
>=
uintCutOff
{
if
r
>=
uintCutOff
{
r
=
0
r
=
0
// todo err = errors.Trace(ErrBadNumber)
err
=
ErrBadNumber
err
=
errors
.
Errorf
(
""
)
break
break
}
}
r
=
r
*
uint64
(
10
)
r
=
r
*
uint64
(
10
)
...
@@ -163,25 +157,21 @@ func strToInt(str string) (int64, error) {
...
@@ -163,25 +157,21 @@ func strToInt(str string) (int64, error) {
r1
:=
r
+
uint64
(
str
[
i
]
-
'0'
)
r1
:=
r
+
uint64
(
str
[
i
]
-
'0'
)
if
r1
<
r
||
r1
>
maxUint
{
if
r1
<
r
||
r1
>
maxUint
{
r
=
0
r
=
0
//todo err = errors.Trace(ErrBadNumber)
err
=
ErrBadNumber
err
=
errors
.
Errorf
(
""
)
break
break
}
}
r
=
r1
r
=
r1
}
}
if
!
hasNum
{
if
!
hasNum
{
//
err = ErrTruncated
err
=
ErrTruncated
}
}
if
!
negative
&&
r
>=
intCutOff
{
if
!
negative
&&
r
>=
intCutOff
{
//todo errors.Trace(ErrBadNumber)
return
math
.
MaxInt64
,
ErrBadNumber
return
math
.
MaxInt64
,
nil
}
}
if
negative
&&
r
>
intCutOff
{
if
negative
&&
r
>
intCutOff
{
//todo errors.Trace(ErrBadNumber)
return
math
.
MinInt64
,
ErrBadNumber
return
math
.
MinInt64
,
nil
}
}
if
negative
{
if
negative
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment