mirror of https://github.com/ethereum/go-ethereum
Merge pull request #1951 from fjl/godeps-upgrade-goupnp
Godeps: upgrade github.com/huin/goupnppull/1954/head
Jeffrey Wilcke
9 years ago
commit
1abbe05e93
@ -0,0 +1 @@ |
||||
/gotasks/specs |
||||
@ -0,0 +1,27 @@ |
||||
package main |
||||
|
||||
import ( |
||||
"log" |
||||
|
||||
"github.com/huin/goupnp/ssdp" |
||||
) |
||||
|
||||
func main() { |
||||
c := make(chan ssdp.Update) |
||||
srv, reg := ssdp.NewServerAndRegistry() |
||||
reg.AddListener(c) |
||||
go listener(c) |
||||
if err := srv.ListenAndServe(); err != nil { |
||||
log.Print("ListenAndServe failed: ", err) |
||||
} |
||||
} |
||||
|
||||
func listener(c <-chan ssdp.Update) { |
||||
for u := range c { |
||||
if u.Entry != nil { |
||||
log.Printf("Event: %v USN: %s Entry: %#v", u.EventType, u.USN, *u.Entry) |
||||
} else { |
||||
log.Printf("Event: %v USN: %s Entry: <nil>", u.EventType, u.USN) |
||||
} |
||||
} |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
940
Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go
generated
vendored
940
Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go
generated
vendored
File diff suppressed because it is too large
Load Diff
1733
Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go
generated
vendored
1733
Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go
generated
vendored
File diff suppressed because it is too large
Load Diff
@ -1,62 +0,0 @@ |
||||
package example_test |
||||
|
||||
import ( |
||||
"fmt" |
||||
"os" |
||||
|
||||
"github.com/huin/goupnp" |
||||
"github.com/huin/goupnp/dcps/internetgateway1" |
||||
) |
||||
|
||||
// Use discovered WANPPPConnection1 services to find external IP addresses.
|
||||
func Example_WANPPPConnection1_GetExternalIPAddress() { |
||||
clients, errors, err := internetgateway1.NewWANPPPConnection1Clients() |
||||
extIPClients := make([]GetExternalIPAddresser, len(clients)) |
||||
for i, client := range clients { |
||||
extIPClients[i] = client |
||||
} |
||||
DisplayExternalIPResults(extIPClients, errors, err) |
||||
// Output:
|
||||
} |
||||
|
||||
// Use discovered WANIPConnection services to find external IP addresses.
|
||||
func Example_WANIPConnection_GetExternalIPAddress() { |
||||
clients, errors, err := internetgateway1.NewWANIPConnection1Clients() |
||||
extIPClients := make([]GetExternalIPAddresser, len(clients)) |
||||
for i, client := range clients { |
||||
extIPClients[i] = client |
||||
} |
||||
DisplayExternalIPResults(extIPClients, errors, err) |
||||
// Output:
|
||||
} |
||||
|
||||
type GetExternalIPAddresser interface { |
||||
GetExternalIPAddress() (NewExternalIPAddress string, err error) |
||||
GetServiceClient() *goupnp.ServiceClient |
||||
} |
||||
|
||||
func DisplayExternalIPResults(clients []GetExternalIPAddresser, errors []error, err error) { |
||||
if err != nil { |
||||
fmt.Fprintln(os.Stderr, "Error discovering service with UPnP: ", err) |
||||
return |
||||
} |
||||
|
||||
if len(errors) > 0 { |
||||
fmt.Fprintf(os.Stderr, "Error discovering %d services:\n", len(errors)) |
||||
for _, err := range errors { |
||||
fmt.Println(" ", err) |
||||
} |
||||
} |
||||
|
||||
fmt.Fprintf(os.Stderr, "Successfully discovered %d services:\n", len(clients)) |
||||
for _, client := range clients { |
||||
device := &client.GetServiceClient().RootDevice.Device |
||||
|
||||
fmt.Fprintln(os.Stderr, " Device:", device.FriendlyName) |
||||
if addr, err := client.GetExternalIPAddress(); err != nil { |
||||
fmt.Fprintf(os.Stderr, " Failed to get external IP address: %v\n", err) |
||||
} else { |
||||
fmt.Fprintf(os.Stderr, " External IP address: %v\n", addr) |
||||
} |
||||
} |
||||
} |
||||
@ -1,85 +0,0 @@ |
||||
package soap |
||||
|
||||
import ( |
||||
"bytes" |
||||
"io/ioutil" |
||||
"net/http" |
||||
"net/url" |
||||
"reflect" |
||||
"testing" |
||||
) |
||||
|
||||
type capturingRoundTripper struct { |
||||
err error |
||||
resp *http.Response |
||||
capturedReq *http.Request |
||||
} |
||||
|
||||
func (rt *capturingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { |
||||
rt.capturedReq = req |
||||
return rt.resp, rt.err |
||||
} |
||||
|
||||
func TestActionInputs(t *testing.T) { |
||||
url, err := url.Parse("http://example.com/soap") |
||||
if err != nil { |
||||
t.Fatal(err) |
||||
} |
||||
rt := &capturingRoundTripper{ |
||||
err: nil, |
||||
resp: &http.Response{ |
||||
StatusCode: 200, |
||||
Body: ioutil.NopCloser(bytes.NewBufferString(` |
||||
<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"> |
||||
<s:Body> |
||||
<u:myactionResponse xmlns:u="mynamespace"> |
||||
<A>valueA</A> |
||||
<B>valueB</B> |
||||
</u:myactionResponse> |
||||
</s:Body> |
||||
</s:Envelope> |
||||
`)), |
||||
}, |
||||
} |
||||
client := SOAPClient{ |
||||
EndpointURL: *url, |
||||
HTTPClient: http.Client{ |
||||
Transport: rt, |
||||
}, |
||||
} |
||||
|
||||
type In struct { |
||||
Foo string |
||||
Bar string `soap:"bar"` |
||||
} |
||||
type Out struct { |
||||
A string |
||||
B string |
||||
} |
||||
in := In{"foo", "bar"} |
||||
gotOut := Out{} |
||||
err = client.PerformAction("mynamespace", "myaction", &in, &gotOut) |
||||
if err != nil { |
||||
t.Fatal(err) |
||||
} |
||||
|
||||
wantBody := (soapPrefix + |
||||
`<u:myaction xmlns:u="mynamespace">` + |
||||
`<Foo>foo</Foo>` + |
||||
`<bar>bar</bar>` + |
||||
`</u:myaction>` + |
||||
soapSuffix) |
||||
body, err := ioutil.ReadAll(rt.capturedReq.Body) |
||||
if err != nil { |
||||
t.Fatal(err) |
||||
} |
||||
gotBody := string(body) |
||||
if wantBody != gotBody { |
||||
t.Errorf("Bad request body\nwant: %q\n got: %q", wantBody, gotBody) |
||||
} |
||||
|
||||
wantOut := Out{"valueA", "valueB"} |
||||
if !reflect.DeepEqual(wantOut, gotOut) { |
||||
t.Errorf("Bad output\nwant: %+v\n got: %+v", wantOut, gotOut) |
||||
} |
||||
} |
||||
@ -1,481 +0,0 @@ |
||||
package soap |
||||
|
||||
import ( |
||||
"bytes" |
||||
"math" |
||||
"testing" |
||||
"time" |
||||
) |
||||
|
||||
type convTest interface { |
||||
Marshal() (string, error) |
||||
Unmarshal(string) (interface{}, error) |
||||
Equal(result interface{}) bool |
||||
} |
||||
|
||||
// duper is an interface that convTest values may optionally also implement to
|
||||
// generate another convTest for a value in an otherwise identical testCase.
|
||||
type duper interface { |
||||
Dupe(tag string) []convTest |
||||
} |
||||
|
||||
type testCase struct { |
||||
value convTest |
||||
str string |
||||
wantMarshalErr bool |
||||
wantUnmarshalErr bool |
||||
noMarshal bool |
||||
noUnMarshal bool |
||||
tag string |
||||
} |
||||
|
||||
type Ui1Test uint8 |
||||
|
||||
func (v Ui1Test) Marshal() (string, error) { |
||||
return MarshalUi1(uint8(v)) |
||||
} |
||||
func (v Ui1Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalUi1(s) |
||||
} |
||||
func (v Ui1Test) Equal(result interface{}) bool { |
||||
return uint8(v) == result.(uint8) |
||||
} |
||||
func (v Ui1Test) Dupe(tag string) []convTest { |
||||
if tag == "dupe" { |
||||
return []convTest{ |
||||
Ui2Test(v), |
||||
Ui4Test(v), |
||||
} |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
type Ui2Test uint16 |
||||
|
||||
func (v Ui2Test) Marshal() (string, error) { |
||||
return MarshalUi2(uint16(v)) |
||||
} |
||||
func (v Ui2Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalUi2(s) |
||||
} |
||||
func (v Ui2Test) Equal(result interface{}) bool { |
||||
return uint16(v) == result.(uint16) |
||||
} |
||||
|
||||
type Ui4Test uint32 |
||||
|
||||
func (v Ui4Test) Marshal() (string, error) { |
||||
return MarshalUi4(uint32(v)) |
||||
} |
||||
func (v Ui4Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalUi4(s) |
||||
} |
||||
func (v Ui4Test) Equal(result interface{}) bool { |
||||
return uint32(v) == result.(uint32) |
||||
} |
||||
|
||||
type I1Test int8 |
||||
|
||||
func (v I1Test) Marshal() (string, error) { |
||||
return MarshalI1(int8(v)) |
||||
} |
||||
func (v I1Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalI1(s) |
||||
} |
||||
func (v I1Test) Equal(result interface{}) bool { |
||||
return int8(v) == result.(int8) |
||||
} |
||||
func (v I1Test) Dupe(tag string) []convTest { |
||||
if tag == "dupe" { |
||||
return []convTest{ |
||||
I2Test(v), |
||||
I4Test(v), |
||||
} |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
type I2Test int16 |
||||
|
||||
func (v I2Test) Marshal() (string, error) { |
||||
return MarshalI2(int16(v)) |
||||
} |
||||
func (v I2Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalI2(s) |
||||
} |
||||
func (v I2Test) Equal(result interface{}) bool { |
||||
return int16(v) == result.(int16) |
||||
} |
||||
|
||||
type I4Test int32 |
||||
|
||||
func (v I4Test) Marshal() (string, error) { |
||||
return MarshalI4(int32(v)) |
||||
} |
||||
func (v I4Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalI4(s) |
||||
} |
||||
func (v I4Test) Equal(result interface{}) bool { |
||||
return int32(v) == result.(int32) |
||||
} |
||||
|
||||
type IntTest int64 |
||||
|
||||
func (v IntTest) Marshal() (string, error) { |
||||
return MarshalInt(int64(v)) |
||||
} |
||||
func (v IntTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalInt(s) |
||||
} |
||||
func (v IntTest) Equal(result interface{}) bool { |
||||
return int64(v) == result.(int64) |
||||
} |
||||
|
||||
type Fixed14_4Test float64 |
||||
|
||||
func (v Fixed14_4Test) Marshal() (string, error) { |
||||
return MarshalFixed14_4(float64(v)) |
||||
} |
||||
func (v Fixed14_4Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalFixed14_4(s) |
||||
} |
||||
func (v Fixed14_4Test) Equal(result interface{}) bool { |
||||
return math.Abs(float64(v)-result.(float64)) < 0.001 |
||||
} |
||||
|
||||
type CharTest rune |
||||
|
||||
func (v CharTest) Marshal() (string, error) { |
||||
return MarshalChar(rune(v)) |
||||
} |
||||
func (v CharTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalChar(s) |
||||
} |
||||
func (v CharTest) Equal(result interface{}) bool { |
||||
return rune(v) == result.(rune) |
||||
} |
||||
|
||||
type DateTest struct{ time.Time } |
||||
|
||||
func (v DateTest) Marshal() (string, error) { |
||||
return MarshalDate(time.Time(v.Time)) |
||||
} |
||||
func (v DateTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalDate(s) |
||||
} |
||||
func (v DateTest) Equal(result interface{}) bool { |
||||
return v.Time.Equal(result.(time.Time)) |
||||
} |
||||
func (v DateTest) Dupe(tag string) []convTest { |
||||
if tag != "no:dateTime" { |
||||
return []convTest{DateTimeTest{v.Time}} |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
type TimeOfDayTest struct { |
||||
TimeOfDay |
||||
} |
||||
|
||||
func (v TimeOfDayTest) Marshal() (string, error) { |
||||
return MarshalTimeOfDay(v.TimeOfDay) |
||||
} |
||||
func (v TimeOfDayTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalTimeOfDay(s) |
||||
} |
||||
func (v TimeOfDayTest) Equal(result interface{}) bool { |
||||
return v.TimeOfDay == result.(TimeOfDay) |
||||
} |
||||
func (v TimeOfDayTest) Dupe(tag string) []convTest { |
||||
if tag != "no:time.tz" { |
||||
return []convTest{TimeOfDayTzTest{v.TimeOfDay}} |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
type TimeOfDayTzTest struct { |
||||
TimeOfDay |
||||
} |
||||
|
||||
func (v TimeOfDayTzTest) Marshal() (string, error) { |
||||
return MarshalTimeOfDayTz(v.TimeOfDay) |
||||
} |
||||
func (v TimeOfDayTzTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalTimeOfDayTz(s) |
||||
} |
||||
func (v TimeOfDayTzTest) Equal(result interface{}) bool { |
||||
return v.TimeOfDay == result.(TimeOfDay) |
||||
} |
||||
|
||||
type DateTimeTest struct{ time.Time } |
||||
|
||||
func (v DateTimeTest) Marshal() (string, error) { |
||||
return MarshalDateTime(time.Time(v.Time)) |
||||
} |
||||
func (v DateTimeTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalDateTime(s) |
||||
} |
||||
func (v DateTimeTest) Equal(result interface{}) bool { |
||||
return v.Time.Equal(result.(time.Time)) |
||||
} |
||||
func (v DateTimeTest) Dupe(tag string) []convTest { |
||||
if tag != "no:dateTime.tz" { |
||||
return []convTest{DateTimeTzTest{v.Time}} |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
type DateTimeTzTest struct{ time.Time } |
||||
|
||||
func (v DateTimeTzTest) Marshal() (string, error) { |
||||
return MarshalDateTimeTz(time.Time(v.Time)) |
||||
} |
||||
func (v DateTimeTzTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalDateTimeTz(s) |
||||
} |
||||
func (v DateTimeTzTest) Equal(result interface{}) bool { |
||||
return v.Time.Equal(result.(time.Time)) |
||||
} |
||||
|
||||
type BooleanTest bool |
||||
|
||||
func (v BooleanTest) Marshal() (string, error) { |
||||
return MarshalBoolean(bool(v)) |
||||
} |
||||
func (v BooleanTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalBoolean(s) |
||||
} |
||||
func (v BooleanTest) Equal(result interface{}) bool { |
||||
return bool(v) == result.(bool) |
||||
} |
||||
|
||||
type BinBase64Test []byte |
||||
|
||||
func (v BinBase64Test) Marshal() (string, error) { |
||||
return MarshalBinBase64([]byte(v)) |
||||
} |
||||
func (v BinBase64Test) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalBinBase64(s) |
||||
} |
||||
func (v BinBase64Test) Equal(result interface{}) bool { |
||||
return bytes.Equal([]byte(v), result.([]byte)) |
||||
} |
||||
|
||||
type BinHexTest []byte |
||||
|
||||
func (v BinHexTest) Marshal() (string, error) { |
||||
return MarshalBinHex([]byte(v)) |
||||
} |
||||
func (v BinHexTest) Unmarshal(s string) (interface{}, error) { |
||||
return UnmarshalBinHex(s) |
||||
} |
||||
func (v BinHexTest) Equal(result interface{}) bool { |
||||
return bytes.Equal([]byte(v), result.([]byte)) |
||||
} |
||||
|
||||
func Test(t *testing.T) { |
||||
const time010203 time.Duration = (1*3600 + 2*60 + 3) * time.Second |
||||
const time0102 time.Duration = (1*3600 + 2*60) * time.Second |
||||
const time01 time.Duration = (1 * 3600) * time.Second |
||||
const time235959 time.Duration = (23*3600 + 59*60 + 59) * time.Second |
||||
|
||||
// Fake out the local time for the implementation.
|
||||
localLoc = time.FixedZone("Fake/Local", 6*3600) |
||||
defer func() { |
||||
localLoc = time.Local |
||||
}() |
||||
|
||||
tests := []testCase{ |
||||
// ui1
|
||||
{str: "", value: Ui1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: " ", value: Ui1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: "abc", value: Ui1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: "-1", value: Ui1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: "0", value: Ui1Test(0), tag: "dupe"}, |
||||
{str: "1", value: Ui1Test(1), tag: "dupe"}, |
||||
{str: "255", value: Ui1Test(255), tag: "dupe"}, |
||||
{str: "256", value: Ui1Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// ui2
|
||||
{str: "65535", value: Ui2Test(65535)}, |
||||
{str: "65536", value: Ui2Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// ui4
|
||||
{str: "4294967295", value: Ui4Test(4294967295)}, |
||||
{str: "4294967296", value: Ui4Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// i1
|
||||
{str: "", value: I1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: " ", value: I1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: "abc", value: I1Test(0), wantUnmarshalErr: true, noMarshal: true, tag: "dupe"}, |
||||
{str: "0", value: I1Test(0), tag: "dupe"}, |
||||
{str: "-1", value: I1Test(-1), tag: "dupe"}, |
||||
{str: "127", value: I1Test(127), tag: "dupe"}, |
||||
{str: "-128", value: I1Test(-128), tag: "dupe"}, |
||||
{str: "128", value: I1Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "-129", value: I1Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// i2
|
||||
{str: "32767", value: I2Test(32767)}, |
||||
{str: "-32768", value: I2Test(-32768)}, |
||||
{str: "32768", value: I2Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "-32769", value: I2Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// i4
|
||||
{str: "2147483647", value: I4Test(2147483647)}, |
||||
{str: "-2147483648", value: I4Test(-2147483648)}, |
||||
{str: "2147483648", value: I4Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "-2147483649", value: I4Test(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// int
|
||||
{str: "9223372036854775807", value: IntTest(9223372036854775807)}, |
||||
{str: "-9223372036854775808", value: IntTest(-9223372036854775808)}, |
||||
{str: "9223372036854775808", value: IntTest(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "-9223372036854775809", value: IntTest(0), wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// fixed.14.4
|
||||
{str: "0.0000", value: Fixed14_4Test(0)}, |
||||
{str: "1.0000", value: Fixed14_4Test(1)}, |
||||
{str: "1.2346", value: Fixed14_4Test(1.23456)}, |
||||
{str: "-1.0000", value: Fixed14_4Test(-1)}, |
||||
{str: "-1.2346", value: Fixed14_4Test(-1.23456)}, |
||||
{str: "10000000000000.0000", value: Fixed14_4Test(1e13)}, |
||||
{str: "100000000000000.0000", value: Fixed14_4Test(1e14), wantMarshalErr: true, wantUnmarshalErr: true}, |
||||
{str: "-10000000000000.0000", value: Fixed14_4Test(-1e13)}, |
||||
{str: "-100000000000000.0000", value: Fixed14_4Test(-1e14), wantMarshalErr: true, wantUnmarshalErr: true}, |
||||
|
||||
// char
|
||||
{str: "a", value: CharTest('a')}, |
||||
{str: "z", value: CharTest('z')}, |
||||
{str: "\u1234", value: CharTest(0x1234)}, |
||||
{str: "aa", value: CharTest(0), wantMarshalErr: true, wantUnmarshalErr: true}, |
||||
{str: "", value: CharTest(0), wantMarshalErr: true, wantUnmarshalErr: true}, |
||||
|
||||
// date
|
||||
{str: "2013-10-08", value: DateTest{time.Date(2013, 10, 8, 0, 0, 0, 0, localLoc)}, tag: "no:dateTime"}, |
||||
{str: "20131008", value: DateTest{time.Date(2013, 10, 8, 0, 0, 0, 0, localLoc)}, noMarshal: true, tag: "no:dateTime"}, |
||||
{str: "2013-10-08T10:30:50", value: DateTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime"}, |
||||
{str: "2013-10-08T10:30:50Z", value: DateTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime"}, |
||||
{str: "", value: DateTest{}, wantMarshalErr: true, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "-1", value: DateTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
|
||||
// time
|
||||
{str: "00:00:00", value: TimeOfDayTest{TimeOfDay{FromMidnight: 0}}}, |
||||
{str: "000000", value: TimeOfDayTest{TimeOfDay{FromMidnight: 0}}, noMarshal: true}, |
||||
{str: "24:00:00", value: TimeOfDayTest{TimeOfDay{FromMidnight: 24 * time.Hour}}, noMarshal: true}, // ISO8601 special case
|
||||
{str: "24:01:00", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "24:00:01", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "25:00:00", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "00:60:00", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "00:00:60", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "01:02:03", value: TimeOfDayTest{TimeOfDay{FromMidnight: time010203}}}, |
||||
{str: "010203", value: TimeOfDayTest{TimeOfDay{FromMidnight: time010203}}, noMarshal: true}, |
||||
{str: "23:59:59", value: TimeOfDayTest{TimeOfDay{FromMidnight: time235959}}}, |
||||
{str: "235959", value: TimeOfDayTest{TimeOfDay{FromMidnight: time235959}}, noMarshal: true}, |
||||
{str: "01:02", value: TimeOfDayTest{TimeOfDay{FromMidnight: time0102}}, noMarshal: true}, |
||||
{str: "0102", value: TimeOfDayTest{TimeOfDay{FromMidnight: time0102}}, noMarshal: true}, |
||||
{str: "01", value: TimeOfDayTest{TimeOfDay{FromMidnight: time01}}, noMarshal: true}, |
||||
{str: "foo 01:02:03", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "foo\n01:02:03", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03 foo", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03\nfoo", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03Z", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03+01", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03+01:23", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03+0123", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03-01", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03-01:23", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
{str: "01:02:03-0123", value: TimeOfDayTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:time.tz"}, |
||||
|
||||
// time.tz
|
||||
{str: "24:00:01", value: TimeOfDayTzTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "01Z", value: TimeOfDayTzTest{TimeOfDay{time01, true, 0}}, noMarshal: true}, |
||||
{str: "01:02:03Z", value: TimeOfDayTzTest{TimeOfDay{time010203, true, 0}}}, |
||||
{str: "01+01", value: TimeOfDayTzTest{TimeOfDay{time01, true, 3600}}, noMarshal: true}, |
||||
{str: "01:02:03+01", value: TimeOfDayTzTest{TimeOfDay{time010203, true, 3600}}, noMarshal: true}, |
||||
{str: "01:02:03+01:23", value: TimeOfDayTzTest{TimeOfDay{time010203, true, 3600 + 23*60}}}, |
||||
{str: "01:02:03+0123", value: TimeOfDayTzTest{TimeOfDay{time010203, true, 3600 + 23*60}}, noMarshal: true}, |
||||
{str: "01:02:03-01", value: TimeOfDayTzTest{TimeOfDay{time010203, true, -3600}}, noMarshal: true}, |
||||
{str: "01:02:03-01:23", value: TimeOfDayTzTest{TimeOfDay{time010203, true, -(3600 + 23*60)}}}, |
||||
{str: "01:02:03-0123", value: TimeOfDayTzTest{TimeOfDay{time010203, true, -(3600 + 23*60)}}, noMarshal: true}, |
||||
|
||||
// dateTime
|
||||
{str: "2013-10-08T00:00:00", value: DateTimeTest{time.Date(2013, 10, 8, 0, 0, 0, 0, localLoc)}, tag: "no:dateTime.tz"}, |
||||
{str: "20131008", value: DateTimeTest{time.Date(2013, 10, 8, 0, 0, 0, 0, localLoc)}, noMarshal: true}, |
||||
{str: "2013-10-08T10:30:50", value: DateTimeTest{time.Date(2013, 10, 8, 10, 30, 50, 0, localLoc)}, tag: "no:dateTime.tz"}, |
||||
{str: "2013-10-08T10:30:50T", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true}, |
||||
{str: "2013-10-08T10:30:50+01", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime.tz"}, |
||||
{str: "2013-10-08T10:30:50+01:23", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime.tz"}, |
||||
{str: "2013-10-08T10:30:50+0123", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime.tz"}, |
||||
{str: "2013-10-08T10:30:50-01", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime.tz"}, |
||||
{str: "2013-10-08T10:30:50-01:23", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime.tz"}, |
||||
{str: "2013-10-08T10:30:50-0123", value: DateTimeTest{}, wantUnmarshalErr: true, noMarshal: true, tag: "no:dateTime.tz"}, |
||||
|
||||
// dateTime.tz
|
||||
{str: "2013-10-08T10:30:50", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, localLoc)}, noMarshal: true}, |
||||
{str: "2013-10-08T10:30:50+01", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, time.FixedZone("+01:00", 3600))}, noMarshal: true}, |
||||
{str: "2013-10-08T10:30:50+01:23", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, time.FixedZone("+01:23", 3600+23*60))}}, |
||||
{str: "2013-10-08T10:30:50+0123", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, time.FixedZone("+01:23", 3600+23*60))}, noMarshal: true}, |
||||
{str: "2013-10-08T10:30:50-01", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, time.FixedZone("-01:00", -3600))}, noMarshal: true}, |
||||
{str: "2013-10-08T10:30:50-01:23", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, time.FixedZone("-01:23", -(3600+23*60)))}}, |
||||
{str: "2013-10-08T10:30:50-0123", value: DateTimeTzTest{time.Date(2013, 10, 8, 10, 30, 50, 0, time.FixedZone("-01:23", -(3600+23*60)))}, noMarshal: true}, |
||||
|
||||
// boolean
|
||||
{str: "0", value: BooleanTest(false)}, |
||||
{str: "1", value: BooleanTest(true)}, |
||||
{str: "false", value: BooleanTest(false), noMarshal: true}, |
||||
{str: "true", value: BooleanTest(true), noMarshal: true}, |
||||
{str: "no", value: BooleanTest(false), noMarshal: true}, |
||||
{str: "yes", value: BooleanTest(true), noMarshal: true}, |
||||
{str: "", value: BooleanTest(false), noMarshal: true, wantUnmarshalErr: true}, |
||||
{str: "other", value: BooleanTest(false), noMarshal: true, wantUnmarshalErr: true}, |
||||
{str: "2", value: BooleanTest(false), noMarshal: true, wantUnmarshalErr: true}, |
||||
{str: "-1", value: BooleanTest(false), noMarshal: true, wantUnmarshalErr: true}, |
||||
|
||||
// bin.base64
|
||||
{str: "", value: BinBase64Test{}}, |
||||
{str: "YQ==", value: BinBase64Test("a")}, |
||||
{str: "TG9uZ2VyIFN0cmluZy4=", value: BinBase64Test("Longer String.")}, |
||||
{str: "TG9uZ2VyIEFsaWduZWQu", value: BinBase64Test("Longer Aligned.")}, |
||||
|
||||
// bin.hex
|
||||
{str: "", value: BinHexTest{}}, |
||||
{str: "61", value: BinHexTest("a")}, |
||||
{str: "4c6f6e67657220537472696e672e", value: BinHexTest("Longer String.")}, |
||||
{str: "4C6F6E67657220537472696E672E", value: BinHexTest("Longer String."), noMarshal: true}, |
||||
} |
||||
|
||||
// Generate extra test cases from convTests that implement duper.
|
||||
var extras []testCase |
||||
for i := range tests { |
||||
if duper, ok := tests[i].value.(duper); ok { |
||||
dupes := duper.Dupe(tests[i].tag) |
||||
for _, duped := range dupes { |
||||
dupedCase := testCase(tests[i]) |
||||
dupedCase.value = duped |
||||
extras = append(extras, dupedCase) |
||||
} |
||||
} |
||||
} |
||||
tests = append(tests, extras...) |
||||
|
||||
for _, test := range tests { |
||||
if test.noMarshal { |
||||
} else if resultStr, err := test.value.Marshal(); err != nil && !test.wantMarshalErr { |
||||
t.Errorf("For %T marshal %v, want %q, got error: %v", test.value, test.value, test.str, err) |
||||
} else if err == nil && test.wantMarshalErr { |
||||
t.Errorf("For %T marshal %v, want error, got %q", test.value, test.value, resultStr) |
||||
} else if err == nil && resultStr != test.str { |
||||
t.Errorf("For %T marshal %v, want %q, got %q", test.value, test.value, test.str, resultStr) |
||||
} |
||||
|
||||
if test.noUnMarshal { |
||||
} else if resultValue, err := test.value.Unmarshal(test.str); err != nil && !test.wantUnmarshalErr { |
||||
t.Errorf("For %T unmarshal %q, want %v, got error: %v", test.value, test.str, test.value, err) |
||||
} else if err == nil && test.wantUnmarshalErr { |
||||
t.Errorf("For %T unmarshal %q, want error, got %v", test.value, test.str, resultValue) |
||||
} else if err == nil && !test.value.Equal(resultValue) { |
||||
t.Errorf("For %T unmarshal %q, want %v, got %v", test.value, test.str, test.value, resultValue) |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue