-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(Search): added implementations for core search and commandline s…
…earch
- Loading branch information
Thomas Osterbind
committed
Jun 12, 2018
1 parent
51e792b
commit 698a53b
Showing
5 changed files
with
105 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,45 @@ | ||
| package core | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/qri-io/qri/repo" | ||
| testrepo "github.com/qri-io/qri/repo/test" | ||
| "github.com/qri-io/registry/regclient" | ||
| ) | ||
|
|
||
| var mockResponse = []byte(`{"data":[{"Type":"","ID":"ramfox/test","Value":null},{"Type":"","ID":"b5/test","Value":{"commit":{"path":"/","signature":"JI/VSNqMuFGYVEwm3n8ZMjZmey+W2mhkD5if2337wDp+kaYfek9DntOyZiILXocW5JuOp48EqcsWf/BwhejQiYZ2utaIzR8VcMPo7u7c5nz2G6JTsoW+u9UUaKRVtl30jh6Kg1O2bnhYh9v4qW9VQgxOYfdhBl6zT4cYcjm1UkrblEe/wh494k9NziM5Bi2ATGRE2m71Lsf/TEDoNI549SebLQ1dsWXr1kM7lCeFqlDVjgbKQmGXowqcK/P9v+RBIRCnArnwFe/BQq4i1wmmnMEqpuUnfWR3xfJTE1DUMVaAid7U0jTWGVxROUdKk6mmTzlb1PiNdfruP+SFhjyQwQ==","timestamp":"2018-05-25T13:44:54.692493401Z","title":"created dataset"},"meta":{"citations":[{"url":"https://api.github.com/repos/qri-io/qri/releases"}],"qri":"md:0"},"path":"/ipfs/QmPi5wrPsY4xPwy2oRr7NRZyfFxTeupfmnrVDubzoABLNP","qri":"","structure":{"checksum":"QmQXfdYYubCvr9ePJtgABpp7N1fNsAnnywUJPYAJTvDhrn","errCount":0,"entries":7,"format":"json","length":19116,"qri":"","schema":{"type":"array"}},"transform":{"config":{"org":"qri-io","repo":"qri"},"path":"/","syntax":"skylark"},"Handle":"b5","Name":"test","PublicKey":"CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/W17VPFX+pjyM1MHI1CsvIe+JYQX45MJNITTd7hZZDX2rRWVavGXhsccmVDGU6ubeN3t6ewcBlgCxvyewwKhmZKCAs3/0xNGKXK/YMyZpRVjTWw9yPU9gOzjd9GuNJtL7d1Hl7dPt9oECa7WBCh0W9u2IoHTda4g8B2mK92awLOZTjXeA7vbhKKX+QVHKDxEI0U2/ooLYJUVxEoHRc+DUYNPahX5qRgJ1ZDP4ep1RRRoZR+HjGhwgJP+IwnAnO5cRCWUbZvE1UBJUZDvYMqW3QvDp+TtXwqUWVvt69tp8EnlBgfyXU91A58IEQtLgZ7klOzdSEJDP+S8HIwhG/vbTAgMBAAE="}},{"Type":"","ID":"EDGI/fib_6","Value":{"commit":{"path":"/","signature":"dG6NoEFlQ9ILFjVDrecSDlUbDPRSiwK9kFQ3vjTh/4tpfgrT5EOw6eGDx75lklx0DWx51s3AC2Qqytll2JwwCB6SMVVl0I9qnZJ4XQVG+MX4hGeIJ4crGCSts85unDvmiQCfc4EVqPYZKLzaVqjXa43zv5mJPfRA2ktTew3VGkOcg8RmyU6e2XWrZpkILcZg1jt2apKs5qHslx4klKBVPtQIr53/U61OW4tzME9kz08FYrk2F7I5FHWy45W7VU8DpzCbhw6kxJXu2KYD1QstsZGCKH93sZY3agP4XGY15HeEOTib465LK6+nsoBtrsroQSOTBHzVgyUZACNom5SUvQ==","timestamp":"2018-05-23T19:50:03.307982846Z","title":"created dataset"},"meta":{"description":"test of skylark as a transformation language","qri":"md:0","title":"Fibonacci(6)"},"path":"/ipfs/QmS6jJSEJYxZvCeo8cZqzVa7Ybu9yNQeFYfNZAHxM4eyDK","qri":"","structure":{"checksum":"QmdhDDZTAWoifKCWwFrZqzKUyXM6rN7ThdP1u67rkeJvTj","errCount":0,"entries":6,"format":"cbor","length":7,"qri":"","schema":{"type":"array"}},"transform":{"syntax":"skylark"},"Handle":"EDGI","Name":"fib_6","PublicKey":"CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmTFRx/6dKmoxje8AG+jFv94IcGUGnjrupa7XEr12J/c4ZLn3aPrD8F0tjRbstt1y/J+bO7Qb69DGiu2iSIqyE21nl2oex5+14jtxbupRq9jRTbpUHRj+y9I7uUDwl0E2FS1IQpBBfEGzDPIBVavxbhguC3O3XA7Aq7vea2lpJ1tWpr0GDRYSNmJAybkHS6k7dz1eVXFK+JE8FGFJi/AThQZKWRijvWFdlZvb8RyNFRHzpbr9fh38bRMTqhZpw/YGO5Ly8PNSiOOE4Y5cNUHLEYwG2/lpT4l53iKScsaOazlRkJ6NmkM1il7riCa55fcIAQZDtaAx+CT5ZKfmek4P5AgMBAAE="}}],"meta":{"code":200}}`) | ||
|
|
||
| func TestSearch(t *testing.T) { | ||
| cases := []struct { | ||
| p *repo.SearchParams | ||
| res []repo.DatasetRef | ||
| err string | ||
| }{ | ||
| {&repo.SearchParams{}, nil, "this repo doesn't support search"}, | ||
| } | ||
|
|
||
| mr, err := testrepo.NewTestRepo(nil) | ||
| server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| w.Write(mockResponse) | ||
| })) | ||
| rc := regclient.NewClient(®client.Config{Location: server.URL}) | ||
| mr, err := testrepo.NewTestRepo(rc) | ||
| if err != nil { | ||
| t.Errorf("error allocating test repo: %s", err.Error()) | ||
| return | ||
| } | ||
|
|
||
| // Case 0 - request with expected result | ||
| i := 0 | ||
| p := &SearchParams{"cities", 0, 100} | ||
| numResults := 3 | ||
| errString := "" | ||
|
|
||
| // make request 0 | ||
| req := NewSearchRequests(mr, nil) | ||
| for i, c := range cases { | ||
| got := []repo.DatasetRef{} | ||
| err := req.Search(c.p, &got) | ||
|
|
||
| if !(err == nil && c.err == "" || err != nil && err.Error() == c.err) { | ||
| t.Errorf("case %d error mismatch: expected: %s, got: %s", i, c.err, err) | ||
| continue | ||
| } | ||
| got := &[]SearchResult{} | ||
| err = req.Search(p, got) | ||
|
|
||
| if len(c.res) != len(got) { | ||
| t.Errorf("case %d log count mismatch. expected: %d, got: %d", i, len(c.res), len(got)) | ||
| continue | ||
| } | ||
| if !(err == nil && errString == "" || err != nil && err.Error() == errString) { | ||
| t.Errorf("case %d error mismatch: expected: %s, got: %s", i, errString, err) | ||
| } | ||
| } | ||
|
|
||
| func TestReindex(t *testing.T) { | ||
| cases := []struct { | ||
| p *ReindexSearchParams | ||
| expect bool | ||
| err string | ||
| }{ | ||
| {&ReindexSearchParams{}, false, "search reindexing is currently only supported on file-system repos"}, | ||
| } | ||
|
|
||
| mr, err := testrepo.NewTestRepo(nil) | ||
| if err != nil { | ||
| t.Errorf("error allocating test repo: %s", err.Error()) | ||
| return | ||
| } | ||
|
|
||
| req := NewSearchRequests(mr, nil) | ||
| for i, c := range cases { | ||
| got := false | ||
| err := req.Reindex(c.p, &got) | ||
|
|
||
| if !(err == nil && c.err == "" || err != nil && err.Error() == c.err) { | ||
| t.Errorf("case %d error mismatch: expected: %s, got: %s", i, c.err, err) | ||
| continue | ||
| } | ||
| if got != c.expect { | ||
| t.Errorf("case %d expected: %t got: %t", i, c.expect, got) | ||
| continue | ||
| } | ||
| if len(*got) != numResults { | ||
| t.Errorf("case %d result count mismatch: expected: %d results, got: %d", i, numResults, len(*got)) | ||
| } | ||
| } |