From 77a1acb0e7bb6ae98853095a56e85e230642f21b Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Sun, 25 Jun 2023 12:47:47 +0200
Subject: [PATCH] fix(moxxmpp): Somewhat fix (and break) moxxmpp_socket_tcp
 integration tests

---
 .../badxmpp_certificate_test.dart             | 20 +++-------
 .../failure_reconnection_test.dart            | 40 +++++--------------
 packages/moxxmpp_socket_tcp/pubspec.yaml      |  8 +++-
 3 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/packages/moxxmpp_socket_tcp/integration_test/badxmpp_certificate_test.dart b/packages/moxxmpp_socket_tcp/integration_test/badxmpp_certificate_test.dart
index 6a7f8d9..25e7aa9 100644
--- a/packages/moxxmpp_socket_tcp/integration_test/badxmpp_certificate_test.dart
+++ b/packages/moxxmpp_socket_tcp/integration_test/badxmpp_certificate_test.dart
@@ -17,25 +17,15 @@ Future<void> _runTest(String domain) async {
   final connection = XmppConnection(
     TestingReconnectionPolicy(),
     AlwaysConnectedConnectivityManager(),
+    ClientToServerNegotiator(),
     socket,
-  );
+  )..connectionSettings = ConnectionSettings(
+      jid: JID.fromString('testuser@$domain'),
+      password: 'abc123',
+    );
   await connection.registerFeatureNegotiators([
     StartTlsNegotiator(),
   ]);
-  await connection.registerManagers([
-    DiscoManager([]),
-    RosterManager(TestingRosterStateManager('', [])),
-    MessageManager(),
-    PresenceManager(),
-  ]);
-
-  connection.setConnectionSettings(
-    ConnectionSettings(
-      jid: JID.fromString('testuser@$domain'),
-      password: 'abc123',
-      useDirectTLS: true,
-    ),
-  );
 
   final result = await connection.connect(
     shouldReconnect: false,
diff --git a/packages/moxxmpp_socket_tcp/integration_test/failure_reconnection_test.dart b/packages/moxxmpp_socket_tcp/integration_test/failure_reconnection_test.dart
index 5ede85d..d9eb4d0 100644
--- a/packages/moxxmpp_socket_tcp/integration_test/failure_reconnection_test.dart
+++ b/packages/moxxmpp_socket_tcp/integration_test/failure_reconnection_test.dart
@@ -18,17 +18,15 @@ void main() {
       final connection = XmppConnection(
         TestingSleepReconnectionPolicy(10),
         AlwaysConnectedConnectivityManager(),
+        ClientToServerNegotiator(),
         TCPSocketWrapper(),
-      );
+      )..connectionSettings = ConnectionSettings(
+          jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
+          password: 'abc123',
+        );
       await connection.registerFeatureNegotiators([
         StartTlsNegotiator(),
       ]);
-      await connection.registerManagers([
-        DiscoManager([]),
-        RosterManager(TestingRosterStateManager('', [])),
-        MessageManager(),
-        PresenceManager(),
-      ]);
       connection.asBroadcastStream().listen((event) {
         if (event is ConnectionStateChangedEvent) {
           if (event.state == XmppConnectionState.error) {
@@ -37,14 +35,6 @@ void main() {
         }
       });
 
-      connection.setConnectionSettings(
-        ConnectionSettings(
-          jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
-          password: 'abc123',
-          useDirectTLS: true,
-        ),
-      );
-
       final result = await connection.connect(
         shouldReconnect: false,
         waitUntilLogin: true,
@@ -68,17 +58,15 @@ void main() {
       final connection = XmppConnection(
         TestingReconnectionPolicy(),
         AlwaysConnectedConnectivityManager(),
+        ClientToServerNegotiator(),
         TCPSocketWrapper(),
-      );
+      )..connectionSettings = ConnectionSettings(
+          jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
+          password: 'abc123',
+        );
       await connection.registerFeatureNegotiators([
         StartTlsNegotiator(),
       ]);
-      await connection.registerManagers([
-        DiscoManager([]),
-        RosterManager(TestingRosterStateManager('', [])),
-        MessageManager(),
-        PresenceManager(),
-      ]);
       connection.asBroadcastStream().listen((event) {
         if (event is ConnectionStateChangedEvent) {
           if (event.state == XmppConnectionState.error) {
@@ -87,14 +75,6 @@ void main() {
         }
       });
 
-      connection.setConnectionSettings(
-        ConnectionSettings(
-          jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
-          password: 'abc123',
-          useDirectTLS: true,
-        ),
-      );
-
       final result = await connection.connect(
         shouldReconnect: false,
         waitUntilLogin: true,
diff --git a/packages/moxxmpp_socket_tcp/pubspec.yaml b/packages/moxxmpp_socket_tcp/pubspec.yaml
index 1999f9a..380f343 100644
--- a/packages/moxxmpp_socket_tcp/pubspec.yaml
+++ b/packages/moxxmpp_socket_tcp/pubspec.yaml
@@ -12,7 +12,13 @@ dependencies:
   meta: ^1.6.0
   moxxmpp:
     hosted: https://git.polynom.me/api/packages/Moxxy/pub
-    version: ^0.3.0
+    version: ^0.4.0
+
+dependency_overrides:
+  moxxmpp:
+    git:
+      url: https://codeberg.org/moxxy/moxxmpp.git
+      rev: 05e3d804a4036e9cd93fd27473a1e970fda3c3fc
 
 dev_dependencies:
   lints: ^2.0.0