From 9d2c085920d3322ab200fabdb60f6b3b25e5b726 Mon Sep 17 00:00:00 2001
From: luckyrat <luckyrat@musites.com>
Date: Thu, 15 Feb 2024 09:46:07 +0000
Subject: [PATCH] wip

---
 .github/workflows/dart.yml      |  2 +-
 dart_test.yaml                  |  4 ++++
 test/kdbx_binaries_test.dart    |  8 ++------
 test/merge/kdbx_merge_test.dart | 31 -------------------------------
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 4af9f83..c045d73 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dart-lang/setup-dart@v1
       with:
             sdk: ${{ matrix.sdk }}
diff --git a/dart_test.yaml b/dart_test.yaml
index d89c09d..bc7d675 100644
--- a/dart_test.yaml
+++ b/dart_test.yaml
@@ -1,3 +1,7 @@
 tags:
   kdbx3: {}
   kdbx4: {}
+
+# macOs github runners are slower
+on_platform:
+  mac-os: {timeout: 2x}
\ No newline at end of file
diff --git a/test/kdbx_binaries_test.dart b/test/kdbx_binaries_test.dart
index 35f1e6e..130fb40 100644
--- a/test/kdbx_binaries_test.dart
+++ b/test/kdbx_binaries_test.dart
@@ -24,13 +24,9 @@ Future<void> _testAddNewAttachment(String filePath) async {
     f.body.rootGroup.addEntry(entry);
     expect(entry.binaryEntries, hasLength(0));
     entry.createBinary(
-        isProtected: false,
-        name: 'test.txt',
-        bytes: utf8.encode('Content1'));
+        isProtected: false, name: 'test.txt', bytes: utf8.encode('Content1'));
     entry.createBinary(
-        isProtected: false,
-        name: 'test.txt',
-        bytes: utf8.encode('Content2'));
+        isProtected: false, name: 'test.txt', bytes: utf8.encode('Content2'));
     return await f.save();
   })();
   {
diff --git a/test/merge/kdbx_merge_test.dart b/test/merge/kdbx_merge_test.dart
index f780c95..7d1fc47 100644
--- a/test/merge/kdbx_merge_test.dart
+++ b/test/merge/kdbx_merge_test.dart
@@ -758,13 +758,6 @@ void main() {
             hasLength(0));
       }),
     );
-    // test(
-    //   'Adds binary to remote entry',
-    //   () async => await withClock(fakeClock, () async {
-    //     final file = await TestUtil.createRealFile(proceedSeconds);
-    //     await TestUtil.saveAndRead(file);
-    //   }),
-    // );
   });
 
   group('Group merges', () {
@@ -870,10 +863,6 @@ void main() {
     );
   });
 
-// meh?
-//  'merges binaries'
-  //('merges custom icons',
-
   group('History merges', () {
 /*
 
@@ -1401,24 +1390,4 @@ when merging, can look at this value to decide whether history entries from the
       }),
     );
   });
-
-  // group('Kdbx4.1 merges', () {
-  //   Future<KdbxFile> TestUtil.createRealFile(proceedSeconds) async {
-  //     final file = TestUtil.createEmptyFile();
-  //     _createEntry(file, file.body.rootGroup, 'test1', 'test1');
-  //     final subGroup =
-  //         file.createGroup(parent: file.body.rootGroup, name: 'Sub Group');
-  //     _createEntry(file, subGroup, 'test2', 'test2');
-  //     proceedSeconds(10);
-  //     return await TestUtil.saveAndRead(file);
-  //   }
-
-  //   test('Newest file plugin data wins', () async {
-  //     await withClock(fakeClock, () async {
-  //       final file = await TestUtil.createRealFile(proceedSeconds);
-
-  //       final fileMod = await TestUtil.saveAndRead(file);
-  //     });
-  //   });
-  // });
 }