Skip to content

Commit 03b9751

Browse files
jonhadfieldjonhadfield
committed
update gosn-v2 dependency to improve cache times, and fix multiple issues.
1 parent 7b518da commit 03b9751

File tree

9 files changed

+162
-178
lines changed

9 files changed

+162
-178
lines changed

‎cmd/sncli/main_test.go‎

Lines changed: 82 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"github.com/stretchr/testify/assert"
54
"github.com/stretchr/testify/require"
65
"strings"
76
"testing"
@@ -10,145 +9,145 @@ import (
109

1110
func TestWipe(t *testing.T) {
1211
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
13-
assert.NoError(t, err)
14-
assert.Contains(t, msg, msgItemsDeleted)
12+
require.NoError(t, err)
13+
require.Contains(t, msg, msgItemsDeleted)
1514
time.Sleep(1 * time.Second)
1615
}
1716

1817
func TestAddTag(t *testing.T) {
1918
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
20-
assert.NoError(t, err)
19+
require.NoError(t, err)
2120
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "tag", "--title", "testAddOneTagGetCount"})
22-
assert.NoError(t, err)
23-
assert.Contains(t, msg, msgAddSuccess)
21+
require.NoError(t, err)
22+
require.Contains(t, msg, msgAddSuccess)
2423
}
2524

2625
func TestAddGetTag(t *testing.T) {
2726
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
28-
assert.NoError(t, err)
27+
require.NoError(t, err)
2928
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "tag", "--title", "testAddOneTagGetCount"})
30-
assert.NoError(t, err)
31-
assert.Contains(t, msg, msgAddSuccess)
29+
require.NoError(t, err)
30+
require.Contains(t, msg, msgAddSuccess)
3231
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "tag", "--title", "testAddOneTagGetCount"})
33-
assert.NoError(t, err)
32+
require.NoError(t, err)
3433
}
3534

3635
func TestAddGetTagExport(t *testing.T) {
3736
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
38-
assert.NoError(t, err)
37+
require.NoError(t, err)
3938
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "tag", "--title", "testAddOneTagGetCount"})
40-
assert.NoError(t, err)
41-
assert.Contains(t, msg, msgAddSuccess)
39+
require.NoError(t, err)
40+
require.Contains(t, msg, msgAddSuccess)
4241
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "tag", "--title", "testAddOneTagGetCount"})
43-
assert.NoError(t, err)
42+
require.NoError(t, err)
4443
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "export"})
45-
assert.NoError(t, err)
44+
require.NoError(t, err)
4645
}
4746

4847
func TestAddDeleteTag(t *testing.T) {
4948
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
50-
assert.NoError(t, err, "'wipe --yes' failed")
51-
assert.Contains(t, msg, msgItemsDeleted)
49+
require.NoError(t, err, "'wipe --yes' failed")
50+
require.Contains(t, msg, msgItemsDeleted)
5251
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "tag", "--title", "testTag"})
53-
assert.NoError(t, err, "'add tag --title testTag' failed")
54-
assert.Contains(t, msg, msgAddSuccess)
52+
require.NoError(t, err, "'add tag --title testTag' failed")
53+
require.Contains(t, msg, msgAddSuccess)
5554
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "tag", "--title", "testTag", "--count"})
56-
assert.Equal(t, "1", msg)
57-
assert.NoError(t, err)
55+
require.Equal(t, "1", msg)
56+
require.NoError(t, err)
5857
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag", "--title", "testTag"})
59-
assert.NoError(t, err)
60-
assert.Contains(t, msg, msgDeleted)
58+
require.NoError(t, err)
59+
require.Contains(t, msg, msgDeleted)
6160
}
6261

6362
func TestAddTagExportDeleteTagReImport(t *testing.T) {
6463
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
65-
assert.NoError(t, err)
64+
require.NoError(t, err)
6665
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "tag", "--title", "testAddOneTagGetCount"})
67-
assert.NoError(t, err)
68-
assert.Contains(t, msg, msgAddSuccess)
66+
require.NoError(t, err)
67+
require.Contains(t, msg, msgAddSuccess)
6968
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "tag", "--count"})
70-
assert.NoError(t, err)
71-
assert.Equal(t, "1", msg)
69+
require.NoError(t, err)
70+
require.Equal(t, "1", msg)
7271
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "export"})
73-
assert.NoError(t, err)
74-
assert.True(t, strings.HasPrefix(msg, "encrypted export written to:"))
72+
require.NoError(t, err)
73+
require.True(t, strings.HasPrefix(msg, "encrypted export written to:"))
7574
path := strings.TrimPrefix(msg, "encrypted export written to:")
7675
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag", "--title", "testAddOneTagGetCount"})
77-
assert.NoError(t, err)
78-
assert.Contains(t, msg, msgDeleted)
76+
require.NoError(t, err)
77+
require.Contains(t, msg, msgDeleted)
7978
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "tag", "--count"})
80-
assert.NoError(t, err)
81-
assert.Equal(t, "0", msg)
79+
require.NoError(t, err)
80+
require.Equal(t, "0", msg)
8281
msg, _, err = startCLI([]string{"sncli", "--debug", "import", "--experiment", "--file", path})
83-
assert.NoError(t, err)
84-
assert.True(t, strings.HasPrefix(msg, "imported"))
82+
require.NoError(t, err)
83+
require.True(t, strings.HasPrefix(msg, "imported"))
8584
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "tag", "--count"})
86-
assert.NoError(t, err)
87-
assert.Equal(t, "1", msg)
85+
require.NoError(t, err)
86+
require.Equal(t, "1", msg)
8887
}
8988

9089
func TestAddTagErrorMissingTitle(t *testing.T) {
9190
_, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "tag"})
92-
assert.Error(t, err, "error should be returned if title is unspecified")
91+
require.Error(t, err, "error should be returned if title is unspecified")
9392
}
9493

9594
func TestDeleteTagErrorMissingTitle(t *testing.T) {
9695
_, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag"})
97-
assert.Error(t, err, "error should be returned if title is unspecified")
96+
require.Error(t, err, "error should be returned if title is unspecified")
9897
}
9998

10099
func TestAddDeleteNote(t *testing.T) {
101100
_, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "wipe", "--yes"})
102-
assert.NoError(t, err, "failed to wipe")
101+
require.NoError(t, err, "failed to wipe")
103102
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "note", "--title", "testNote", "--text", "some example text"})
104-
assert.NoError(t, err, "failed to add note")
105-
assert.Contains(t, msg, msgAddSuccess)
103+
require.NoError(t, err, "failed to add note")
104+
require.Contains(t, msg, msgAddSuccess)
106105
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note", "--count"})
107-
assert.NoError(t, err, "failed to get note count")
108-
assert.Equal(t, "1", msg)
106+
require.NoError(t, err, "failed to get note count")
107+
require.Equal(t, "1", msg)
109108
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "note", "--title", "testNote"})
110-
assert.NoError(t, err, "failed to delete note")
111-
assert.Contains(t, msg, msgDeleted)
109+
require.NoError(t, err, "failed to delete note")
110+
require.Contains(t, msg, msgDeleted)
112111
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note", "--count"})
113-
assert.NoError(t, err, "failed to get note count")
114-
assert.Equal(t, "0", msg)
112+
require.NoError(t, err, "failed to get note count")
113+
require.Equal(t, "0", msg)
115114
time.Sleep(1 * time.Second)
116115
}
117116

118117
func TestAddNoteErrorMissingTitle(t *testing.T) {
119118
_, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "note"})
120-
assert.Error(t, err)
119+
require.Error(t, err)
121120
}
122121

123122
func TestDeleteNoteErrorMissingTitle(t *testing.T) {
124123
_, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "note"})
125-
assert.Error(t, err, "error should be returned if title is unspecified")
124+
require.Error(t, err, "error should be returned if title is unspecified")
126125
}
127126

128127
func TestTagNotesByTextWithNewTags(t *testing.T) {
129128
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "note", "--title", "TestNoteOne", "--text", "test note one"})
130-
assert.Contains(t, msg, msgAddSuccess)
129+
require.Contains(t, msg, msgAddSuccess)
131130
require.NoError(t, err)
132131

133132
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "note", "--title", "TestNoteTwo", "--text", "test note two"})
134-
assert.NoError(t, err)
135-
assert.Contains(t, msg, msgAddSuccess)
133+
require.NoError(t, err)
134+
require.Contains(t, msg, msgAddSuccess)
136135

137136
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "tag", "--find-text", "test note", "--title", "testTagOne,testTagTwo"})
138-
assert.NoError(t, err)
137+
require.NoError(t, err)
139138

140139
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "note", "--title", "TestNoteOne,TestNoteTwo"})
141-
assert.NoError(t, err)
140+
require.NoError(t, err)
142141

143142
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note"})
144-
assert.NoError(t, err)
143+
require.NoError(t, err)
145144

146145
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note", "--count"})
147-
assert.NoError(t, err)
148-
assert.Equal(t, "0", msg)
146+
require.NoError(t, err)
147+
require.Equal(t, "0", msg)
149148
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note"})
150-
assert.NoError(t, err)
151-
assert.NotEmpty(t, msg)
149+
require.NoError(t, err)
150+
require.NotEmpty(t, msg)
152151

153152
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag", "--title", "testTagOne,testTagTwo"})
154153
require.NoError(t, err)
@@ -160,15 +159,15 @@ func TestAddOneNoteGetCount(t *testing.T) {
160159
"sncli", "--debug", "--no-stdout", "add", "note", "--title", "testAddOneNoteGetCount Title",
161160
"--text", "testAddOneNoteGetCount Text",
162161
})
163-
assert.NoError(t, err)
164-
assert.Contains(t, msg, msgAddSuccess)
162+
require.NoError(t, err)
163+
require.Contains(t, msg, msgAddSuccess)
165164

166165
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note"})
167-
assert.NoError(t, err)
166+
require.NoError(t, err)
168167

169168
msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note", "--count"})
170-
assert.NoError(t, err)
171-
assert.Equal(t, "1", msg)
169+
require.NoError(t, err)
170+
require.Equal(t, "1", msg)
172171

173172
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "note", "--title", "testAddOneNoteGetCount Title"})
174173
require.NoError(t, err)
@@ -177,11 +176,11 @@ func TestAddOneNoteGetCount(t *testing.T) {
177176

178177
func TestAddOneTagGetCount(t *testing.T) {
179178
msg, _, err := startCLI([]string{"sncli", "--debug", "add", "tag", "--title", "testAddOneTagGetCount Title"})
180-
assert.NoError(t, err)
181-
assert.Contains(t, msg, msgAddSuccess)
179+
require.NoError(t, err)
180+
require.Contains(t, msg, msgAddSuccess)
182181
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "tag", "--count"})
183-
assert.NoError(t, err)
184-
assert.Equal(t, "1", msg)
182+
require.NoError(t, err)
183+
require.Equal(t, "1", msg)
185184

186185
_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag", "--title", "testAddOneTagGetCount Title"})
187186
require.NoError(t, err)
@@ -191,43 +190,43 @@ func TestAddOneTagGetCount(t *testing.T) {
191190

192191
func TestGetNoteCountWithNoResults(t *testing.T) {
193192
msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "get", "note", "--count"})
194-
assert.NoError(t, err)
195-
assert.Equal(t, "0", msg)
193+
require.NoError(t, err)
194+
require.Equal(t, "0", msg)
196195
time.Sleep(1 * time.Second)
197196
}
198197

199198
func TestGetTagCountWithNoResults(t *testing.T) {
200199
msg, _, err := startCLI([]string{"sncli", "--debug", "get", "tag", "--count"})
201-
assert.NoError(t, err)
202-
assert.Equal(t, "0", msg)
200+
require.NoError(t, err)
201+
require.Equal(t, "0", msg)
203202
time.Sleep(1 * time.Second)
204203
}
205204

206205
func TestGetNotesWithNoResults(t *testing.T) {
207206
msg, _, err := startCLI([]string{"sncli", "--debug", "get", "note"})
208-
assert.NoError(t, err)
209-
assert.Equal(t, msgNoMatches, msg)
207+
require.NoError(t, err)
208+
require.Equal(t, msgNoMatches, msg)
210209
time.Sleep(1 * time.Second)
211210
}
212211

213212
func TestGetTagsWithNoResults(t *testing.T) {
214213
msg, _, err := startCLI([]string{"sncli", "--debug", "get", "tag"})
215-
assert.NoError(t, err)
216-
assert.Equal(t, msgNoMatches, msg)
214+
require.NoError(t, err)
215+
require.Equal(t, msgNoMatches, msg)
217216
time.Sleep(1 * time.Second)
218217
}
219218

220219
func TestFinalWipeAndCountZero(t *testing.T) {
221220
_, _, err := startCLI([]string{"sncli", "--debug", "wipe", "--yes"})
222-
assert.NoError(t, err)
221+
require.NoError(t, err)
223222

224223
var msg string
225224

226225
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "note", "--count"})
227-
assert.NoError(t, err)
228-
assert.Equal(t, "0", msg)
226+
require.NoError(t, err)
227+
require.Equal(t, "0", msg)
229228

230229
msg, _, err = startCLI([]string{"sncli", "--debug", "get", "tag", "--count"})
231-
assert.NoError(t, err)
232-
assert.Equal(t, "0", msg)
230+
require.NoError(t, err)
231+
require.Equal(t, "0", msg)
233232
}

‎cmd/sncli/tag_test.go‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"fmt"
5+
"github.com/stretchr/testify/require"
56
"log"
67
"os"
78
"strconv"
@@ -12,7 +13,6 @@ import (
1213
"github.com/jonhadfield/gosn-v2"
1314
"github.com/jonhadfield/gosn-v2/cache"
1415
sncli "github.com/jonhadfield/sn-cli"
15-
"github.com/stretchr/testify/assert"
1616
)
1717

1818
var (
@@ -28,12 +28,11 @@ func localTestMain() {
2828
testUserPassword = "secretsanta"
2929

3030
rInput := gosn.RegisterInput{
31-
Password: testUserPassword,
32-
Email: testUserEmail,
33-
Identifier: testUserEmail,
34-
APIServer: localServer,
35-
Version: "004",
36-
Debug: true,
31+
Password: testUserPassword,
32+
Email: testUserEmail,
33+
APIServer: localServer,
34+
Version: "004",
35+
Debug: true,
3736
}
3837

3938
_, err := rInput.Register()
@@ -89,29 +88,29 @@ func TestGetTagsByTitleAndUUID(t *testing.T) {
8988
}
9089

9190
ato, err := addTagConfig.Run()
92-
assert.NoError(t, err)
93-
assert.Contains(t, ato.Added, "TestTagOne")
94-
assert.Contains(t, ato.Added, "TestTagTwo")
95-
assert.Empty(t, ato.Existing)
91+
require.NoError(t, err)
92+
require.Contains(t, ato.Added, "TestTagOne")
93+
require.Contains(t, ato.Added, "TestTagTwo")
94+
require.Empty(t, ato.Existing)
9695

9796
var tags gosn.Tags
9897
tags, err = getTagsByTitle(*testSession, "TestTagOne")
99-
assert.NoError(t, err)
100-
assert.Len(t, tags, 1)
101-
assert.Equal(t, "TestTagOne", tags[0].Content.Title)
98+
require.NoError(t, err)
99+
require.Len(t, tags, 1)
100+
require.Equal(t, "TestTagOne", tags[0].Content.Title)
102101

103102
tagUUID := tags[0].UUID
104103

105104
var tag gosn.Tag
106105
tag, err = getTagByUUID(testSession, tagUUID)
107-
assert.NoError(t, err)
108-
assert.Equal(t, "TestTagOne", tag.Content.Title)
106+
require.NoError(t, err)
107+
require.Equal(t, "TestTagOne", tag.Content.Title)
109108

110109
tags, err = getTagsByTitle(*testSession, "MissingTagOne")
111-
assert.NoError(t, err)
112-
assert.Empty(t, tags)
110+
require.NoError(t, err)
111+
require.Empty(t, tags)
113112

114113
_, err = getTagByUUID(testSession, "123")
115-
assert.Error(t, err)
116-
assert.Equal(t, "could not find tag with UUID 123", err.Error())
114+
require.Error(t, err)
115+
require.Equal(t, "could not find tag with UUID 123", err.Error())
117116
}

0 commit comments

Comments
 (0)