MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from fkautz/pr_out_adding_more_unit_tests_to_strbyteconv_fixes_69

Browse Source 
Adding more unit tests to strbyteconv. Fixes #69.
This commit is contained in:
Harshavardhana 2014-12-04 23:11:08 -08:00
commit d34d86c050
2 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/strbyteconv/strbyteconv.go
View File

@ -59,14 +59,20 @@ func BytesToString(bytes uint64) string {
func StringToBytes(s string) (uint64, error) { func StringToBytes(s string) (uint64, error) {
var bytes uint64 var bytes uint64
var err error
StringPattern, err := regexp.Compile(`(?i)^(-?\d+)([KMGT])B?$`) bytes, err = strconv.ParseUint(s, 10, 64)
if err == nil {
return bytes, nil
}
stringPattern, err := regexp.Compile(`(?i)^(-?\d+)([BKMGT])B?$`)
if err != nil { if err != nil {
return 0, err return 0, err
} }
parts := StringPattern.FindStringSubmatch(strings.TrimSpace(s)) parts := stringPattern.FindStringSubmatch(strings.TrimSpace(s))
if len(parts) < 3 { if len(parts) < 2 {
return 0, errors.New("Incorrect string format must be K,KB,M,MB,G,GB") return 0, errors.New("Incorrect string format must be K,KB,M,MB,G,GB")
} }
@ -87,6 +93,8 @@ func StringToBytes(s string) (uint64, error) {
bytes = value * UNIT_KILOBYTE bytes = value * UNIT_KILOBYTE
case "B": case "B":
bytes = value * UNIT_BYTE bytes = value * UNIT_BYTE
default:
return 0, errors.New("Incorrect string format must be K,KB,M,MB,G,GB")
} }
return bytes, nil return bytes, nil

56
pkgs/strbyteconv/strbyteconv_test.go
View File

@ -17,8 +17,10 @@
package strbyteconv package strbyteconv
import ( import (
. "gopkg.in/check.v1" "log"
"testing" "testing"
. "gopkg.in/check.v1"
) )
type MySuite struct{} type MySuite struct{}
@ -43,7 +45,20 @@ func (s *MySuite) Test(c *C) {
value = BytesToString(100 * UNIT_TERABYTE) value = BytesToString(100 * UNIT_TERABYTE)
c.Assert(value, Equals, "100TB") c.Assert(value, Equals, "100TB")
bytes, err := StringToBytes("100KB") bytes, err := StringToBytes("100B")
log.Println(err)
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100))
bytes, err = StringToBytes("100")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100))
bytes, err = StringToBytes("100KB")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_KILOBYTE))
bytes, err = StringToBytes("100K")
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_KILOBYTE)) c.Assert(bytes, Equals, uint64(100*UNIT_KILOBYTE))
@ -51,12 +66,49 @@ func (s *MySuite) Test(c *C) {
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_MEGABYTE)) c.Assert(bytes, Equals, uint64(100*UNIT_MEGABYTE))
bytes, err = StringToBytes("100M")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_MEGABYTE))
bytes, err = StringToBytes("100GB") bytes, err = StringToBytes("100GB")
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_GIGABYTE)) c.Assert(bytes, Equals, uint64(100*UNIT_GIGABYTE))
bytes, err = StringToBytes("100G")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_GIGABYTE))
bytes, err = StringToBytes("100TB") bytes, err = StringToBytes("100TB")
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_TERABYTE)) c.Assert(bytes, Equals, uint64(100*UNIT_TERABYTE))
bytes, err = StringToBytes("100T")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(100*UNIT_TERABYTE))
bytes, err = StringToBytes("0")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(0))
bytes, err = StringToBytes("23")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(23))
bytes, err = StringToBytes("0TB")
c.Assert(err, IsNil)
c.Assert(bytes, Equals, uint64(0))
}
func (s *MySuite) TestBadInput(c *C) {
_, err := StringToBytes("")
c.Assert(err, Not(IsNil))
_, err = StringToBytes("HELLO")
c.Assert(err, Not(IsNil))
_, err = StringToBytes("-20B")
c.Assert(err, Not(IsNil))
_, err = StringToBytes("-20MB")
c.Assert(err, Not(IsNil))
} }