jshiffer/go-xmpp
1
0
Fork 1
mirror of https://github.com/FluuxIO/go-xmpp.git synced 2025-11-24 18:23:43 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump Go version and go-cmp version

Browse Source 
Update code to fix tests.
This commit is contained in:
Mickaël Rémond
2025-09-29 13:53:45 +02:00
parent 7186c058fd
commit 8e1c4f1204
8 changed files with 64 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stanza/commands_test.go
View File

@@ -2,8 +2,9 @@ package stanza_test
import (
"encoding/xml"
"gosrc.io/xmpp/stanza"
"testing"
"gosrc.io/xmpp/stanza"
)
func TestMarshalCommands(t *testing.T) {
@@ -35,6 +36,6 @@ func TestMarshalCommands(t *testing.T) {
}
if err := compareMarshal(input, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}

30
stanza/datetime_profiles_test.go
View File

@@ -21,7 +21,7 @@ func TestDateToStringOracle(t *testing.T) {
expected := "2009-11-10"
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t1 := JabberDate{value: time.Date(2009, time.November, 10, 23, 3, 22, 89, loc)}
@@ -47,7 +47,7 @@ func TestDateTimeToStringOracle(t *testing.T) {
expected := "2009-11-10T23:03:22+08:00"
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t1 := JabberDate{value: time.Date(2009, time.November, 10, 23, 3, 22, 89, loc)}
@@ -74,7 +74,7 @@ func TestDateTimeToStringNanosOracle(t *testing.T) {
expected := "2009-11-10T23:03:22.000000089+08:00"
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t1 := JabberDate{value: time.Date(2009, time.November, 10, 23, 3, 22, 89, loc)}
@@ -90,11 +90,11 @@ func TestTimeToString(t *testing.T) {
t1Str, err := t1.TimeToString(false)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t2Str, err := t2.TimeToString(false)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if t1Str == t2Str {
@@ -106,13 +106,13 @@ func TestTimeToStringOracle(t *testing.T) {
expected := "23:03:22+08:00"
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t1 := JabberDate{value: time.Date(2009, time.November, 10, 23, 3, 22, 89, loc)}
t1Str, err := t1.TimeToString(false)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if t1Str != expected {
@@ -122,16 +122,16 @@ func TestTimeToStringOracle(t *testing.T) {
func TestTimeToStringNanos(t *testing.T) {
t1 := JabberDate{value: time.Now()}
time.After(10 * time.Millisecond)
time.Sleep(10 * time.Millisecond)
t2 := JabberDate{value: time.Now()}
t1Str, err := t1.TimeToString(true)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t2Str, err := t2.TimeToString(true)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if t1Str == t2Str {
@@ -142,13 +142,13 @@ func TestTimeToStringNanosOracle(t *testing.T) {
expected := "23:03:22.000000089+08:00"
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
t1 := JabberDate{value: time.Date(2009, time.November, 10, 23, 3, 22, 89, loc)}
t1Str, err := t1.TimeToString(true)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if t1Str != expected {
@@ -160,19 +160,19 @@ func TestJabberDateParsing(t *testing.T) {
date := "2009-11-10"
_, err := NewJabberDateFromString(date)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
dateTime := "2009-11-10T23:03:22+08:00"
_, err = NewJabberDateFromString(dateTime)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
dateTimeNanos := "2009-11-10T23:03:22.000000089+08:00"
_, err = NewJabberDateFromString(dateTimeNanos)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
// TODO : fix these. Parsing a time with an offset doesn't work

31
stanza/pubsub_owner_test.go
View File

@@ -3,8 +3,9 @@ package stanza_test
import (
"encoding/xml"
"errors"
"gosrc.io/xmpp/stanza"
"testing"
"gosrc.io/xmpp/stanza"
)
// ******************************
@@ -45,7 +46,7 @@ func TestNewConfigureNode(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -100,7 +101,7 @@ func TestNewConfigureNodeResp(t *testing.T) {
pubsub, err := getPubSubOwnerPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.OwnerUseCase == nil {
t.Fatalf("owner use case is nil")
@@ -154,7 +155,7 @@ func TestNewRequestDefaultConfig(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -209,7 +210,7 @@ func TestNewRequestDefaultConfigResp(t *testing.T) {
pubsub, err := getPubSubOwnerPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.OwnerUseCase == nil {
t.Fatalf("owner use case is nil")
@@ -264,7 +265,7 @@ func TestNewDelNode(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -281,7 +282,7 @@ func TestNewDelNodeResp(t *testing.T) {
pubsub, err := getPubSubOwnerPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.OwnerUseCase == nil {
t.Fatalf("owner use case is nil")
@@ -340,7 +341,7 @@ func TestNewPurgeAllItems(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -390,7 +391,7 @@ func TestNewApproveSubRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -428,7 +429,7 @@ func TestNewGetPendingSubRequests(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -510,7 +511,7 @@ func TestNewApprovePendingSubRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -549,7 +550,7 @@ func TestNewSubListRqPl(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -624,7 +625,7 @@ func TestNewAffiliationListRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -718,7 +719,7 @@ func TestNewModifAffiliationRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -864,7 +865,7 @@ func TestNewFormSubmissionOwner(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}

37
stanza/pubsub_test.go
View File

@@ -3,9 +3,10 @@ package stanza_test
import (
"encoding/xml"
"errors"
"gosrc.io/xmpp/stanza"
"strings"
"testing"
"gosrc.io/xmpp/stanza"
)
var submitFormExample = stanza.NewForm([]*stanza.Field{
@@ -51,7 +52,7 @@ func TestNewSubRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -68,7 +69,7 @@ func TestNewSubResp(t *testing.T) {
pubsub, err := getPubSubGenericPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.Subscription == nil {
@@ -114,7 +115,7 @@ func TestNewUnSubRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -130,7 +131,7 @@ func TestNewUnsubResp(t *testing.T) {
pubsub, err := getPubSubGenericPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.Subscription == nil {
@@ -175,7 +176,7 @@ func TestNewSubOptsRq(t *testing.T) {
}
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -228,7 +229,7 @@ func TestNewNewConfOptsRsp(t *testing.T) {
pubsub, err := getPubSubGenericPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.SubOptions == nil {
@@ -286,7 +287,7 @@ func TestNewFormSubmission(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -343,7 +344,7 @@ func TestNewSubAndConfig(t *testing.T) {
}
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -381,7 +382,7 @@ func TestNewSubAndConfigResp(t *testing.T) {
pubsub, err := getPubSubGenericPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.Subscription == nil {
t.Fatalf("sub node is nil")
@@ -459,7 +460,7 @@ func TestNewItemsResp(t *testing.T) {
pubsub, err := getPubSubGenericPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.Items == nil {
t.Fatalf("sub options node is nil")
@@ -500,7 +501,7 @@ func TestNewSpecificItemRequest(t *testing.T) {
}
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -664,7 +665,7 @@ func TestNewDelItemFromNode(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -700,7 +701,7 @@ func TestNewCreateNode(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -714,7 +715,7 @@ func TestNewCreateNodeResp(t *testing.T) {
`
pubsub, err := getPubSubGenericPayload(response)
if err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
if pubsub.Create == nil {
t.Fatalf("create segment is nil")
@@ -783,7 +784,7 @@ func TestNewCreateAndConfigNode(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expectedReq, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -808,7 +809,7 @@ func TestNewRetrieveAllSubsRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expected, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}
@@ -868,7 +869,7 @@ func TestNewRetrieveAllAffilsRequest(t *testing.T) {
data, err := xml.Marshal(subR)
if err := compareMarshal(expected, string(data)); err != nil {
t.Fatalf(err.Error())
t.Fatal(err)
}
}