From 36170a473636d379ff8aecd638cf2839937c7196 Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Sun, 3 Apr 2016 00:03:33 -0400 Subject: [PATCH] more gofmt simplifications --- .../simple/fragment_scorer_simple_test.go | 6 ++--- .../simple/highlighter_simple_test.go | 26 +++++++++---------- search/highlight/term_locations_test.go | 24 ++++++++--------- search/scorers/scorer_term_test.go | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/search/highlight/highlighters/simple/fragment_scorer_simple_test.go b/search/highlight/highlighters/simple/fragment_scorer_simple_test.go index 32da20c2..657e338b 100644 --- a/search/highlight/highlighters/simple/fragment_scorer_simple_test.go +++ b/search/highlight/highlighters/simple/fragment_scorer_simple_test.go @@ -31,7 +31,7 @@ func TestSimpleFragmentScorer(t *testing.T) { }, tlm: search.TermLocationMap{ "cat": []*search.Location{ - &search.Location{ + { Pos: 0, Start: 0, End: 3, @@ -48,14 +48,14 @@ func TestSimpleFragmentScorer(t *testing.T) { }, tlm: search.TermLocationMap{ "cat": []*search.Location{ - &search.Location{ + { Pos: 1, Start: 0, End: 3, }, }, "hat": []*search.Location{ - &search.Location{ + { Pos: 4, Start: 11, End: 14, diff --git a/search/highlight/highlighters/simple/highlighter_simple_test.go b/search/highlight/highlighters/simple/highlighter_simple_test.go index eba95226..e97754f1 100644 --- a/search/highlight/highlighters/simple/highlighter_simple_test.go +++ b/search/highlight/highlighters/simple/highlighter_simple_test.go @@ -35,14 +35,14 @@ func TestSimpleHighlighter(t *testing.T) { Locations: search.FieldTermLocationMap{ "desc": search.TermLocationMap{ "quick": []*search.Location{ - &search.Location{ + { Pos: 2, Start: 4, End: 9, }, }, "fox": []*search.Location{ - &search.Location{ + { Pos: 4, Start: 16, End: 19, @@ -80,61 +80,61 @@ Etiam vel augue vel nisl commodo suscipit et ac nisl. Quisque eros diam, porttit Locations: search.FieldTermLocationMap{ "full": search.TermLocationMap{ "metus": []*search.Location{ - &search.Location{ + { Pos: 0, Start: 883, End: 888, }, - &search.Location{ + { Pos: 0, Start: 915, End: 920, }, - &search.Location{ + { Pos: 0, Start: 2492, End: 2497, }, - &search.Location{ + { Pos: 0, Start: 2822, End: 2827, }, - &search.Location{ + { Pos: 0, Start: 3417, End: 3422, }, }, "interdum": []*search.Location{ - &search.Location{ + { Pos: 0, Start: 1891, End: 1899, }, - &search.Location{ + { Pos: 0, Start: 2813, End: 2821, }, }, "venenatis": []*search.Location{ - &search.Location{ + { Pos: 0, Start: 954, End: 963, }, - &search.Location{ + { Pos: 0, Start: 1252, End: 1261, }, - &search.Location{ + { Pos: 0, Start: 1795, End: 1804, }, - &search.Location{ + { Pos: 0, Start: 2803, End: 2812, diff --git a/search/highlight/term_locations_test.go b/search/highlight/term_locations_test.go index ea8f0017..a138cc48 100644 --- a/search/highlight/term_locations_test.go +++ b/search/highlight/term_locations_test.go @@ -341,10 +341,10 @@ func TestTermLocationsOrder(t *testing.T) { { input: search.TermLocationMap{ "term": []*search.Location{ - &search.Location{ + { Start: 0, }, - &search.Location{ + { Start: 5, }, }, @@ -363,10 +363,10 @@ func TestTermLocationsOrder(t *testing.T) { { input: search.TermLocationMap{ "term": []*search.Location{ - &search.Location{ + { Start: 5, }, - &search.Location{ + { Start: 0, }, }, @@ -386,11 +386,11 @@ func TestTermLocationsOrder(t *testing.T) { { input: search.TermLocationMap{ "term": []*search.Location{ - &search.Location{ + { ArrayPositions: []float64{0}, Start: 0, }, - &search.Location{ + { ArrayPositions: []float64{0}, Start: 5, }, @@ -412,11 +412,11 @@ func TestTermLocationsOrder(t *testing.T) { { input: search.TermLocationMap{ "term": []*search.Location{ - &search.Location{ + { ArrayPositions: []float64{0}, Start: 5, }, - &search.Location{ + { ArrayPositions: []float64{0}, Start: 0, }, @@ -438,11 +438,11 @@ func TestTermLocationsOrder(t *testing.T) { { input: search.TermLocationMap{ "term": []*search.Location{ - &search.Location{ + { ArrayPositions: []float64{0}, Start: 5, }, - &search.Location{ + { ArrayPositions: []float64{1}, Start: 0, }, @@ -464,11 +464,11 @@ func TestTermLocationsOrder(t *testing.T) { { input: search.TermLocationMap{ "term": []*search.Location{ - &search.Location{ + { ArrayPositions: []float64{0}, Start: 5, }, - &search.Location{ + { ArrayPositions: []float64{0, 1}, Start: 0, }, diff --git a/search/scorers/scorer_term_test.go b/search/scorers/scorer_term_test.go index 025254da..48083f82 100644 --- a/search/scorers/scorer_term_test.go +++ b/search/scorers/scorer_term_test.go @@ -71,7 +71,7 @@ func TestTermScorer(t *testing.T) { Locations: search.FieldTermLocationMap{ "desc": search.TermLocationMap{ "beer": []*search.Location{ - &search.Location{ + { Pos: 1, Start: 0, End: 4,