use getSourceTables test for both web and native

Author: stevensJourney

lib/src/web/web_sqlite_open_factory.dart

@@ -12,8 +12,6 @@ Map<String, FutureOr<WebSqlite>> webSQLiteImplementations = {};
 /// Web implementation of [AbstractDefaultSqliteOpenFactory]
 class DefaultSqliteOpenFactory
     extends AbstractDefaultSqliteOpenFactory<CommonDatabase> {
-  // todo: For users with multiple databases, the WebSqlite should be shared
-  // between the different paths.
   final Future<WebSqlite> _initialized;
 
   DefaultSqliteOpenFactory(

test/native/watch_test.dart

@@ -21,6 +21,8 @@ void main() {
       await testUtils.cleanDb(path: path);
     });
 
+    generateSourceTableTests(testUtils.findSqliteLibraries(), () => path);
+
     test('watch in isolate', () async {
       final db = await testUtils.setupDatabase(path: path);
       await createTables(db);

test/utils/web_test_utils.dart

@@ -58,7 +58,6 @@ class TestUtils extends AbstractTestUtils {
 
   @override
   List<String> findSqliteLibraries() {
-    // Maintains consistency with native tests
     return ['sqlite3.wasm'];
   }
 }

test/watch_test.dart

@@ -21,47 +21,50 @@ createTables(SqliteDatabase db) async {
   });
 }
 
-void main() {
-  group('Query Watch Tests', () {
-    late String path;
-    List<String> sqlitePaths = [];
+// Web and native have different requirements for `sqlitePaths`.
+void generateSourceTableTests(
+    List<String> sqlitePaths, String Function() getPath) {
+  for (var sqlite in sqlitePaths) {
+    test('getSourceTables - $sqlite', () async {
+      final db = SqliteDatabase.withFactory(
+          await testUtils.testFactory(path: getPath(), sqlitePath: sqlite));
+      await db.initialize();
+      await createTables(db);
 
-    setUp(() async {
-      path = testUtils.dbPath();
-      sqlitePaths = testUtils.findSqliteLibraries();
-      await testUtils.cleanDb(path: path);
-    });
+      var versionRow = await db.get('SELECT sqlite_version() as version');
+      print('Testing SQLite ${versionRow['version']} - $sqlite');
 
-    for (var sqlite in sqlitePaths) {
-      test('getSourceTables - $sqlite', () async {
-        final db = SqliteDatabase.withFactory(
-            await testUtils.testFactory(path: path, sqlitePath: sqlite));
-        await db.initialize();
-        await createTables(db);
+      final tables = await getSourceTables(db,
+          'SELECT * FROM assets INNER JOIN customers ON assets.customer_id = customers.id');
+      expect(tables, equals({'assets', 'customers'}));
 
-        var versionRow = await db.get('SELECT sqlite_version() as version');
-        print('Testing SQLite ${versionRow['version']} - $sqlite');
+      final tables2 = await getSourceTables(db,
+          'SELECT count() FROM assets INNER JOIN "other_customers" AS oc ON assets.customer_id = oc.id AND assets.make = oc.name');
+      expect(tables2, equals({'assets', 'other_customers'}));
 
-        final tables = await getSourceTables(db,
-            'SELECT * FROM assets INNER JOIN customers ON assets.customer_id = customers.id');
-        expect(tables, equals({'assets', 'customers'}));
+      final tables3 = await getSourceTables(db, 'SELECT count() FROM assets');
+      expect(tables3, equals({'assets'}));
 
-        final tables2 = await getSourceTables(db,
-            'SELECT count() FROM assets INNER JOIN "other_customers" AS oc ON assets.customer_id = oc.id AND assets.make = oc.name');
-        expect(tables2, equals({'assets', 'other_customers'}));
+      final tables4 =
+          await getSourceTables(db, 'SELECT count() FROM assets_alias');
+      expect(tables4, equals({'assets'}));
 
-        final tables3 = await getSourceTables(db, 'SELECT count() FROM assets');
-        expect(tables3, equals({'assets'}));
+      final tables5 =
+          await getSourceTables(db, 'SELECT sqlite_version() as version');
+      expect(tables5, equals(<String>{}));
+    });
+  }
+}
 
-        final tables4 =
-            await getSourceTables(db, 'SELECT count() FROM assets_alias');
-        expect(tables4, equals({'assets'}));
+void main() {
+  // Shared tests for watch
+  group('Query Watch Tests', () {
+    late String path;
 
-        final tables5 =
-            await getSourceTables(db, 'SELECT sqlite_version() as version');
-        expect(tables5, equals(<String>{}));
-      });
-    }
+    setUp(() async {
+      path = testUtils.dbPath();
+      await testUtils.cleanDb(path: path);
+    });
 
     test('watch', () async {
       final db = await testUtils.setupDatabase(path: path);

test/web/watch_test.dart

@@ -0,0 +1,23 @@
+@TestOn('browser')
+import 'package:test/test.dart';
+
+import '../utils/test_utils_impl.dart';
+import '../watch_test.dart';
+
+final testUtils = TestUtils();
+
+void main() {
+  // Shared tests for watch
+  group('Web Query Watch Tests', () {
+    late String path;
+
+    setUp(() async {
+      path = testUtils.dbPath();
+      await testUtils.cleanDb(path: path);
+    });
+
+    /// Can't use testUtils instance here since it requires spawnHybridUri
+    /// which is not available when declaring tests
+    generateSourceTableTests(['sqlite3.wasm'], () => path);
+  });
+}