Index: fuzzer/go/frontend/data/report_test.go |
diff --git a/fuzzer/go/frontend/data/report_test.go b/fuzzer/go/frontend/data/report_test.go |
index c0f2f4f489f06752d4636c0770b205af65a1174a..6159812f8ca6be3e7eb7408663e1e3b3d9da17b7 100644 |
--- a/fuzzer/go/frontend/data/report_test.go |
+++ b/fuzzer/go/frontend/data/report_test.go |
@@ -13,7 +13,7 @@ func TestSortedFuzzReports(t *testing.T) { |
"ffff"} |
for _, key := range addingOrder { |
- a = a.append(mockPictureDetails[key]) |
+ a = a.append(MockReport("skpicture", key)) |
} |
b := make(SortedFuzzReports, 0, 5) |
@@ -22,7 +22,7 @@ func TestSortedFuzzReports(t *testing.T) { |
for _, key := range sortedOrder { |
// just add them in already sorted order |
- b = append(b, mockPictureDetails[key]) |
+ b = append(b, MockReport("skpicture", key)) |
} |
if !reflect.DeepEqual(a, b) { |
t.Errorf("Expected: %#v\n, but was: %#v", a, b) |
@@ -49,112 +49,28 @@ func loadReports() *treeReportBuilder { |
builder := newBuilder() |
for _, key := range addingOrder { |
- builder.addFuzzReport("skpicture", mockPictureDetails[key]) |
+ builder.addFuzzReport("skpicture", MockReport("skpicture", key)) |
} |
addingOrder = []string{"iiii", "hhhh"} |
for _, key := range addingOrder { |
- builder.addFuzzReport("api", mockAPIDetails[key]) |
+ builder.addFuzzReport("api", MockReport("api", key)) |
} |
return builder |
} |
-func makeStacktrace(file, function string, line int) StackTrace { |
- return StackTrace{ |
- Frames: []StackTraceFrame{ |
- { |
- PackageName: "mock/package/", |
- FileName: file, |
- LineNumber: line, |
- FunctionName: function, |
- }, |
- }, |
- } |
-} |
- |
-var mockFlags = []string{"foo", "bar"} |
- |
-var mockPictureDetails = map[string]FuzzReport{ |
- "aaaa": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "beta", 16), |
- ReleaseStackTrace: makeStacktrace("alpha", "beta", 16), |
- DebugFlags: mockFlags, |
- FuzzName: "aaaa", |
- FuzzCategory: "skpicture", |
- }, |
- "bbbb": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "beta", 16), |
- ReleaseStackTrace: StackTrace{}, |
- DebugFlags: mockFlags, |
- FuzzName: "bbbb", |
- FuzzCategory: "skpicture", |
- }, |
- "cccc": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "beta", 16), |
- ReleaseStackTrace: makeStacktrace("alpha", "gamma", 26), |
- DebugFlags: mockFlags, |
- FuzzName: "cccc", |
- FuzzCategory: "skpicture", |
- }, |
- "dddd": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "gamma", 43), |
- ReleaseStackTrace: makeStacktrace("delta", "epsilon", 125), |
- DebugFlags: mockFlags, |
- FuzzName: "dddd", |
- FuzzCategory: "skpicture", |
- }, |
- "eeee": FuzzReport{ |
- DebugStackTrace: StackTrace{}, |
- ReleaseStackTrace: StackTrace{}, |
- DebugFlags: mockFlags, |
- FuzzName: "eeee", |
- FuzzCategory: "skpicture", |
- }, |
- "ffff": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "beta", 16), |
- ReleaseStackTrace: makeStacktrace("alpha", "beta", 16), |
- DebugFlags: mockFlags, |
- FuzzName: "ffff", |
- FuzzCategory: "skpicture", |
- }, |
- "gggg": FuzzReport{ |
- DebugStackTrace: makeStacktrace("delta", "epsilon", 122), |
- ReleaseStackTrace: StackTrace{}, |
- DebugFlags: mockFlags, |
- FuzzName: "gggg", |
- FuzzCategory: "skpicture", |
- }, |
-} |
- |
-var mockAPIDetails = map[string]FuzzReport{ |
- "hhhh": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "beta", 16), |
- ReleaseStackTrace: makeStacktrace("alpha", "beta", 16), |
- DebugFlags: mockFlags, |
- FuzzName: "hhhh", |
- FuzzCategory: "api", |
- }, |
- "iiii": FuzzReport{ |
- DebugStackTrace: makeStacktrace("alpha", "beta", 16), |
- ReleaseStackTrace: StackTrace{}, |
- DebugFlags: mockFlags, |
- FuzzName: "iiii", |
- FuzzCategory: "api", |
- }, |
-} |
- |
var expectedPictureTree = FuzzReportTree{ |
FileFuzzReport{ |
FileName: "mock/package/alpha", Count: 4, Functions: []FunctionFuzzReport{ |
FunctionFuzzReport{ |
FunctionName: "beta", Count: 3, LineNumbers: []LineFuzzReport{ |
LineFuzzReport{ |
- LineNumber: 16, Count: 3, Details: []FuzzReport{mockPictureDetails["aaaa"], mockPictureDetails["bbbb"], mockPictureDetails["ffff"]}, |
+ LineNumber: 16, Count: 3, Details: []FuzzReport{MockReport("skpicture", "aaaa"), MockReport("skpicture", "bbbb"), MockReport("skpicture", "ffff")}, |
}, |
}, |
}, FunctionFuzzReport{ |
FunctionName: "gamma", Count: 1, LineNumbers: []LineFuzzReport{ |
LineFuzzReport{ |
- LineNumber: 26, Count: 1, Details: []FuzzReport{mockPictureDetails["cccc"]}, |
+ LineNumber: 26, Count: 1, Details: []FuzzReport{MockReport("skpicture", "cccc")}, |
}, |
}, |
}, |
@@ -165,10 +81,10 @@ var expectedPictureTree = FuzzReportTree{ |
FunctionFuzzReport{ |
FunctionName: "epsilon", Count: 2, LineNumbers: []LineFuzzReport{ |
LineFuzzReport{ |
- LineNumber: 122, Count: 1, Details: []FuzzReport{mockPictureDetails["gggg"]}, |
+ LineNumber: 122, Count: 1, Details: []FuzzReport{MockReport("skpicture", "gggg")}, |
}, |
LineFuzzReport{ |
- LineNumber: 125, Count: 1, Details: []FuzzReport{mockPictureDetails["dddd"]}, |
+ LineNumber: 125, Count: 1, Details: []FuzzReport{MockReport("skpicture", "dddd")}, |
}, |
}, |
}, |
@@ -179,7 +95,7 @@ var expectedPictureTree = FuzzReportTree{ |
FunctionFuzzReport{ |
FunctionName: common.UNKNOWN_FUNCTION, Count: 1, LineNumbers: []LineFuzzReport{ |
LineFuzzReport{ |
- LineNumber: -1, Count: 1, Details: []FuzzReport{mockPictureDetails["eeee"]}, |
+ LineNumber: -1, Count: 1, Details: []FuzzReport{MockReport("skpicture", "eeee")}, |
}, |
}, |
}, |
@@ -238,7 +154,7 @@ var expectedAPITree = FuzzReportTree{ |
FunctionFuzzReport{ |
FunctionName: "beta", Count: 2, LineNumbers: []LineFuzzReport{ |
LineFuzzReport{ |
- LineNumber: 16, Count: 2, Details: []FuzzReport{mockAPIDetails["hhhh"], mockAPIDetails["iiii"]}, |
+ LineNumber: 16, Count: 2, Details: []FuzzReport{MockReport("api", "hhhh"), MockReport("api", "iiii")}, |
}, |
}, |
}, |