Skip to content

Fix commas #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasonharrison wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix commas #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: go

go:
- master

script:
- go test -v ./...
9 changes: 5 additions & 4 deletions cash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,8 @@ func (z *Cash) String() string {
if z.IsPositive() != true {
neg=true
z.Amt = z.Amt * -1 // make positive
buf.WriteString("(")
}

buf.WriteRune(z.Currency) // dollar sign
// decimal
decRaw := strconv.FormatInt(z.Amt, 10)
decRawLen := utf8.RuneCountInString(decRaw)
Expand Down Expand Up @@ -232,8 +230,11 @@ func (z *Cash) String() string {
buf.WriteString(")")
z.Amt = z.Amt * -1 // make negative
}

return buf.String()
if neg {
return "(" + string(z.Currency) + strings.Trim(buf.String(), ",")
} else {
return string(z.Currency) + strings.Trim(buf.String(), ",")
}
}

// commafy string of digits; digit grouping by thousands
Expand Down
15 changes: 15 additions & 0 deletions cash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,21 @@ func TestRounding(t *testing.T) {
assert.EqualValues(t, 66700, a.Amt, "should equal")
}

func TestCommas(t *testing.T) {
a, err := NewUSD().SetString("1.00")
assert.Nil(t, err)
assert.EqualValues(t, "$1.00", a.String(), "should equal")
a, err = NewUSD().SetString("1000.00")
assert.Nil(t, err)
assert.EqualValues(t, "$1,000.00", a.String(), "should equal")
a, err = NewUSD().SetString("12345.67")
assert.Nil(t, err)
assert.EqualValues(t, "$12,345.67", a.String(), "should equal")
a, err = NewUSD().SetString("-1000.00")
assert.Nil(t, err)
assert.EqualValues(t, "($1,000.00)", a.String(), "should equal")
}

func TestMulByScalar(t *testing.T) {
a := NewUSD().SetCents(9022)
var scalar int64 = 6
Expand Down