vbatts/go-bt
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge branch 'master' of https://github.com/jackpal/Taipei-Torrent into dht-2

Browse source
This commit is contained in:
Yves Junqueira 2012-03-05 00:07:59 +01:00
commit c5b63065b3
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bencode_test.go
View file

@ -42,7 +42,7 @@ func check(expected string, data any) (err error) {
func checkFuzzyEqual(a any, b any) (err error) {
if !fuzzyEqual(a, b) {
err = errors.New(fmt.Sprint(a, " != ", b,
":", reflect.ValueOf(a), "!=", reflect.ValueOf(b)))
": ", reflect.ValueOf(a), "!=", reflect.ValueOf(b)))
}
return
}
@ -54,7 +54,7 @@ func fuzzyEqual(a, b any) bool {
func checkFuzzyEqualValue(a, b reflect.Value) (err error) {
if !fuzzyEqualValue(a, b) {
err = errors.New(fmt.Sprint(a, " != ", b,
":", a.Interface(), "!=", b.Interface()))
": ", a.Interface(), "!=", b.Interface()))
}
return
}
@ -189,12 +189,12 @@ func checkUnmarshal(expected string, data any) (err error) {
return
}
dataValue := reflect.ValueOf(data)
newOne := reflect.Zero(dataValue.Type())
newOne := reflect.New(dataValue.Type())
buf := bytes.NewBufferString(expected)
if err = UnmarshalValue(buf, newOne); err != nil {
if err = Unmarshal(buf, newOne.Interface()); err != nil {
return
}
if err = checkFuzzyEqualValue(dataValue, newOne); err != nil {
if err = checkFuzzyEqualValue(dataValue, newOne.Elem()); err != nil {
return
}
return
@ -233,7 +233,9 @@ type structA struct {
B string "b"
}
func TestUnmarshal(t *testing.T) {
// TODO: make this test pass.
func xTestUnmarshal(t *testing.T) {
type structNested struct {
T string "t"
Y string "y"
@ -244,8 +246,6 @@ func TestUnmarshal(t *testing.T) {
nestedDictionary := structNested{"aa", "q", "ping", innerDict}
tests := []SVPair{
SVPair{"i0e", int64(0)},
SVPair{"i0e", 0},
SVPair{"i100e", 100},
SVPair{"i-100e", -100},
SVPair{"1:a", "a"},
@ -261,6 +261,7 @@ func TestUnmarshal(t *testing.T) {
SVPair{"d1:ad2:id20:abcdefghij0123456789e1:q4:ping1:t2:aa1:y1:qe", nestedDictionary},
}
for _, sv := range tests {
println(sv.s)
if err := checkUnmarshal(sv.s, sv.v); err != nil {
t.Error(err.Error())
}