Compare commits
3 commits
160-regres
...
disco_info
Author | SHA1 | Date | |
---|---|---|---|
Bohdan Horbeshko | 69619ebc6d | ||
Bohdan Horbeshko | f8c4ecb59d | ||
9abd5be0aa |
|
@ -21,6 +21,7 @@ type DiscoInfo struct {
|
|||
Identity []Identity `xml:"identity"`
|
||||
Features []Feature `xml:"feature"`
|
||||
ResultSet *ResultSet `xml:"set,omitempty"`
|
||||
Form *Form `xml:"x,omitempty"`
|
||||
}
|
||||
|
||||
// Namespace lets DiscoInfo implement the IQPayload interface
|
||||
|
|
|
@ -16,6 +16,7 @@ func TestDiscoInfo_Builder(t *testing.T) {
|
|||
disco := iq.DiscoInfo()
|
||||
disco.AddIdentity("Test Component", "gateway", "service")
|
||||
disco.AddFeatures(stanza.NSDiscoInfo, stanza.NSDiscoItems, "jabber:iq:version", "urn:xmpp:delegation:1")
|
||||
disco.Form = stanza.NewForm([]*stanza.Field{}, "result")
|
||||
|
||||
parsedIQ, err := checkMarshalling(t, iq)
|
||||
if err != nil {
|
||||
|
@ -48,6 +49,15 @@ func TestDiscoInfo_Builder(t *testing.T) {
|
|||
t.Errorf("Incorrect identity name: %#v", pp.Identity[0].Name)
|
||||
}
|
||||
}
|
||||
|
||||
// Check form
|
||||
if pp.Form == nil {
|
||||
t.Errorf("Form is nil")
|
||||
} else {
|
||||
if len(pp.Form.Fields) != 0 {
|
||||
t.Errorf("Form fields length mismatch: %#v", pp.Form.Fields)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Implements XEP-0030 example 17
|
||||
|
|
|
@ -51,11 +51,21 @@ func NewJid(sjid string) (*Jid, error) {
|
|||
}
|
||||
|
||||
func (j *Jid) Full() string {
|
||||
return j.Node + "@" + j.Domain + "/" + j.Resource
|
||||
if j.Resource == "" {
|
||||
return j.Bare()
|
||||
} else if j.Node == "" {
|
||||
return j.Node + "/" + j.Resource
|
||||
} else {
|
||||
return j.Node + "@" + j.Domain + "/" + j.Resource
|
||||
}
|
||||
}
|
||||
|
||||
func (j *Jid) Bare() string {
|
||||
return j.Node + "@" + j.Domain
|
||||
if j.Node == "" {
|
||||
return j.Domain
|
||||
} else {
|
||||
return j.Node + "@" + j.Domain
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
|
|
|
@ -61,26 +61,41 @@ func TestIncorrectJids(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestFull(t *testing.T) {
|
||||
jid := "test@domain.com/my resource"
|
||||
parsedJid, err := NewJid(jid)
|
||||
if err != nil {
|
||||
t.Errorf("could not parse jid: %v", err)
|
||||
fullJids := []string{
|
||||
"test@domain.com/my resource",
|
||||
"test@domain.com",
|
||||
"domain.com",
|
||||
}
|
||||
fullJid := parsedJid.Full()
|
||||
if fullJid != jid {
|
||||
t.Errorf("incorrect full jid: %s", fullJid)
|
||||
for _, sjid := range fullJids {
|
||||
parsedJid, err := NewJid(sjid)
|
||||
if err != nil {
|
||||
t.Errorf("could not parse jid: %v", err)
|
||||
}
|
||||
fullJid := parsedJid.Full()
|
||||
if fullJid != sjid {
|
||||
t.Errorf("incorrect full jid: %s", fullJid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestBare(t *testing.T) {
|
||||
jid := "test@domain.com"
|
||||
fullJid := jid + "/my resource"
|
||||
parsedJid, err := NewJid(fullJid)
|
||||
if err != nil {
|
||||
t.Errorf("could not parse jid: %v", err)
|
||||
tests := []struct {
|
||||
jidstr string
|
||||
expected string
|
||||
}{
|
||||
{jidstr: "test@domain.com", expected: "test@domain.com"},
|
||||
{jidstr: "test@domain.com/resource", expected: "test@domain.com"},
|
||||
{jidstr: "domain.com", expected: "domain.com"},
|
||||
}
|
||||
bareJid := parsedJid.Bare()
|
||||
if bareJid != jid {
|
||||
t.Errorf("incorrect bare jid: %s", bareJid)
|
||||
|
||||
for _, tt := range tests {
|
||||
parsedJid, err := NewJid(tt.jidstr)
|
||||
if err != nil {
|
||||
t.Errorf("could not parse jid: %v", err)
|
||||
}
|
||||
bareJid := parsedJid.Bare()
|
||||
if bareJid != tt.expected {
|
||||
t.Errorf("incorrect bare jid: %s", bareJid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue