Skip to content

Commit ebc35e4

Browse files
damienfamed75damienfamed75
committed
Fix unit tests
1 parent b974e37 commit ebc35e4

23 files changed

+297
-4182
lines changed

‎examples/vertex-properties-example/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
package main
2222

2323
import (
24-
"encoding/json"
2524
"flag"
2625
"fmt"
2726

@@ -92,14 +91,15 @@ func main() {
9291
logger.Fatal("Querying error", zap.Error(err))
9392
}
9493

95-
var props grammes.PropertyList
96-
9794
// Unmarshal raw data into a PropertyList
98-
json.Unmarshal(res, &props)
95+
props, err := grammes.UnmarshalPropertyList(res)
96+
if err != nil {
97+
fmt.Printf("error unmarshalling data: %s", err.Error())
98+
}
9999

100100
// Print out columns of the received data.
101101
fmt.Printf("%-20s %-8s\n", "Label", "Value")
102-
for _, p := range props.Properties {
102+
for _, p := range props {
103103
fmt.Printf("%#-20v %#-8v\n", p.Value.Label, p.GetValue())
104104
}
105105
}

‎go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module github.com/northwesternmutual/grammes
22

3+
go 1.13
4+
35
require (
46
github.com/google/uuid v1.1.0
57
github.com/gopherjs/gopherjs v0.0.0-20190309154008-847fc94819f9 // indirect

‎grammes_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ func Example_executeQuery() {
5454
}
5555

5656
// Print out the result as a string
57-
log.Println(string(res))
57+
for _, r := range res {
58+
log.Println(string(r))
59+
}
5860
}
5961

6062
func Example_executeStringQuery() {
@@ -71,5 +73,7 @@ func Example_executeStringQuery() {
7173
}
7274

7375
// Print out the result as a string
74-
log.Println(string(res))
76+
for _, r := range res {
77+
log.Println(string(r))
78+
}
7579
}

‎manager/addvertex_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func (mockQuery) String() string { return "TEST" }
6969

7070
func TestAddAPIVertex(t *testing.T) {
7171
Convey("Given a string executor and vertex query manager", t, func() {
72-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
73-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
72+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
73+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
7474
Convey("When AddAPIVertex is called", func() {
7575
var data model.APIData
7676
data.Properties = map[string]string{"testkey": "testval"}
@@ -84,8 +84,8 @@ func TestAddAPIVertex(t *testing.T) {
8484

8585
func TestAddAPIVertexError(t *testing.T) {
8686
Convey("Given a string executor and vertex query manager", t, func() {
87-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
88-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
87+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
88+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
8989
Convey("When AddAPIVertex is called and an error occurs", func() {
9090
var data model.APIData
9191
_, err := qm.AddAPIVertex(data)
@@ -98,8 +98,8 @@ func TestAddAPIVertexError(t *testing.T) {
9898

9999
func TestAddVertexByStruct(t *testing.T) {
100100
Convey("Given a string executor and vertex query manager", t, func() {
101-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
102-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
101+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
102+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
103103
Convey("When AddVertexByStruct is called", func() {
104104
res, _ := qm.AddVertexByStruct(testVertex)
105105
Convey("Then the return vertex ID value should be 28720", func() {
@@ -111,8 +111,8 @@ func TestAddVertexByStruct(t *testing.T) {
111111

112112
func TestAddVertexByStructError(t *testing.T) {
113113
Convey("Given a string executor and vertex query manager", t, func() {
114-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
115-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
114+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
115+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
116116
Convey("When AddVertexByStruct is called and an error is thrown", func() {
117117
_, err := qm.AddVertexByStruct(testVertex)
118118
Convey("Then the error should be returned", func() {
@@ -124,8 +124,8 @@ func TestAddVertexByStructError(t *testing.T) {
124124

125125
func TestAddVertexError(t *testing.T) {
126126
Convey("Given a string executor and vertex query manager", t, func() {
127-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
128-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
127+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
128+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
129129
Convey("When AddVertex is called with an odd number of parameters", func() {
130130
_, err := qm.AddVertex("testLabel", "prop1")
131131
Convey("Then the error should be returned", func() {
@@ -137,8 +137,8 @@ func TestAddVertexError(t *testing.T) {
137137

138138
func TestAddVertexLabels(t *testing.T) {
139139
Convey("Given a string executor and vertex query manager", t, func() {
140-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
141-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
140+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
141+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
142142
Convey("When AddVertexLabels is called", func() {
143143
_, err := qm.AddVertexLabels("testlabel")
144144
Convey("Then the error returned should be nil", func() {
@@ -150,8 +150,8 @@ func TestAddVertexLabels(t *testing.T) {
150150

151151
func TestAddVertexLabelsQueryError(t *testing.T) {
152152
Convey("Given a string executor and vertex query manager", t, func() {
153-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
154-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
153+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
154+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
155155
Convey("When AddVertexLabels is called and encounters a querying error", func() {
156156
_, err := qm.AddVertexLabels("testlabel")
157157
Convey("Then the error should be returned", func() {
@@ -163,8 +163,8 @@ func TestAddVertexLabelsQueryError(t *testing.T) {
163163

164164
func TestAddVertexByQuery(t *testing.T) {
165165
Convey("Given a string executor and vertex query manager", t, func() {
166-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
167-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
166+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
167+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
168168
Convey("When AddVertexByQuery is called", func() {
169169
var q mockQuery
170170
res, _ := qm.AddVertexByQuery(q)
@@ -181,8 +181,8 @@ func TestAddVertexByStringJsonUnmarshalError(t *testing.T) {
181181
}()
182182
jsonUnmarshal = func([]byte, interface{}) error { return errors.New("ERROR") }
183183
Convey("Given a string executor and vertex query manager", t, func() {
184-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
185-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
184+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
185+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
186186
Convey("When AddVertexByString throws an error while unmarshalling", func() {
187187
_, err := qm.AddVertexByString("testquery")
188188
Convey("Then the error should be returned", func() {
@@ -198,8 +198,8 @@ func TestAddVertexByStringReturnnilVertex(t *testing.T) {
198198
}()
199199
jsonUnmarshal = func([]byte, interface{}) error { return nil }
200200
Convey("Given a string executor and vertex query manager", t, func() {
201-
execute := func(string) ([]byte, error) { return []byte(vertexResponse), nil }
202-
qm := newAddVertexQueryManager(logging.NewBasicLogger(), execute)
201+
execute := func(string) ([][]byte, error) { return [][]byte{[]byte(vertexResponse)}, nil }
202+
qm := newAddVertexQueryManager(logging.NewNilLogger(), execute)
203203
Convey("When AddVertexByString is called and no vertices are added", func() {
204204
res, _ := qm.AddVertexByString("testquery")
205205
Convey("Then the return value should be the nil vertex", func() {

‎manager/dropvertex_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131

3232
func TestDropVertexLabel(t *testing.T) {
3333
Convey("Given a string executor and drop query manager", t, func() {
34-
execute := func(string) ([]byte, error) { return nil, nil }
35-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
34+
execute := func(string) ([][]byte, error) { return nil, nil }
35+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
3636
Convey("When DropVertexLabel is called", func() {
3737
err := dm.DropVertexLabel("testlabel")
3838
Convey("The return error should be nil", func() {
@@ -44,8 +44,8 @@ func TestDropVertexLabel(t *testing.T) {
4444

4545
func TestDropVertexLabelError(t *testing.T) {
4646
Convey("Given a string executor and drop query manager", t, func() {
47-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
48-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
47+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
48+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
4949
Convey("When DropVertexLabel is called and encounters an error", func() {
5050
err := dm.DropVertexLabel("testlabel")
5151
Convey("Then the error should be returned", func() {
@@ -57,8 +57,8 @@ func TestDropVertexLabelError(t *testing.T) {
5757

5858
func TestDropVertexByID(t *testing.T) {
5959
Convey("Given a string executor and drop query manager", t, func() {
60-
execute := func(string) ([]byte, error) { return nil, nil }
61-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
60+
execute := func(string) ([][]byte, error) { return nil, nil }
61+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
6262
Convey("When DropVertexByID is called", func() {
6363
err := dm.DropVertexByID(1234)
6464
Convey("Then the return error should be nil", func() {
@@ -70,8 +70,8 @@ func TestDropVertexByID(t *testing.T) {
7070

7171
func TestDropVertexByIDError(t *testing.T) {
7272
Convey("Given a string executor and drop query manager", t, func() {
73-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
74-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
73+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
74+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
7575
Convey("When DropVertexByID is called and encounters an error", func() {
7676
err := dm.DropVertexByID(1234)
7777
Convey("Then the error should be returned", func() {
@@ -83,8 +83,8 @@ func TestDropVertexByIDError(t *testing.T) {
8383

8484
func TestDropVerticesByString(t *testing.T) {
8585
Convey("Given a string executor and drop query manager", t, func() {
86-
execute := func(string) ([]byte, error) { return nil, nil }
87-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
86+
execute := func(string) ([][]byte, error) { return nil, nil }
87+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
8888
Convey("When DropVertexByString is called", func() {
8989
err := dm.DropVerticesByString("testquery")
9090
Convey("Then the return error should be nil", func() {
@@ -96,8 +96,8 @@ func TestDropVerticesByString(t *testing.T) {
9696

9797
func TestDropVerticesByStringError(t *testing.T) {
9898
Convey("Given a string executor and drop query manager", t, func() {
99-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
100-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
99+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
100+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
101101
Convey("When DropVertexByString is called and encounters an error", func() {
102102
err := dm.DropVerticesByString("testquery")
103103
Convey("Then the error should be returned", func() {
@@ -109,8 +109,8 @@ func TestDropVerticesByStringError(t *testing.T) {
109109

110110
func TestDropVerticesByQuery(t *testing.T) {
111111
Convey("Given a string executor and drop query manager", t, func() {
112-
execute := func(string) ([]byte, error) { return nil, nil }
113-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
112+
execute := func(string) ([][]byte, error) { return nil, nil }
113+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
114114
Convey("When DropVertexByQuery is called", func() {
115115
var q mockQuery
116116
err := dm.DropVerticesByQuery(q)
@@ -123,8 +123,8 @@ func TestDropVerticesByQuery(t *testing.T) {
123123

124124
func TestDropVerticesByQueryError(t *testing.T) {
125125
Convey("Given a string executor and drop query manager", t, func() {
126-
execute := func(string) ([]byte, error) { return nil, errors.New("ERROR") }
127-
dm := newDropQueryManager(logging.NewBasicLogger(), execute)
126+
execute := func(string) ([][]byte, error) { return nil, errors.New("ERROR") }
127+
dm := newDropQueryManager(logging.NewNilLogger(), execute)
128128
Convey("When DropVertexByQuery is called and encounters an error", func() {
129129
var q mockQuery
130130
err := dm.DropVerticesByQuery(q)

0 commit comments

Comments
 (0)