Add tests

Author: simolus3

packages/powersync_core/lib/src/database/powersync_db_mixin.dart

@@ -175,16 +175,27 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
   @visibleForTesting
   void setStatus(SyncStatus status) {
     if (status != currentStatus) {
-      // Note that currently the streaming sync implementation will never set hasSynced.
-      // lastSyncedAt implies that syncing has completed at some point (hasSynced = true).
-      // The previous values of hasSynced should be preserved here.
-      final newStatus = status.copyWith(
-          hasSynced: status.lastSyncedAt != null
-              ? true
-              : status.hasSynced ?? currentStatus.hasSynced,
-          lastSyncedAt: status.lastSyncedAt ?? currentStatus.lastSyncedAt);
-      // If the absence of hasSync was the only difference, the new states would be equal
-      // and don't require an event. So, check again.
+      final newStatus = SyncStatus(
+        connected: status.connected,
+        downloading: status.downloading,
+        uploading: status.uploading,
+        connecting: status.connecting,
+        uploadError: status.uploadError,
+        downloadError: status.downloadError,
+        priorityStatusEntries: status.priorityStatusEntries,
+        downloadProgress: status.downloadProgress,
+        // Note that currently the streaming sync implementation will never set
+        // hasSynced. lastSyncedAt implies that syncing has completed at some
+        // point (hasSynced = true).
+        // The previous values of hasSynced should be preserved here.
+        lastSyncedAt: status.lastSyncedAt ?? currentStatus.lastSyncedAt,
+        hasSynced: status.lastSyncedAt != null
+            ? true
+            : status.hasSynced ?? currentStatus.hasSynced,
+      );
+
+      // If the absence of hasSynced was the only difference, the new states
+      // would be equal and don't require an event. So, check again.
       if (newStatus != currentStatus) {
         currentStatus = newStatus;
         statusStreamController.add(currentStatus);

packages/powersync_core/lib/src/sync/protocol.dart

@@ -140,6 +140,7 @@ final class Checkpoint extends StreamingSyncLine {
                 'bucket': c.bucket,
                 'checksum': c.checksum,
                 'priority': c.priority,
+                'count': c.count,
               })
           .toList(growable: false)
     };

packages/powersync_core/lib/src/sync/streaming_sync.dart

@@ -394,7 +394,6 @@ class StreamingSyncImplementation implements StreamingSync {
           // TODO: This increments the counters before actually saving sync
           // data. Might be fine though?
           _state.updateStatus((s) => s.applyBatchReceived(line));
-          _state.updateStatus((s) => s.downloading = true);
           await adapter.saveSyncData(line);
         case StreamingSyncKeepalive(:final tokenExpiresIn):
           if (tokenExpiresIn == 0) {

packages/powersync_core/lib/src/sync/sync_status.dart

@@ -77,9 +77,11 @@ final class SyncStatus {
         other.lastSyncedAt == lastSyncedAt &&
         other.hasSynced == hasSynced &&
         _statusEquality.equals(
-            other.priorityStatusEntries, priorityStatusEntries));
+            other.priorityStatusEntries, priorityStatusEntries) &&
+        other.downloadProgress == downloadProgress);
   }
 
+  // Deprecated because it can't set fields back to null
   @Deprecated('Should not be used in user code')
   SyncStatus copyWith({
     bool? connected,
@@ -148,19 +150,21 @@ final class SyncStatus {
   @override
   int get hashCode {
     return Object.hash(
-        connected,
-        downloading,
-        uploading,
-        connecting,
-        uploadError,
-        downloadError,
-        lastSyncedAt,
-        _statusEquality.hash(priorityStatusEntries));
+      connected,
+      downloading,
+      uploading,
+      connecting,
+      uploadError,
+      downloadError,
+      lastSyncedAt,
+      _statusEquality.hash(priorityStatusEntries),
+      downloadProgress,
+    );
   }
 
   @override
   String toString() {
-    return "SyncStatus<connected: $connected connecting: $connecting downloading: $downloading uploading: $uploading lastSyncedAt: $lastSyncedAt, hasSynced: $hasSynced, error: $anyError>";
+    return "SyncStatus<connected: $connected connecting: $connecting downloading: $downloading (progress: $downloadProgress) uploading: $uploading lastSyncedAt: $lastSyncedAt, hasSynced: $hasSynced, error: $anyError>";
   }
 
   // This should be a ListEquality<SyncPriorityStatus>, but that appears to
@@ -266,11 +270,14 @@ final class InternalSyncDownloadProgress {
   /// Sums the total target and completed operations for all buckets up until
   /// the given [priority] (inclusive).
   (int, int) targetAndCompletedCounts(BucketPriority priority) {
-    return buckets.values.fold((0, 0), (prev, entry) {
-      final downloaded = entry.sinceLast;
-      final total = entry.targetCount - entry.atLast;
-      return (prev.$1 + total, prev.$2 + downloaded);
-    });
+    return buckets.values.where((e) => e.priority >= priority).fold(
+      (0, 0),
+      (prev, entry) {
+        final downloaded = entry.sinceLast;
+        final total = entry.targetCount - entry.atLast;
+        return (prev.$1 + total, prev.$2 + downloaded);
+      },
+    );
   }
 
   InternalSyncDownloadProgress incrementDownloaded(SyncDataBatch batch) {
@@ -280,7 +287,7 @@ final class InternalSyncDownloadProgress {
       newBucketStates[dataForBucket.bucket] = (
         priority: previous.priority,
         atLast: previous.atLast,
-        sinceLast: previous.sinceLast,
+        sinceLast: previous.sinceLast + dataForBucket.data.length,
         targetCount: previous.targetCount,
       );
     }
@@ -304,6 +311,13 @@ final class InternalSyncDownloadProgress {
         _mapEquality.equals(buckets, other.buckets);
   }
 
+  @override
+  String toString() {
+    final asView = asSyncDownloadProgress;
+    final all = asView.untilCompletion;
+    return 'for total: ${all.completed} / ${all.total}';
+  }
+
   static const _mapEquality = MapEquality<Object?, Object?>();
 }