Skip to content

Commit 5054e0b

Browse files
committed
Get to 100pc coverage
Signed-off-by: Prithvi Raj <[email protected]>
1 parent 852776a commit 5054e0b

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

Diff for: cmd/query/app/handler_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func withTestServer(t *testing.T, doTest func(s *testServer), options ...Handler
133133
func TestGetTraceSuccess(t *testing.T) {
134134
server, readMock, _ := initializeTestServer()
135135
defer server.Close()
136-
readMock.On("GetTrace", mock.Anything, mock.AnythingOfType("model.TraceID")).
136+
readMock.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
137137
Return(mockTrace, nil).Once()
138138

139139
var response structuredResponse
@@ -273,7 +273,7 @@ func TestGetTrace(t *testing.T) {
273273
func TestGetTraceDBFailure(t *testing.T) {
274274
server, readMock, _ := initializeTestServer()
275275
defer server.Close()
276-
readMock.On("GetTrace", mock.AnythingOfType("model.TraceID")).
276+
readMock.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("model.TraceID")).
277277
Return(nil, errStorage).Once()
278278

279279
var response structuredResponse
@@ -462,9 +462,9 @@ func TestGetServicesSuccess(t *testing.T) {
462462
}
463463

464464
func TestGetServicesStorageFailure(t *testing.T) {
465-
server, mock, _ := initializeTestServer()
465+
server, readMock, _ := initializeTestServer()
466466
defer server.Close()
467-
mock.On("GetServices").Return(nil, errStorage).Once()
467+
readMock.On("GetServices", mock.AnythingOfType("*context.valueCtx")).Return(nil, errStorage).Once()
468468

469469
var response structuredResponse
470470
err := getJSON(server.URL+"/api/services", &response)
@@ -497,9 +497,9 @@ func TestGetOperationsNoServiceName(t *testing.T) {
497497
}
498498

499499
func TestGetOperationsStorageFailure(t *testing.T) {
500-
server, mock, _ := initializeTestServer()
500+
server, reaMock, _ := initializeTestServer()
501501
defer server.Close()
502-
mock.On("GetOperations", "trifle").Return(nil, errStorage).Once()
502+
reaMock.On("GetOperations", mock.AnythingOfType("*context.valueCtx"), "trifle").Return(nil, errStorage).Once()
503503

504504
var response structuredResponse
505505
err := getJSON(server.URL+"/api/operations?service=trifle", &response)
@@ -523,9 +523,9 @@ func TestGetOperationsLegacySuccess(t *testing.T) {
523523
}
524524

525525
func TestGetOperationsLegacyStorageFailure(t *testing.T) {
526-
server, mock, _ := initializeTestServer()
526+
server, readMock, _ := initializeTestServer()
527527
defer server.Close()
528-
mock.On("GetOperations", "trifle").Return(nil, errStorage).Once()
528+
readMock.On("GetOperations", mock.AnythingOfType("*context.valueCtx"), "trifle").Return(nil, errStorage).Once()
529529

530530
var response structuredResponse
531531
err := getJSON(server.URL+"/api/services/trifle/operations", &response)

Diff for: storage/spanstore/metrics/decorator_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ func TestSuccessfulUnderlyingCalls(t *testing.T) {
4141
mrs.GetTrace(context.Background(), model.TraceID{})
4242
mockReader.On("FindTraces", context.Background(), &spanstore.TraceQueryParameters{}).Return([]*model.Trace{}, nil)
4343
mrs.FindTraces(context.Background(), &spanstore.TraceQueryParameters{})
44+
mockReader.On("FindTraceIDs", context.Background(), &spanstore.TraceQueryParameters{}).Return([]model.TraceID{}, nil)
45+
mrs.FindTraceIDs(context.Background(), &spanstore.TraceQueryParameters{})
4446
counters, gauges := mf.Snapshot()
4547
expecteds := map[string]int64{
4648
"requests|operation=get_operations|result=ok": 1,
@@ -49,6 +51,8 @@ func TestSuccessfulUnderlyingCalls(t *testing.T) {
4951
"requests|operation=get_trace|result=err": 0,
5052
"requests|operation=find_traces|result=ok": 1,
5153
"requests|operation=find_traces|result=err": 0,
54+
"requests|operation=find_trace_ids|result=ok": 1,
55+
"requests|operation=find_trace_ids|result=err": 0,
5256
"requests|operation=get_services|result=ok": 1,
5357
"requests|operation=get_services|result=err": 0,
5458
}
@@ -94,6 +98,8 @@ func TestFailingUnderlyingCalls(t *testing.T) {
9498
mrs.GetTrace(context.Background(), model.TraceID{})
9599
mockReader.On("FindTraces", context.Background(), &spanstore.TraceQueryParameters{}).Return(nil, errors.New("Failure"))
96100
mrs.FindTraces(context.Background(), &spanstore.TraceQueryParameters{})
101+
mockReader.On("FindTraceIDs", context.Background(), &spanstore.TraceQueryParameters{}).Return(nil, errors.New("Failure"))
102+
mrs.FindTraceIDs(context.Background(), &spanstore.TraceQueryParameters{})
97103
counters, gauges := mf.Snapshot()
98104
expecteds := map[string]int64{
99105
"requests|operation=get_operations|result=ok": 0,
@@ -102,6 +108,8 @@ func TestFailingUnderlyingCalls(t *testing.T) {
102108
"requests|operation=get_trace|result=err": 1,
103109
"requests|operation=find_traces|result=ok": 0,
104110
"requests|operation=find_traces|result=err": 1,
111+
"requests|operation=find_trace_ids|result=ok": 0,
112+
"requests|operation=find_trace_ids|result=err": 1,
105113
"requests|operation=get_services|result=ok": 0,
106114
"requests|operation=get_services|result=err": 1,
107115
}

0 commit comments

Comments
 (0)