Added unit test for FTS generation + compatibility with old table name

Author: ajungg

core/src/androidTest/assets/demoDb_1_6_no_fts.sqlite3

@@ -54,13 +54,32 @@ public void testBoostedPromotionsQuery() throws Throwable {
     }
 
     @Test
-    public void testTextSearch() {
+    public void testTextSearch() throws IOException, SnabbleSdk.SnabbleException {
+        setupSdkWithDb("demoDb_1_6.sqlite3");
+
         ProductDatabase productDatabase = snabbleSdk.getProductDatabase();
-        Cursor cursor = productDatabase.searchByFoldedName("muller", null);
+        Cursor cursor = productDatabase.searchByFoldedName("gold", null);
         cursor.moveToFirst();
         Product product = productDatabase.productAtCursor(cursor);
-        assertEquals(product.getSku(), "1");
-        assertEquals(product.getName(), "Müllermilch Banane 0,4l");
+        assertEquals(product.getSku(), "31");
+        assertEquals(product.getName(), "Goldbären 200g");
+        cursor.close();
+
+        cursor = productDatabase.searchByFoldedName("foo", null);
+        assertEquals(0, cursor.getCount());
+        cursor.close();
+    }
+
+    @Test
+    public void testTextSearchNoFTS() throws IOException, SnabbleSdk.SnabbleException {
+        setupSdkWithDb("demoDb_1_6_no_fts.sqlite3");
+
+        ProductDatabase productDatabase = snabbleSdk.getProductDatabase();
+        Cursor cursor = productDatabase.searchByFoldedName("gold", null);
+        cursor.moveToFirst();
+        Product product = productDatabase.productAtCursor(cursor);
+        assertEquals(product.getSku(), "31");
+        assertEquals(product.getName(), "Goldbären 200g");
         cursor.close();
 
         cursor = productDatabase.searchByFoldedName("foo", null);

core/src/androidTest/java/io/snabble/sdk/ProductDatabaseTest.java

@@ -448,7 +448,7 @@ private void createFTSIndexIfNecessary() {
 
             synchronized (dbLock) {
                 Cursor cursor;
-                cursor = rawQuery("SELECT name FROM sqlite_master WHERE type='table' AND name='namesearch'", null, null);
+                cursor = rawQuery("SELECT name FROM sqlite_master WHERE type='table' AND name='searchByName'", null, null);
                 boolean hasFTS = cursor != null && cursor.getCount() == 1;
                 if(cursor != null){
                     cursor.close();
@@ -457,8 +457,8 @@ private void createFTSIndexIfNecessary() {
                 if(!hasFTS) {
                     db.beginTransaction();
 
-                    exec("DROP TABLE IF EXISTS namesearch");
-                    exec("CREATE VIRTUAL TABLE namesearch USING fts4(sku TEXT, foldedName TEXT)");
+                    exec("DROP TABLE IF EXISTS searchByName");
+                    exec("CREATE VIRTUAL TABLE searchByName USING fts4(sku TEXT, foldedName TEXT)");
 
                     ContentValues contentValues = new ContentValues(2);
                     cursor = rawQuery("SELECT sku, name FROM products", null, null);
@@ -467,7 +467,7 @@ private void createFTSIndexIfNecessary() {
                             contentValues.clear();
                             contentValues.put("sku", cursor.getString(0));
                             contentValues.put("foldedName", StringNormalizer.normalize(cursor.getString(1)));
-                            db.insert("namesearch", null, contentValues);
+                            db.insert("searchByName", null, contentValues);
                         }
                         cursor.close();
                     } else {
@@ -881,7 +881,7 @@ public Product findByName(String name) {
 
         StringNormalizer.normalize(name);
 
-        Cursor cursor = productQuery("JOIN namesearch ns ON ns.sku = p.sku " +
+        Cursor cursor = productQuery("JOIN searchByName ns ON ns.sku = p.sku " +
                 "WHERE ns.foldedName MATCH ? LIMIT 1", new String[]{
                 name
         }, false);
@@ -1166,7 +1166,7 @@ public void findByWeighItemIdOnline(String weighItemId,
      * @param cancellationSignal Calls can be cancelled with a {@link CancellationSignal}. Can be null.
      */
     public Cursor searchByFoldedName(String searchString, CancellationSignal cancellationSignal) {
-        return productQuery("JOIN namesearch ns ON ns.sku = p.sku " +
+        return productQuery("JOIN searchByName ns ON ns.sku = p.sku " +
                 "WHERE ns.foldedName MATCH ? " +
                 "AND p.weighing != " + Product.Type.PreWeighed.getDatabaseValue() + " " +
                 "AND p.isDeposit = 0 " +