Skip to content

Commit 26d8b8c

Browse files
authored
Merge pull request #18 from atlassian/cwood/fix-tests
Cwood/fix tests
2 parents 1989bc8 + 07d7fa5 commit 26d8b8c

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: go
22

33
go:
4-
- "1.9"
54
- "1.10"
65
- "1.11"
6+
- "1.13"
77
- tip
88

99
env:

events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type Event struct {
7070
DateCreated *time.Time `json:"dateCreated,omitempty"`
7171
DateReceived *time.Time `json:"dateReceived,omitempty"`
7272
User *User `json:"user,omitempty"`
73-
Entries *[]Entry `json:"entries,omitempty"`
73+
Entries []Entry `json:"entries,omitempty"`
7474
Packages *map[string]string `json:"packages,omitempty"`
7575
SDK *map[string]interface{} `json:"sdk,omitempty"`
7676
Contexts *map[string]interface{} `json:"contexts,omitempty"`

events_test.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,27 @@ func TestEventsResource(t *testing.T) {
7474
t.Error(err)
7575
}
7676

77-
for _, entry := range *oldest.Entries {
77+
if len(oldest.Entries) == 0 {
78+
t.Fatal("no entries found and is nil")
79+
}
80+
81+
for _, entry := range oldest.Entries {
7882
name, inter, err := entry.GetInterface()
7983
if err != nil {
8084
t.Error(err)
8185
}
8286
t.Logf("Name: %s, Interface: %v, Error: %v", name, inter, err)
8387

8488
if name == "message" {
85-
t.Logf("Messages: %v", *inter.(*datatype.Message).Message)
89+
if inter == nil {
90+
t.Error("iter message is nil")
91+
}
92+
93+
if m := inter.(*datatype.Message); m != nil {
94+
t.Logf("Messages: %v", m.Message)
95+
} else {
96+
t.Errorf("Message is nil %v", m)
97+
}
8698
}
8799
}
88100
})

userfeedback_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ func TestUserFeedbackResource(t *testing.T) {
4545
issue := issues[0]
4646

4747
events, _, _ := client.GetIssueEvents(issue)
48+
if len(events) == 0 {
49+
t.Fatal("no events found")
50+
}
4851

4952
feedback := NewUserFeedback("Colin Wood", "This is a great feature", "[email protected]", events[0].EventID)
5053

0 commit comments

Comments
 (0)