← Back to branch summary

~ps-jenkins/mediascanner2/utopic-proposed

« back to all changes in this revision

Viewing changes to test/test_mediastore.cc

  • Committer: CI bot
  • Author(s): James Henstridge
  • Date: 2014-07-02 08:07:39 UTC
  • mfrom: (248.1.2 fix-tokenizer)
  • Revision ID: ps-jenkins@lists.canonical.com-20140702080739-q83k38b2jwwy4x5p
Update the FTS tokenizer to work with SQLite 3.8.5, and reenable the MediaStoreTest.query_short test.  Bump libsqlite3-dev build dependency to 3.8.5 too. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/test_mediastore.cc
316
316
    EXPECT_EQ(result[1], audio2); // title has highest weighting
317
317
}
318
318
 
319
 
/* When SQLite updated from 3.8.2 to 3.8.5, the behavior for
320
 
 * short searches seems to have changed and the test queries
321
 
 * here return empty. This test is currently disabled to make
322
 
 * the test suite pass so a new version of Mediascanner
323
 
 * can enter the archive. Do try to re-enable this as
324
 
 * soon as possible.
325
 
 
326
319
TEST_F(MediaStoreTest, query_short) {
327
320
    MediaFile audio1 = MediaFileBuilder("/path/foo5.ogg")
328
321
        .setType(AudioMedia)
346
339
    result = store.query("xy", AudioMedia);
347
340
    EXPECT_EQ(result.size(), 1);
348
341
}
349
 
*/
 
342
 
350
343
TEST_F(MediaStoreTest, query_empty) {
351
344
    MediaFile audio1 = MediaFileBuilder("/path/foo5.ogg")
352
345
        .setType(AudioMedia)