go-xmpp2: structs_test.go@a058e33c1666 (annotated)

2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	1	// Copyright 2011 The Go Authors. All rights reserved.
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	2	// Use of this source code is governed by a BSD-style
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	3	// license that can be found in the LICENSE file.
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	4
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	5	package xmpp
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	6
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	7	import (
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	8	"bytes"
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	9	"encoding/xml"
114 a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	10	"fmt"
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	11	"os"
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	12	"runtime"
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	13	"testing"
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	14	)
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	15
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	16	func assertEquals(t *testing.T, expected, observed string) {
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	17	if expected != observed {
114 a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	18	file := "unknown"
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	19	line := 0
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	20	_, file, line, _ = runtime.Caller(1)
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	21	fmt.Fprintf(os.Stderr, "%s:%d: Expected:\n%s\nObserved:\n%s\n",
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	22	file, line, expected, observed)
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	23	t.Fail()
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	24	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	25	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	26
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	27	func TestJid(t *testing.T) {
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	28	str := "user@domain/res"
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	29	jid := &JID{}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	30	if err := jid.Set(str); err != nil {
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	31	t.Errorf("Set(%s) failed: %s", str, err)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	32	}
25 7437d6eed227 Made JID.Node a string rather than string. This is more appropriate Chris Jones <chris@cjones.org>* parents: 24 diff changeset	33	assertEquals(t, "user", jid.Node)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	34	assertEquals(t, "domain", jid.Domain)
12 122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	35	assertEquals(t, "res", jid.Resource)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	36	assertEquals(t, str, jid.String())
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	37
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	38	str = "domain.tld"
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	39	if err := jid.Set(str); err != nil {
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	40	t.Errorf("Set(%s) failed: %s", str, err)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	41	}
25 7437d6eed227 Made JID.Node a string rather than string. This is more appropriate Chris Jones <chris@cjones.org>* parents: 24 diff changeset	42	if jid.Node != "" {
7437d6eed227 Made JID.Node a string rather than string. This is more appropriate Chris Jones <chris@cjones.org>* parents: 24 diff changeset	43	t.Errorf("Node: %v\n", jid.Node)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	44	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	45	assertEquals(t, "domain.tld", jid.Domain)
12 122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	46	if jid.Resource != "" {
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	47	t.Errorf("Resource: %v\n", jid.Resource)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	48	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	49	assertEquals(t, str, jid.String())
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	50	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	51
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	52	func assertMarshal(t *testing.T, expected string, marshal interface{}) {
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	53	var buf bytes.Buffer
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	54	enc := xml.NewEncoder(&buf)
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	55	err := enc.Encode(marshal)
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	56	if err != nil {
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	57	t.Errorf("Marshal error for %s: %s", marshal, err)
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	58	}
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	59	observed := buf.String()
114 a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	60	if expected != observed {
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	61	file := "unknown"
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	62	line := 0
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	63	_, file, line, _ = runtime.Caller(1)
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	64	fmt.Fprintf(os.Stderr, "%s:%d: Expected:\n%s\nObserved:\n%s\n",
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	65	file, line, expected, observed)
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	66	t.Fail()
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	67	}
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	68	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	69
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	70	func TestStreamMarshal(t *testing.T) {
22 d6b7b4cbf50d Made the stream type non-public. Chris Jones <chris@cjones.org> parents: 21 diff changeset	71	s := &stream{To: "bob"}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	72	exp := `<stream:stream xmlns="` + NsClient +
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	73	`" xmlns:stream="` + NsStream + `" to="bob">`
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	74	assertEquals(t, exp, s.String())
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	75
22 d6b7b4cbf50d Made the stream type non-public. Chris Jones <chris@cjones.org> parents: 21 diff changeset	76	s = &stream{To: "bob", From: "alice", Id: "#3", Version: "5.3"}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	77	exp = `<stream:stream xmlns="` + NsClient +
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	78	`" xmlns:stream="` + NsStream + `" to="bob" from="alice"` +
6 8e425e340ca1 Implemented writing to the remote. Now we have bidirectional communication. Chris Jones <christian.jones@sri.com> parents: 3 diff changeset	79	` id="#3" version="5.3">`
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	80	assertEquals(t, exp, s.String())
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	81
22 d6b7b4cbf50d Made the stream type non-public. Chris Jones <chris@cjones.org> parents: 21 diff changeset	82	s = &stream{Lang: "en_US"}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	83	exp = `<stream:stream xmlns="` + NsClient +
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	84	`" xmlns:stream="` + NsStream + `" xml:lang="en_US">`
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	85	assertEquals(t, exp, s.String())
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	86	}
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	87
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	88	func TestStreamErrorMarshal(t *testing.T) {
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	89	name := xml.Name{Space: NsStreams, Local: "ack"}
31 1dc47df5c99f Made streamError non-public, and made a first attempt at a stream Chris Jones <chris@cjones.org> parents: 26 diff changeset	90	e := &streamError{Any: Generic{XMLName: name}}
114 a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	91	exp := `<error xmlns="` + NsStream + `"><ack xmlns="` + NsStreams +
a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	92	`"></ack></error>`
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	93	assertMarshal(t, exp, e)
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	94
6 8e425e340ca1 Implemented writing to the remote. Now we have bidirectional communication. Chris Jones <christian.jones@sri.com> parents: 3 diff changeset	95	txt := errText{Lang: "pt", Text: "things happen"}
31 1dc47df5c99f Made streamError non-public, and made a first attempt at a stream Chris Jones <chris@cjones.org> parents: 26 diff changeset	96	e = &streamError{Any: Generic{XMLName: name}, Text: &txt}
114 a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	97	exp = `<error xmlns="` + NsStream + `"><ack xmlns="` + NsStreams +
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	98	`"></ack><text xmlns="` + NsStreams +
114 a058e33c1666 Updated for the latest revision of the encoding/xml fixes: The context object owned by Encoder and Decoder isn't directly accessible. Chris Jones <christian.jones@sri.com> parents: 111 diff changeset	99	`" xml:lang="pt">things happen</text></error>`
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	100	assertMarshal(t, exp, e)
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	101	}
12 122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	102
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	103	func TestIqMarshal(t *testing.T) {
111 36287f2cf06e Step 1 of moving to interface Stanza and embedded struct Header. Chris Jones <chris@cjones.org> parents: 110 diff changeset	104	iq := &Iq{Header: Header{Type: "set", Id: "3",
110 7696e6a01709 Instead of making Stanza an interface that Iq, Message, and Presence implement, change it to an embedded struct. Chris Jones <chris@cjones.org> parents: 98 diff changeset	105	Nested: []interface{}{Generic{XMLName: xml.Name{Space: NsBind,
7696e6a01709 Instead of making Stanza an interface that Iq, Message, and Presence implement, change it to an embedded struct. Chris Jones <chris@cjones.org> parents: 98 diff changeset	106	Local: "bind"}}}}}
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	107	exp := `<iq id="3" type="set"><bind xmlns="` + NsBind +
12 122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	108	`"></bind></iq>`
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	109	assertMarshal(t, exp, iq)
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	110	}
26 4d0a369079ce Removed the TextOut channel. Chris Jones <chris@cjones.org> parents: 25 diff changeset	111
71 578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	112	func TestMarshalEscaping(t *testing.T) {
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	113	msg := &Message{Body: &Generic{XMLName: xml.Name{Local: "body"},
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	114	Chardata: `&<!-- "`}}
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	115	exp := `<message><body>&<!-- "</body></message>`
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	116	assertMarshal(t, exp, msg)
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	117	}

author	Chris Jones <christian.jones@sri.com>
	Fri, 28 Dec 2012 17:07:20 -0700
changeset 114	a058e33c1666
parent 111	36287f2cf06e
child 115	7c45fc3f524a
permissions	-rw-r--r--