go-xmpp2: structs_test.go@bee6cc131798 (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"
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	10	"testing"
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	11	)
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	12
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	13	func assertEquals(t *testing.T, expected, observed string) {
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	14	if expected != observed {
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	15	t.Errorf("Expected:\n%s\nObserved:\n%s\n", expected,
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	16	observed)
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	17	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	18	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	19
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	20	func TestJid(t *testing.T) {
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	21	str := "user@domain/res"
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	22	jid := &JID{}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	23	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	24	t.Errorf("Set(%s) failed: %s", str, err)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	25	}
25 7437d6eed227 Made JID.Node a string rather than string. This is more appropriate Chris Jones <chris@cjones.org>* parents: 24 diff changeset	26	assertEquals(t, "user", jid.Node)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	27	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	28	assertEquals(t, "res", jid.Resource)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	29	assertEquals(t, str, jid.String())
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	30
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	31	str = "domain.tld"
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	32	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	33	t.Errorf("Set(%s) failed: %s", str, err)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	34	}
25 7437d6eed227 Made JID.Node a string rather than string. This is more appropriate Chris Jones <chris@cjones.org>* parents: 24 diff changeset	35	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	36	t.Errorf("Node: %v\n", jid.Node)
3 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	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	39	if jid.Resource != "" {
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	40	t.Errorf("Resource: %v\n", jid.Resource)
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	41	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	42	assertEquals(t, str, jid.String())
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	43	}
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	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	46	var buf bytes.Buffer
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	47	enc := xml.NewEncoder(&buf)
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	48	enc.Context.Map[NsClient] = ""
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	49	enc.Context.Map[NsStream] = "stream"
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	50	err := enc.Encode(marshal)
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	51	if err != nil {
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	52	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	53	}
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	54	observed := buf.String()
3 6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	55	assertEquals(t, expected, observed)
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	56	}
6121aa2f21b1 Made JID implement flag.Value. Chris Jones <chris@cjones.org> parents: 2 diff changeset	57
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	58	func TestStreamMarshal(t *testing.T) {
22 d6b7b4cbf50d Made the stream type non-public. Chris Jones <chris@cjones.org> parents: 21 diff changeset	59	s := &stream{To: "bob"}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	60	exp := `<stream:stream xmlns="` + NsClient +
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	61	`" xmlns:stream="` + NsStream + `" to="bob">`
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	62	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	63
22 d6b7b4cbf50d Made the stream type non-public. Chris Jones <chris@cjones.org> parents: 21 diff changeset	64	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	65	exp = `<stream:stream xmlns="` + NsClient +
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	66	`" 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	67	` id="#3" version="5.3">`
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	68	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	69
22 d6b7b4cbf50d Made the stream type non-public. Chris Jones <chris@cjones.org> parents: 21 diff changeset	70	s = &stream{Lang: "en_US"}
98 c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	71	exp = `<stream:stream xmlns="` + NsClient +
c9cc4eda6dce Updated for Go 1.0 + upcoming XML fixes. Chris Jones <chris@cjones.org> parents: 72 diff changeset	72	`" 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	73	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	74	}
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	75
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	76	func TestStreamErrorMarshal(t *testing.T) {
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	77	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	78	e := &streamError{Any: Generic{XMLName: name}}
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	79	exp := `<stream:error><ack xmlns="` + NsStreams +
72 53f15893a1a7 gofmt Chris Jones <christian.jones@sri.com> parents: 71 diff changeset	80	`"></ack></stream: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	81	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	82
6 8e425e340ca1 Implemented writing to the remote. Now we have bidirectional communication. Chris Jones <christian.jones@sri.com> parents: 3 diff changeset	83	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	84	e = &streamError{Any: Generic{XMLName: name}, Text: &txt}
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	85	exp = `<stream:error><ack xmlns="` + NsStreams +
7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	86	`"></ack><text xmlns="` + NsStreams +
2 4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	87	`" xml:lang="pt">things happen</text></stream:error>`
4dabfef08c8c Forgot to add the new xmpp.go from my last commit. Also added some Chris Jones <chris@cjones.org> parents: diff changeset	88	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	89	}
12 122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	90
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	91	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	92	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	93	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	94	Local: "bind"}}}}}
34 7b1f924c75e2 Made the namespace constants public. Chris Jones <chris@cjones.org> parents: 31 diff changeset	95	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	96	`"></bind></iq>`
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	97	assertMarshal(t, exp, iq)
122ab6208c3c Added resource binding and structures for <iq>, <message>, and <presence>. Chris Jones <chris@cjones.org> parents: 7 diff changeset	98	}
26 4d0a369079ce Removed the TextOut channel. Chris Jones <chris@cjones.org> parents: 25 diff changeset	99
71 578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	100	func TestMarshalEscaping(t *testing.T) {
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	101	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	102	Chardata: `&<!-- "`}}
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	103	exp := `<message><body>&<!-- "</body></message>`
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	104	assertMarshal(t, exp, msg)
578c2a83dc18 Added a quick test of XML escaping. Chris Jones <chris@cjones.org> parents: 61 diff changeset	105	}

author	Chris Jones <chris@cjones.org>
	Sun, 16 Dec 2012 23:06:54 -0700
changeset 113	bee6cc131798
parent 111	36287f2cf06e
child 114	a058e33c1666
permissions	-rw-r--r--