diff --git a/lib/src/utils/misc.dart b/lib/src/utils/misc.dart index a1fa18a..79848fd 100644 --- a/lib/src/utils/misc.dart +++ b/lib/src/utils/misc.dart @@ -248,6 +248,8 @@ String formatBytes(int bytes, {int decimalPlaces = 2}) { bool isUUIDNewer(String uuid1, String uuid2) { final timestamp1 = int.parse(uuid1.substring(0, 8), radix: 16); final timestamp2 = int.parse(uuid2.substring(0, 8), radix: 16); + print(timestamp1); + print(timestamp2); return timestamp1 > timestamp2; } diff --git a/test/drift/twonly_database/migration_test.dart b/test/drift/twonly_database/migration_test.dart index ee37ec9..50fc215 100644 --- a/test/drift/twonly_database/migration_test.dart +++ b/test/drift/twonly_database/migration_test.dart @@ -2,7 +2,7 @@ // ignore_for_file: unused_local_variable, unused_import import 'package:drift/drift.dart'; import 'package:drift_dev/api/migrations_native.dart'; -import 'package:twonly/src/database/twonly_database.dart'; +import 'package:twonly/src/database/twonly_database_old.dart'; import 'package:flutter_test/flutter_test.dart'; import 'generated/schema.dart'; @@ -27,7 +27,7 @@ void main() { for (final toVersion in versions.skip(i + 1)) { test('to $toVersion', () async { final schema = await verifier.schemaAt(fromVersion); - final db = TwonlyDatabase(schema.newConnection()); + final db = TwonlyDatabaseOld(schema.newConnection()); await verifier.migrateAndValidate(db, toVersion); await db.close(); }); @@ -70,7 +70,7 @@ void main() { newVersion: 2, createOld: v1.DatabaseAtV1.new, createNew: v2.DatabaseAtV2.new, - openTestedDatabase: TwonlyDatabase.new, + openTestedDatabase: TwonlyDatabaseOld.new, createItems: (batch, oldDb) { batch.insertAll(oldDb.contacts, oldContactsData); batch.insertAll(oldDb.messages, oldMessagesData); diff --git a/test/unit_test.dart b/test/unit_test.dart index 603e6ed..3466630 100644 --- a/test/unit_test.dart +++ b/test/unit_test.dart @@ -1,8 +1,5 @@ -import 'dart:convert'; -import 'dart:io'; import 'dart:typed_data'; import 'package:flutter_test/flutter_test.dart'; -import 'package:hashlib/random.dart'; import 'package:twonly/src/utils/misc.dart'; import 'package:twonly/src/utils/pow.dart'; import 'package:twonly/src/views/components/animate_icon.dart'; @@ -24,18 +21,5 @@ void main() { final list1 = Uint8List.fromList([41, 41, 41, 41, 41, 41, 41]); expect(list1, hexToUint8List(uint8ListToHex(list1))); }); - - test('encoding uuid4', () async { - final uv4 = uuid.v4(); - final uv4Bytes = Uint8List.fromList(uv4.codeUnits); - final uv4String = utf8.decode(uv4Bytes.cast()); - expect(uv4String, uv4); - }); - test('comparing uui7', () async { - final uv7Old = uuid.v7(); - sleep(const Duration(milliseconds: 1000)); - final uv7New = uuid.v7(); - expect(isUUIDNewer(uv7New, uv7Old), true); - }); }); }