update tester slightly

tmthecoder · tmthecoder · commit 70aef825c155 · 2022-01-24T03:18:22.000-05:00
diff --git a/.github/workflows/dargon2_flutter_tests.yml b/.github/workflows/dargon2_flutter_tests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Upgrade flutter
         run: flutter upgrade
       - name: Run Integration Tests
-        uses: reactivecircus/android-emulator-runner@v2
+        uses: reactivecircus/android-emulator-runner@v2.22.0
         with:
           api-level: 29
           ndk: 20.1.5948944
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/dargon2_flutter/dargon2_flutter/example/integration_test/argon2_ffi_test.dart b/dargon2_flutter/dargon2_flutter/example/integration_test/argon2_ffi_test.dart
@@ -51,7 +51,7 @@ Future<String> getEncodedHash(WidgetTester tester, String password, String salt)
   await tester.enterText(saltEntryField, salt);
   await tester.tap(hashButton);
 
-  await tester.pump();
+  await tester.pumpAndSettle();
 
   return (tester.widget(hashText) as Text).data!
       .replaceAll("Encoded String\n", "");
diff --git a/dargon2_flutter/dargon2_flutter/example/linux/flutter/generated_plugin_registrant.cc b/dargon2_flutter/dargon2_flutter/example/linux/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <dargon2_flutter_desktop/dargon2_flutter_desktop_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) dargon2_flutter_desktop_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "Dargon2FlutterDesktopPlugin");
+  dargon2_flutter_desktop_plugin_register_with_registrar(dargon2_flutter_desktop_registrar);
 }
diff --git a/dargon2_flutter/dargon2_flutter/example/linux/flutter/generated_plugins.cmake b/dargon2_flutter/dargon2_flutter/example/linux/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  dargon2_flutter_desktop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/dargon2_flutter/dargon2_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/dargon2_flutter/dargon2_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,8 @@
 import FlutterMacOS
 import Foundation
 
+import dargon2_flutter_desktop
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  Dargon2FlutterDesktopPlugin.register(with: registry.registrar(forPlugin: "Dargon2FlutterDesktopPlugin"))
 }
diff --git a/dargon2_flutter/dargon2_flutter/example/windows/flutter/generated_plugin_registrant.cc b/dargon2_flutter/dargon2_flutter/example/windows/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <dargon2_flutter_desktop/dargon2_flutter_desktop_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  Dargon2FlutterDesktopPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("Dargon2FlutterDesktopPlugin"));
 }
diff --git a/dargon2_flutter/dargon2_flutter/example/windows/flutter/generated_plugins.cmake b/dargon2_flutter/dargon2_flutter/example/windows/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  dargon2_flutter_desktop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@`
`6`	`6`
`7`	`7`	`#include "generated_plugin_registrant.h"`
`8`	`8`
	`9`	`+#include <dargon2_flutter_desktop/dargon2_flutter_desktop_plugin.h>`
`9`	`10`
`10`	`11`	`void fl_register_plugins(FlPluginRegistry* registry) {`
	`12`	`+ g_autoptr(FlPluginRegistrar) dargon2_flutter_desktop_registrar =`
	`13`	`+ fl_plugin_registry_get_registrar_for_plugin(registry, "Dargon2FlutterDesktopPlugin");`
	`14`	`+ dargon2_flutter_desktop_plugin_register_with_registrar(dargon2_flutter_desktop_registrar);`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`list(APPEND FLUTTER_PLUGIN_LIST`
	`6`	`+ dargon2_flutter_desktop`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`set(PLUGIN_BUNDLED_LIBRARIES)`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`import FlutterMacOS`
`6`	`6`	`import Foundation`
`7`	`7`
	`8`	`+import dargon2_flutter_desktop`
`8`	`9`
`9`	`10`	`func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {`
	`11`	`+ Dargon2FlutterDesktopPlugin.register(with: registry.registrar(forPlugin: "Dargon2FlutterDesktopPlugin"))`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`
`7`	`7`	`#include "generated_plugin_registrant.h"`
`8`	`8`
	`9`	`+#include <dargon2_flutter_desktop/dargon2_flutter_desktop_plugin.h>`
`9`	`10`
`10`	`11`	`void RegisterPlugins(flutter::PluginRegistry* registry) {`
	`12`	`+ Dargon2FlutterDesktopPluginRegisterWithRegistrar(`
	`13`	`+ registry->GetRegistrarForPlugin("Dargon2FlutterDesktopPlugin"));`
`11`	`14`	`}`