satellite/satbd-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleans the tests

Browse Source
This commit is contained in:
Alexandre Tuleu
2016-01-21 14:09:01 +01:00
parent 925a0a21ed
commit dc0830a559
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bleve_indexer_test.go
View File

@@ -2,6 +2,7 @@ package main
import ( import (
"log" "log"
"path/filepath"
"time" "time"
. "gopkg.in/check.v1" . "gopkg.in/check.v1"
@@ -16,7 +17,7 @@ var _ = Suite(&BleveIndexerSuite{})
func (s *BleveIndexerSuite) SetUpSuite(c *C) { func (s *BleveIndexerSuite) SetUpSuite(c *C) {
var err error var err error
start := time.Now() start := time.Now()
s.i, err = NewBleveIndexer("satbd-test.bar.satellite") s.i, err = NewBleveIndexer(filepath.Join(c.MkDir(), "satbd-test.bar.satellite"))
c.Assert(err, IsNil) c.Assert(err, IsNil)
for _, a := range albumsDataTest { for _, a := range albumsDataTest {
c.Assert(s.i.Index(&a), IsNil) c.Assert(s.i.Index(&a), IsNil)
@@ -42,18 +43,19 @@ func (s *BleveIndexerSuite) TestCanDeleteAlbum(c *C) {
} }
func (s *BleveIndexerSuite) TestCanSearch(c *C) { func (s *BleveIndexerSuite) TestCanSearch(c *C) {
data := map[string][]AlbumID{ data := map[string]map[AlbumID]bool{
"Black Crow Hermione": []AlbumID{albumsDataTest[10].ID}, "frégate": map[AlbumID]bool{albumsDataTest[10].ID: true},
"Plantu": []AlbumID{albumsDataTest[2].ID}, "Éditeur:Dupuis": map[AlbumID]bool{8179: true, 9935: true, 160366: true},
"FOOOOOOOBAAAAAR": []AlbumID{}, "FOOOOOOOBAAAAAR": map[AlbumID]bool{},
} }
start := time.Now() start := time.Now()
for q, expected := range data { for q, expected := range data {
res, err := s.i.Search(q) res, err := s.i.Search(q)
if c.Check(err, IsNil) == true { if c.Check(err, IsNil) == true {
if c.Check(len(res), Equals, len(expected)) == true { if c.Check(len(res), Equals, len(expected)) == true {
for idx, resAlbum := range res { for _, resAlbum := range res {
c.Check(resAlbum.ID, Equals, expected[idx]) _, ok := expected[resAlbum.ID]
c.Check(ok, Equals, true, Commentf("Looking for %d in %s", resAlbum.ID, expected))
} }
} }
} }

1
indexer.go
View File

@@ -158,6 +158,7 @@ func (i *bleveIndexer) Search(query string) ([]*Album, error) {
blq := bleve.NewQueryStringQuery(query) blq := bleve.NewQueryStringQuery(query)
search := bleve.NewSearchRequest(blq) search := bleve.NewSearchRequest(blq)
search.Highlight = bleve.NewHighlight()
searchResults, err := i.bl.Search(search) searchResults, err := i.bl.Search(search)
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not perform search on the index: %s", err) return nil, fmt.Errorf("Could not perform search on the index: %s", err)