chore(tests): Format and lint tests

fix(meta): Add 'example' as a 'commit target'
2023-03-18 16:13:45 +01:00 · 2023-03-18 15:00:54 +01:00
26 changed files with 1491 additions and 1061 deletions
--- a/.gitlint
+++ b/.gitlint
@ -7,7 +7,7 @@ line-length=72
 [title-trailing-punctuation]
 [title-hard-tab]
 [title-match-regex]
-regex=^((feat|fix|chore|refactor|docs|release|test)\((meta|tests|style|docs|xep|core)+(,(meta|tests|style|docs|xep|core))*\)|release): [A-Z0-9].*$
+regex=^((feat|fix|chore|refactor|docs|release|test)\((meta|tests|style|docs|xep|core|example)+(,(meta|tests|style|docs|xep|core|example))*\)|release): [A-Z0-9].*$


 [body-trailing-whitespace]
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@ -11,5 +11,3 @@ analyzer:
  exclude:
    - "**/*.g.dart"
    - "**/*.freezed.dart"
-    - "test/"
-    - "integration_test/"
--- a/packages/moxxmpp/lib/src/connection.dart
+++ b/packages/moxxmpp/lib/src/connection.dart
@ -167,7 +167,7 @@ class XmppConnection {

  /// Completers for certain actions
  // ignore: use_late_for_private_fields_and_variables
-  Completer<Result<bool, XmppConnectionError>>? _connectionCompleter;
+  Completer<Result<bool, XmppError>>? _connectionCompleter;

  /// Negotiators
  final Map<String, XmppFeatureNegotiatorBase> _featureNegotiators = {};
@ -896,7 +896,8 @@ class XmppConnection {
        return;
      } else {
        _log.severe(
-            'No negotiator could be picked while negotiations are not done');
+          'No negotiator could be picked while negotiations are not done',
+        );
        await _resetIsConnectionRunning();
        await handleError(NoAuthenticatorAvailableError());
        return;
@ -1132,7 +1133,7 @@ class XmppConnection {
    );
  }

-  Future<Result<bool, XmppConnectionError>> _connectImpl({
+  Future<Result<bool, XmppError>> _connectImpl({
    String? lastResource,
    bool waitForConnection = false,
    bool shouldReconnect = true,
@ -1222,7 +1223,7 @@ class XmppConnection {
  ///
  /// [enableReconnectOnSuccess] indicates that automatic reconnection is to be
  /// enabled once the connection has been successfully established.
-  Future<Result<bool, XmppConnectionError>> connect({
+  Future<Result<bool, XmppError>> connect({
    String? lastResource,
    bool? shouldReconnect,
    bool waitForConnection = false,
--- a/packages/moxxmpp/test/async_queue_test.dart
+++ b/packages/moxxmpp/test/async_queue_test.dart
@ -4,13 +4,28 @@ import 'package:test/test.dart';
 void main() {
  test('Test the async queue', () async {
    final queue = AsyncQueue();
-    int future1Finish = 0;
-    int future2Finish = 0;
-    int future3Finish = 0;
+    var future1Finish = 0;
+    var future2Finish = 0;
+    var future3Finish = 0;

-    await queue.addJob(() => Future<void>.delayed(const Duration(seconds: 3), () => future1Finish = DateTime.now().millisecondsSinceEpoch));
-    await queue.addJob(() => Future<void>.delayed(const Duration(seconds: 3), () => future2Finish = DateTime.now().millisecondsSinceEpoch));
-    await queue.addJob(() => Future<void>.delayed(const Duration(seconds: 3), () => future3Finish = DateTime.now().millisecondsSinceEpoch));
+    await queue.addJob(
+      () => Future<void>.delayed(
+        const Duration(seconds: 3),
+        () => future1Finish = DateTime.now().millisecondsSinceEpoch,
+      ),
+    );
+    await queue.addJob(
+      () => Future<void>.delayed(
+        const Duration(seconds: 3),
+        () => future2Finish = DateTime.now().millisecondsSinceEpoch,
+      ),
+    );
+    await queue.addJob(
+      () => Future<void>.delayed(
+        const Duration(seconds: 3),
+        () => future3Finish = DateTime.now().millisecondsSinceEpoch,
+      ),
+    );

    await Future<void>.delayed(const Duration(seconds: 12));

--- a/packages/moxxmpp/test/awaiter_test.dart
+++ b/packages/moxxmpp/test/awaiter_test.dart
@ -3,28 +3,38 @@ import 'package:moxxmpp/src/awaiter.dart';
 import 'package:test/test.dart';

 void main() {
-  final bareJid = JID('moxxmpp', 'server3.example', '');
+  const bareJid = JID('moxxmpp', 'server3.example', '');

  test('Test awaiting an awaited stanza with a from attribute', () async {
    final awaiter = StanzaAwaiter();

    // "Send" a stanza
-    final future = await awaiter.addPending('user1@server.example', 'abc123', 'iq');
+    final future = await awaiter.addPending(
+      'user1@server.example',
+      'abc123',
+      'iq',
+    );

    // Receive the wrong answer
    final result1 = await awaiter.onData(
-      XMLNode.fromString('<iq from="user3@server.example" id="abc123" type="result" />'),
+      XMLNode.fromString(
+        '<iq from="user3@server.example" id="abc123" type="result" />',
+      ),
      bareJid,
    );
    expect(result1, false);
    final result2 = await awaiter.onData(
-      XMLNode.fromString('<iq from="user1@server.example" id="lol" type="result" />'),
+      XMLNode.fromString(
+        '<iq from="user1@server.example" id="lol" type="result" />',
+      ),
      bareJid,
    );
    expect(result2, false);

    // Receive the correct answer
-    final stanza = XMLNode.fromString('<iq from="user1@server.example" id="abc123" type="result" />');
+    final stanza = XMLNode.fromString(
+      '<iq from="user1@server.example" id="abc123" type="result" />',
+    );
    final result3 = await awaiter.onData(
      stanza,
      bareJid,
--- a/packages/moxxmpp/test/jid_test.dart
+++ b/packages/moxxmpp/test/jid_test.dart
@ -1,5 +1,6 @@
 import 'package:moxxmpp/moxxmpp.dart';
 import 'package:test/test.dart';
+
 void main() {
  test('Parse a full JID', () {
    final jid = JID.fromString('test@server/abc');
@ -29,23 +30,41 @@ void main() {
  });

  test('Equality', () {
-    expect(JID.fromString('hallo@welt/abc') == JID('hallo', 'welt', 'abc'), true);
-    expect(JID.fromString('hallo@welt') == JID('hallo', 'welt', 'a'), false);
+    expect(
+      JID.fromString('hallo@welt/abc') == const JID('hallo', 'welt', 'abc'),
+      true,
+    );
+    expect(
+      JID.fromString('hallo@welt') == const JID('hallo', 'welt', 'a'),
+      false,
+    );
  });

  test('Dot suffix at domain part', () {
-    expect(JID.fromString('hallo@welt.example.') == JID('hallo', 'welt.example', ''), true);
-    expect(JID.fromString('hallo@welt.example./test') == JID('hallo', 'welt.example', 'test'), true);
+    expect(
+      JID.fromString('hallo@welt.example.') ==
+          const JID('hallo', 'welt.example', ''),
+      true,
+    );
+    expect(
+      JID.fromString('hallo@welt.example./test') ==
+          const JID('hallo', 'welt.example', 'test'),
+      true,
+    );
  });

  test('Parse resource with a slash', () {
-    expect(JID.fromString('hallo@welt.example./test/welt') == JID('hallo', 'welt.example', 'test/welt'), true);
+    expect(
+      JID.fromString('hallo@welt.example./test/welt') ==
+          const JID('hallo', 'welt.example', 'test/welt'),
+      true,
+    );
  });

  test('bareCompare', () {
-    final jid1 = JID('hallo', 'welt', 'lol');
-    final jid2 = JID('hallo', 'welt', '');
-    final jid3 = JID('hallo', 'earth', 'true');
+    const jid1 = JID('hallo', 'welt', 'lol');
+    const jid2 = JID('hallo', 'welt', '');
+    const jid3 = JID('hallo', 'earth', 'true');

    expect(jid1.bareCompare(jid2), true);
    expect(jid2.bareCompare(jid1), true);
--- a/packages/moxxmpp/test/negotiator_test.dart
+++ b/packages/moxxmpp/test/negotiator_test.dart
@ -9,24 +9,32 @@ const exampleXmlns2 = 'im:moxxmpp:example2';
 const exampleNamespace2 = 'im.moxxmpp.test.example2';

 class StubNegotiator1 extends XmppFeatureNegotiatorBase {
-  StubNegotiator1() : called = false, super(1, false, exampleXmlns1, exampleNamespace1);
+  StubNegotiator1()
+      : called = false,
+        super(1, false, exampleXmlns1, exampleNamespace1);

  bool called;

  @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+    XMLNode nonza,
+  ) async {
    called = true;
    return const Result(NegotiatorState.done);
  }
 }

 class StubNegotiator2 extends XmppFeatureNegotiatorBase {
-  StubNegotiator2() : called = false, super(10, false, exampleXmlns2, exampleNamespace2);
+  StubNegotiator2()
+      : called = false,
+        super(10, false, exampleXmlns2, exampleNamespace2);

  bool called;

  @override
-  Future<Result<NegotiatorState, NegotiatorError>> negotiate(XMLNode nonza) async {
+  Future<Result<NegotiatorState, NegotiatorError>> negotiate(
+    XMLNode nonza,
+  ) async {
    called = true;
    return const Result(NegotiatorState.done);
  }
@ -58,7 +66,8 @@ void main() {
    TestingReconnectionPolicy(),
    AlwaysConnectedConnectivityManager(),
    stubSocket,
-  )..registerFeatureNegotiators([
+  )
+    ..registerFeatureNegotiators([
      StubNegotiator1(),
      StubNegotiator2(),
    ])
@ -88,8 +97,10 @@ void main() {
  test('Test negotiating features with no stream restarts', () async {
    await connection.connect();
    await Future.delayed(const Duration(seconds: 3), () {
-      final negotiator1 = connection.getNegotiatorById<StubNegotiator1>(exampleNamespace1);
-      final negotiator2 = connection.getNegotiatorById<StubNegotiator2>(exampleNamespace2);
+      final negotiator1 =
+          connection.getNegotiatorById<StubNegotiator1>(exampleNamespace1);
+      final negotiator2 =
+          connection.getNegotiatorById<StubNegotiator2>(exampleNamespace2);
      expect(negotiator1?.called, true);
      expect(negotiator2?.called, true);
    });
--- a/packages/moxxmpp/test/roster_state_test.dart
+++ b/packages/moxxmpp/test/roster_state_test.dart
@ -3,12 +3,11 @@ import 'package:test/test.dart';

 void main() {
  test('Test receiving a roster push', () async {
-    final rs = TestingRosterStateManager(null, []);
-    rs.register((_) {});
+    final rs = TestingRosterStateManager(null, [])..register((_) {});

    await rs.handleRosterPush(
      RosterPushResult(
-        XmppRosterItem(
+        const XmppRosterItem(
          jid: 'testuser@server.example',
          subscription: 'both',
        ),
@ -17,7 +16,10 @@ void main() {
    );

    expect(
-      rs.getRosterItems().indexWhere((item) => item.jid == 'testuser@server.example') != -1,
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser@server.example') !=
+          -1,
      true,
    );
    expect(rs.loadCount, 1);
@ -26,7 +28,7 @@ void main() {
    // Receive another roster push
    await rs.handleRosterPush(
      RosterPushResult(
-        XmppRosterItem(
+        const XmppRosterItem(
          jid: 'testuser2@server2.example',
          subscription: 'to',
        ),
@ -35,7 +37,10 @@ void main() {
    );

    expect(
-      rs.getRosterItems().indexWhere((item) => item.jid == 'testuser2@server2.example') != -1,
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser2@server2.example') !=
+          -1,
      true,
    );
    expect(rs.loadCount, 1);
@ -44,7 +49,7 @@ void main() {
    // Remove one of the items
    await rs.handleRosterPush(
      RosterPushResult(
-        XmppRosterItem(
+        const XmppRosterItem(
          jid: 'testuser2@server2.example',
          subscription: 'remove',
        ),
@ -53,11 +58,17 @@ void main() {
    );

    expect(
-      rs.getRosterItems().indexWhere((item) => item.jid == 'testuser2@server2.example') == -1,
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser2@server2.example') ==
+          -1,
      true,
    );
    expect(
-      rs.getRosterItems().indexWhere((item) => item.jid == 'testuser@server.example') != 1,
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser@server.example') !=
+          1,
      true,
    );
    expect(rs.loadCount, 1);
@ -65,22 +76,21 @@ void main() {
  });

  test('Test a roster fetch', () async {
-    final rs = TestingRosterStateManager(null, []);
-    rs.register((_) {});
+    final rs = TestingRosterStateManager(null, [])..register((_) {});

    // Fetch the roster
    await rs.handleRosterFetch(
      RosterRequestResult(
        [
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser@server.example',
            subscription: 'both',
          ),
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser2@server2.example',
            subscription: 'to',
          ),
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser3@server3.example',
            subscription: 'from',
          ),
@ -91,48 +101,66 @@ void main() {

    expect(rs.loadCount, 1);
    expect(rs.getRosterItems().length, 3);
-    expect(rs.getRosterItems().indexWhere((item) => item.jid == 'testuser@server.example') != -1, true);
-    expect(rs.getRosterItems().indexWhere((item) => item.jid == 'testuser2@server2.example') != -1, true);
-    expect(rs.getRosterItems().indexWhere((item) => item.jid == 'testuser3@server3.example') != -1, true);
+    expect(
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser@server.example') !=
+          -1,
+      true,
+    );
+    expect(
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser2@server2.example') !=
+          -1,
+      true,
+    );
+    expect(
+      rs
+              .getRosterItems()
+              .indexWhere((item) => item.jid == 'testuser3@server3.example') !=
+          -1,
+      true,
+    );
  });

  test('Test a roster fetch if we already have a roster', () async {
    XmppEvent? event;
    final rs = TestingRosterStateManager('aaaaa', [
-      XmppRosterItem(
+      const XmppRosterItem(
        jid: 'testuser@server.example',
        subscription: 'both',
      ),
-      XmppRosterItem(
+      const XmppRosterItem(
        jid: 'testuser2@server2.example',
        subscription: 'to',
      ),
-      XmppRosterItem(
+      const XmppRosterItem(
        jid: 'testuser3@server3.example',
        subscription: 'from',
      ),
-    ]);
-    rs.register((_event) {
-      event = _event;
+    ])
+      ..register((e) {
+        event = e;
      });

    // Fetch the roster
    await rs.handleRosterFetch(
      RosterRequestResult(
        [
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser@server.example',
            subscription: 'both',
          ),
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser2@server2.example',
            subscription: 'to',
          ),
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser3@server3.example',
            subscription: 'both',
          ),
-          XmppRosterItem(
+          const XmppRosterItem(
            jid: 'testuser4@server4.example',
            subscription: 'both',
          ),
@ -142,7 +170,7 @@ void main() {
    );

    expect(event is RosterUpdatedEvent, true);
-    final updateEvent = event as RosterUpdatedEvent;
+    final updateEvent = event! as RosterUpdatedEvent;

    expect(updateEvent.added.length, 1);
    expect(updateEvent.added.first.jid, 'testuser4@server4.example');
--- a/packages/moxxmpp/test/sasl/kv_test.dart
+++ b/packages/moxxmpp/test/sasl/kv_test.dart
@ -1,27 +1,30 @@
 import 'package:moxxmpp/src/negotiators/sasl/kv.dart';
-import 'package:moxxmpp/moxxmpp.dart';
 import 'package:test/test.dart';

 void main() {
  test('Test the Key-Value parser', () {
    final result1 = parseKeyValue('n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL');
    expect(result1.length, 2);
-      expect(result1['n']!, 'user');
-      expect(result1['r']!, 'fyko+d2lbbFgONRv9qkxdawL');
+    expect(result1['n'], 'user');
+    expect(result1['r'], 'fyko+d2lbbFgONRv9qkxdawL');

-      final result2 = parseKeyValue('r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096');
+    final result2 = parseKeyValue(
+      'r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096',
+    );
    expect(result2.length, 3);
-      expect(result2['r']!, 'fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j');
-      expect(result2['s']!, 'QSXCR+Q6sek8bf92');
-      expect(result2['i']!, '4096');
+    expect(result2['r'], 'fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j');
+    expect(result2['s'], 'QSXCR+Q6sek8bf92');
+    expect(result2['i'], '4096');
  });

  test("Test the Key-Value parser with '=' as a value", () {
-      final result = parseKeyValue('c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=,o=123');
+    final result = parseKeyValue(
+      'c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=,o=123',
+    );
    expect(result.length, 4);
-      expect(result['c']!, 'biws');
-      expect(result['r']!, 'fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j');
-      expect(result['p']!, 'v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=');
-      expect(result['o']!, '123');
+    expect(result['c'], 'biws');
+    expect(result['r'], 'fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j');
+    expect(result['p'], 'v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=');
+    expect(result['o'], '123');
  });
 }
--- a/packages/moxxmpp/test/sasl/scram_test.dart
+++ b/packages/moxxmpp/test/sasl/scram_test.dart
@ -38,11 +38,19 @@ final scramSha256StreamFeatures = XMLNode(
 void main() {
  final fakeSocket = StubTCPSocket([]);
  test('Test SASL SCRAM-SHA-1', () async {
-      final negotiator = SaslScramNegotiator(0, 'n=user,r=fyko+d2lbbFgONRv9qkxdawL', 'fyko+d2lbbFgONRv9qkxdawL', ScramHashType.sha1);
-      negotiator.register(
+    final negotiator = SaslScramNegotiator(
+      0,
+      'n=user,r=fyko+d2lbbFgONRv9qkxdawL',
+      'fyko+d2lbbFgONRv9qkxdawL',
+      ScramHashType.sha1,
+    )..register(
        NegotiatorAttributes(
          (XMLNode _, {String? redact}) {},
-          () => ConnectionSettings(jid: JID.fromString('user@server'), password: 'pencil', useDirectTLS: true),
+          () => ConnectionSettings(
+            jid: JID.fromString('user@server'),
+            password: 'pencil',
+            useDirectTLS: true,
+          ),
          (_) async {},
          getNegotiatorNullStub,
          getManagerNullStub,
@ -53,37 +61,53 @@ void main() {
      );

    expect(
-        HEX.encode(await negotiator.calculateSaltedPassword('QSXCR+Q6sek8bf92', 4096)),
+      HEX.encode(
+        await negotiator.calculateSaltedPassword('QSXCR+Q6sek8bf92', 4096),
+      ),
      '1d96ee3a529b5a5f9e47c01f229a2cb8a6e15f7d',
    );
    expect(
      HEX.encode(
-          await negotiator.calculateClientKey(HEX.decode('1d96ee3a529b5a5f9e47c01f229a2cb8a6e15f7d')),
+        await negotiator.calculateClientKey(
+          HEX.decode('1d96ee3a529b5a5f9e47c01f229a2cb8a6e15f7d'),
+        ),
      ),
      'e234c47bf6c36696dd6d852b99aaa2ba26555728',
    );
-      const authMessage = 'n=user,r=fyko+d2lbbFgONRv9qkxdawL,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096,c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j';
+    const authMessage =
+        'n=user,r=fyko+d2lbbFgONRv9qkxdawL,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096,c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j';
    expect(
      HEX.encode(
-          await negotiator.calculateClientSignature(authMessage, HEX.decode('e9d94660c39d65c38fbad91c358f14da0eef2bd6')),
+        await negotiator.calculateClientSignature(
+          authMessage,
+          HEX.decode('e9d94660c39d65c38fbad91c358f14da0eef2bd6'),
+        ),
      ),
      '5d7138c486b0bfabdf49e3e2da8bd6e5c79db613',
    );
    expect(
      HEX.encode(
-          negotiator.calculateClientProof(HEX.decode('e234c47bf6c36696dd6d852b99aaa2ba26555728'), HEX.decode('5d7138c486b0bfabdf49e3e2da8bd6e5c79db613')),
+        negotiator.calculateClientProof(
+          HEX.decode('e234c47bf6c36696dd6d852b99aaa2ba26555728'),
+          HEX.decode('5d7138c486b0bfabdf49e3e2da8bd6e5c79db613'),
+        ),
      ),
      'bf45fcbf7073d93d022466c94321745fe1c8e13b',
    );
    expect(
      HEX.encode(
-          await negotiator.calculateServerSignature(authMessage, HEX.decode('0fe09258b3ac852ba502cc62ba903eaacdbf7d31')),
+        await negotiator.calculateServerSignature(
+          authMessage,
+          HEX.decode('0fe09258b3ac852ba502cc62ba903eaacdbf7d31'),
+        ),
      ),
      'ae617da6a57c4bbb2e0286568dae1d251905b0a4',
    );
    expect(
      HEX.encode(
-          await negotiator.calculateServerKey(HEX.decode('1d96ee3a529b5a5f9e47c01f229a2cb8a6e15f7d')),
+        await negotiator.calculateServerKey(
+          HEX.decode('1d96ee3a529b5a5f9e47c01f229a2cb8a6e15f7d'),
+        ),
      ),
      '0fe09258b3ac852ba502cc62ba903eaacdbf7d31',
    );
@ -97,16 +121,29 @@ void main() {
      'bf45fcbf7073d93d022466c94321745fe1c8e13b',
    );

-      expect(await negotiator.calculateChallengeResponse('cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng=='), 'c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=');
+    expect(
+      await negotiator.calculateChallengeResponse(
+        'cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==',
+      ),
+      'c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=',
+    );
  });

  test('Test SASL SCRAM-SHA-256', () async {
    String? lastMessage;
-      final negotiator = SaslScramNegotiator(0, 'n=user,r=rOprNGfwEbeRWgbNEkqO', 'rOprNGfwEbeRWgbNEkqO', ScramHashType.sha256);
-      negotiator.register(
+    final negotiator = SaslScramNegotiator(
+      0,
+      'n=user,r=rOprNGfwEbeRWgbNEkqO',
+      'rOprNGfwEbeRWgbNEkqO',
+      ScramHashType.sha256,
+    )..register(
        NegotiatorAttributes(
          (XMLNode n, {String? redact}) => lastMessage = n.innerText(),
-          () => ConnectionSettings(jid: JID.fromString('user@server'), password: 'pencil', useDirectTLS: true),
+          () => ConnectionSettings(
+            jid: JID.fromString('user@server'),
+            password: 'pencil',
+            useDirectTLS: true,
+          ),
          (_) async {},
          getNegotiatorNullStub,
          getManagerNullStub,
@ -122,23 +159,39 @@ void main() {
      'n,,n=user,r=rOprNGfwEbeRWgbNEkqO',
    );

-      await negotiator.negotiate(XMLNode.fromString("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1yT3ByTkdmd0ViZVJXZ2JORWtxTyVodllEcFdVYTJSYVRDQWZ1eEZJbGopaE5sRiRrMCxzPVcyMlphSjBTTlk3c29Fc1VFamI2Z1E9PSxpPTQwOTY=</challenge>"));
+    await negotiator.negotiate(
+      XMLNode.fromString(
+        "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1yT3ByTkdmd0ViZVJXZ2JORWtxTyVodllEcFdVYTJSYVRDQWZ1eEZJbGopaE5sRiRrMCxzPVcyMlphSjBTTlk3c29Fc1VFamI2Z1E9PSxpPTQwOTY=</challenge>",
+      ),
+    );
    expect(
      utf8.decode(base64Decode(lastMessage!)),
-        'c=biws,r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF\$k0,p=dHzbZapWIk4jUhN+Ute9ytag9zjfMHgsqmmiz7AndVQ=',
+      r'c=biws,r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,p=dHzbZapWIk4jUhN+Ute9ytag9zjfMHgsqmmiz7AndVQ=',
    );

-      final result = await negotiator.negotiate(XMLNode.fromString("<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj02cnJpVFJCaTIzV3BSUi93dHVwK21NaFVaVW4vZEI1bkxUSlJzamw5NUc0PQ==</success>"));
+    final result = await negotiator.negotiate(
+      XMLNode.fromString(
+        "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj02cnJpVFJCaTIzV3BSUi93dHVwK21NaFVaVW4vZEI1bkxUSlJzamw5NUc0PQ==</success>",
+      ),
+    );

    expect(result.get<NegotiatorState>(), NegotiatorState.done);
  });

  test('Test a positive server signature check', () async {
-      final negotiator = SaslScramNegotiator(0, 'n=user,r=fyko+d2lbbFgONRv9qkxdawL', 'fyko+d2lbbFgONRv9qkxdawL', ScramHashType.sha1);
-      negotiator.register(
+    final negotiator = SaslScramNegotiator(
+      0,
+      'n=user,r=fyko+d2lbbFgONRv9qkxdawL',
+      'fyko+d2lbbFgONRv9qkxdawL',
+      ScramHashType.sha1,
+    )..register(
        NegotiatorAttributes(
          (XMLNode _, {String? redact}) {},
-          () => ConnectionSettings(jid: JID.fromString('user@server'), password: 'pencil', useDirectTLS: true),
+          () => ConnectionSettings(
+            jid: JID.fromString('user@server'),
+            password: 'pencil',
+            useDirectTLS: true,
+          ),
          (_) async {},
          getNegotiatorNullStub,
          getManagerNullStub,
@ -149,18 +202,34 @@ void main() {
      );

    await negotiator.negotiate(scramSha1StreamFeatures);
-      await negotiator.negotiate(XMLNode.fromString("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>"));
-      final result = await negotiator.negotiate(XMLNode.fromString("<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1ybUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>"));
+    await negotiator.negotiate(
+      XMLNode.fromString(
+        "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>",
+      ),
+    );
+    final result = await negotiator.negotiate(
+      XMLNode.fromString(
+        "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1ybUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>",
+      ),
+    );

    expect(result.get<NegotiatorState>(), NegotiatorState.done);
  });

  test('Test a negative server signature check', () async {
-      final negotiator = SaslScramNegotiator(0, 'n=user,r=fyko+d2lbbFgONRv9qkxdawL', 'fyko+d2lbbFgONRv9qkxdawL', ScramHashType.sha1);
-      negotiator.register(
+    final negotiator = SaslScramNegotiator(
+      0,
+      'n=user,r=fyko+d2lbbFgONRv9qkxdawL',
+      'fyko+d2lbbFgONRv9qkxdawL',
+      ScramHashType.sha1,
+    )..register(
        NegotiatorAttributes(
          (XMLNode _, {String? redact}) {},
-          () => ConnectionSettings(jid: JID.fromString('user@server'), password: 'pencil', useDirectTLS: true),
+          () => ConnectionSettings(
+            jid: JID.fromString('user@server'),
+            password: 'pencil',
+            useDirectTLS: true,
+          ),
          (_) async {},
          getNegotiatorNullStub,
          getManagerNullStub,
@ -170,23 +239,38 @@ void main() {
        ),
      );

-      var result;
-      result = await negotiator.negotiate(scramSha1StreamFeatures);
+    var result = await negotiator.negotiate(scramSha1StreamFeatures);
    expect(result.isType<NegotiatorState>(), true);

-      result = await negotiator.negotiate(XMLNode.fromString("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>"));
+    result = await negotiator.negotiate(
+      XMLNode.fromString(
+        "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>",
+      ),
+    );
    expect(result.isType<NegotiatorState>(), true);

-      result = await negotiator.negotiate(XMLNode.fromString("<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1zbUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>"));
+    result = await negotiator.negotiate(
+      XMLNode.fromString(
+        "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1zbUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>",
+      ),
+    );
    expect(result.isType<NegotiatorError>(), true);
  });

  test('Test a resetting the SCRAM negotiator', () async {
-      final negotiator = SaslScramNegotiator(0, 'n=user,r=fyko+d2lbbFgONRv9qkxdawL', 'fyko+d2lbbFgONRv9qkxdawL', ScramHashType.sha1);
-      negotiator.register(
+    final negotiator = SaslScramNegotiator(
+      0,
+      'n=user,r=fyko+d2lbbFgONRv9qkxdawL',
+      'fyko+d2lbbFgONRv9qkxdawL',
+      ScramHashType.sha1,
+    )..register(
        NegotiatorAttributes(
          (XMLNode _, {String? redact}) {},
-          () => ConnectionSettings(jid: JID.fromString('user@server'), password: 'pencil', useDirectTLS: true),
+          () => ConnectionSettings(
+            jid: JID.fromString('user@server'),
+            password: 'pencil',
+            useDirectTLS: true,
+          ),
          (_) async {},
          getNegotiatorNullStub,
          getManagerNullStub,
@ -197,15 +281,31 @@ void main() {
      );

    await negotiator.negotiate(scramSha1StreamFeatures);
-      await negotiator.negotiate(XMLNode.fromString("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>"));
-      final result1 = await negotiator.negotiate(XMLNode.fromString("<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1ybUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>"));
+    await negotiator.negotiate(
+      XMLNode.fromString(
+        "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>",
+      ),
+    );
+    final result1 = await negotiator.negotiate(
+      XMLNode.fromString(
+        "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1ybUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>",
+      ),
+    );
    expect(result1.get<NegotiatorState>(), NegotiatorState.done);

    // Reset and try again
    negotiator.reset();
    await negotiator.negotiate(scramSha1StreamFeatures);
-      await negotiator.negotiate(XMLNode.fromString("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>"));
-      final result2 = await negotiator.negotiate(XMLNode.fromString("<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1ybUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>"));
+    await negotiator.negotiate(
+      XMLNode.fromString(
+        "<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0wzcmZjTkhZSlkxWlZ2V1ZzN2oscz1RU1hDUitRNnNlazhiZjkyLGk9NDA5Ng==</challenge>",
+      ),
+    );
+    final result2 = await negotiator.negotiate(
+      XMLNode.fromString(
+        "<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>dj1ybUY5cHFWOFM3c3VBb1pXamE0ZEpSa0ZzS1E9</success>",
+      ),
+    );
    expect(result2.get<NegotiatorState>(), NegotiatorState.done);
  });
 }
--- a/packages/moxxmpp/test/stanzahandler_test.dart
+++ b/packages/moxxmpp/test/stanzahandler_test.dart
@ -1,16 +1,23 @@
 import 'package:moxxmpp/moxxmpp.dart';
 import 'package:test/test.dart';

-final stanza1 = Stanza.iq(children: [
-    XMLNode.xmlns(tag: 'tag', xmlns: 'owo')
-],);
-final stanza2 = Stanza.message(children: [
-    XMLNode.xmlns(tag: 'some-other-tag', xmlns: 'owo')
-],);
+final stanza1 = Stanza.iq(
+  children: [XMLNode.xmlns(tag: 'tag', xmlns: 'owo')],
+);
+final stanza2 = Stanza.message(
+  children: [XMLNode.xmlns(tag: 'some-other-tag', xmlns: 'owo')],
+);

 void main() {
  test('match all', () {
-      final handler = StanzaHandler(callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza));
+    final handler = StanzaHandler(
+      callback: (stanza, _) async => StanzaHandlerData(
+        true,
+        false,
+        null,
+        stanza,
+      ),
+    );

    expect(handler.matches(Stanza.iq()), true);
    expect(handler.matches(Stanza.message()), true);
@ -20,7 +27,12 @@ void main() {
  });
  test('xmlns matching', () {
    final handler = StanzaHandler(
-        callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza),
+      callback: (stanza, _) async => StanzaHandlerData(
+        true,
+        false,
+        null,
+        stanza,
+      ),
      tagXmlns: 'owo',
    );

@ -32,10 +44,18 @@ void main() {
  });
  test('stanzaTag matching', () {
    var run = false;
-      final handler = StanzaHandler(callback: (stanza, _) async {
+    final handler = StanzaHandler(
+      callback: (stanza, _) async {
        run = true;
-          return StanzaHandlerData(true, false, null, stanza);
-      }, stanzaTag: 'iq',);
+        return StanzaHandlerData(
+          true,
+          false,
+          null,
+          stanza,
+        );
+      },
+      stanzaTag: 'iq',
+    );

    expect(handler.matches(Stanza.iq()), true);
    expect(handler.matches(Stanza.message()), false);
@ -43,12 +63,25 @@ void main() {
    expect(handler.matches(stanza1), true);
    expect(handler.matches(stanza2), false);

-      handler.callback(stanza2, StanzaHandlerData(false, false, null, stanza2));
+    handler.callback(
+      stanza2,
+      StanzaHandlerData(
+        false,
+        false,
+        null,
+        stanza2,
+      ),
+    );
    expect(run, true);
  });
  test('tagName matching', () {
    final handler = StanzaHandler(
-        callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza),
+      callback: (stanza, _) async => StanzaHandlerData(
+        true,
+        false,
+        null,
+        stanza,
+      ),
      tagName: 'tag',
    );

@ -60,7 +93,12 @@ void main() {
  });
  test('combined matching', () {
    final handler = StanzaHandler(
-        callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza),
+      callback: (stanza, _) async => StanzaHandlerData(
+        true,
+        false,
+        null,
+        stanza,
+      ),
      tagName: 'tag',
      stanzaTag: 'iq',
      tagXmlns: 'owo',
@ -75,12 +113,36 @@ void main() {

  test('sorting', () {
    final handlerList = [
-        StanzaHandler(callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza), tagName: '1', priority: 100),
-        StanzaHandler(callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza), tagName: '2'),
-        StanzaHandler(callback: (stanza, _) async => StanzaHandlerData(true, false, null, stanza), tagName: '3', priority: 50)
-      ];
-
-      handlerList.sort(stanzaHandlerSortComparator);
+      StanzaHandler(
+        callback: (stanza, _) async => StanzaHandlerData(
+          true,
+          false,
+          null,
+          stanza,
+        ),
+        tagName: '1',
+        priority: 100,
+      ),
+      StanzaHandler(
+        callback: (stanza, _) async => StanzaHandlerData(
+          true,
+          false,
+          null,
+          stanza,
+        ),
+        tagName: '2',
+      ),
+      StanzaHandler(
+        callback: (stanza, _) async => StanzaHandlerData(
+          true,
+          false,
+          null,
+          stanza,
+        ),
+        tagName: '3',
+        priority: 50,
+      )
+    ]..sort(stanzaHandlerSortComparator);

    expect(handlerList[0].tagName, '1');
    expect(handlerList[1].tagName, '3');
--- a/packages/moxxmpp/test/stringxml_test.dart
+++ b/packages/moxxmpp/test/stringxml_test.dart
@ -6,32 +6,78 @@ import 'helpers/xml.dart';
 void main() {
  test('Test stringxml', () {
    final child = XMLNode(tag: 'uwu', attributes: {'strength': 10});
-    final stanza = XMLNode.xmlns(tag: 'uwu-meter', xmlns: 'uwu', children: [ child ]);
-    expect(XMLNode(tag: 'iq', attributes: {'xmlns': 'uwu'}).toXml(), "<iq xmlns='uwu' />");
-    expect(XMLNode.xmlns(tag: 'iq', xmlns: 'uwu', attributes: {'how': 'uwu'}).toXml(), "<iq xmlns='uwu' how='uwu' />");
-    expect(stanza.toXml(), "<uwu-meter xmlns='uwu'><uwu strength=10 /></uwu-meter>");
+    final stanza =
+        XMLNode.xmlns(tag: 'uwu-meter', xmlns: 'uwu', children: [child]);
+    expect(
+      XMLNode(tag: 'iq', attributes: {'xmlns': 'uwu'}).toXml(),
+      "<iq xmlns='uwu' />",
+    );
+    expect(
+      XMLNode.xmlns(tag: 'iq', xmlns: 'uwu', attributes: {'how': 'uwu'})
+          .toXml(),
+      "<iq xmlns='uwu' how='uwu' />",
+    );
+    expect(
+      stanza.toXml(),
+      "<uwu-meter xmlns='uwu'><uwu strength=10 /></uwu-meter>",
+    );

-    expect(StreamHeaderNonza('uwu.server').toXml(), "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='uwu.server' xml:lang='en'>");
+    expect(
+      StreamHeaderNonza('uwu.server').toXml(),
+      "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='uwu.server' xml:lang='en'>",
+    );

-    expect(XMLNode(tag: 'text', attributes: {}, text: 'hallo').toXml(), '<text>hallo</text>');
-    expect(XMLNode(tag: 'text', attributes: { 'world': 'no' }, text: 'hallo').toXml(), "<text world='no'>hallo</text>");
-    expect(XMLNode(tag: 'text', attributes: {}, text: 'hallo').toXml(), '<text>hallo</text>');
-    expect(XMLNode(tag: 'text', attributes: {}, text: 'test').innerText(), 'test');
+    expect(
+      XMLNode(tag: 'text', attributes: {}, text: 'hallo').toXml(),
+      '<text>hallo</text>',
+    );
+    expect(
+      XMLNode(tag: 'text', attributes: {'world': 'no'}, text: 'hallo').toXml(),
+      "<text world='no'>hallo</text>",
+    );
+    expect(
+      XMLNode(tag: 'text', attributes: {}, text: 'hallo').toXml(),
+      '<text>hallo</text>',
+    );
+    expect(
+      XMLNode(tag: 'text', attributes: {}, text: 'test').innerText(),
+      'test',
+    );
  });

  test('Test XmlElement', () {
-    expect(XMLNode.fromXmlElement(XmlDocument.parse("<root owo='uwu' />").firstElementChild!).toXml(), "<root owo='uwu' />");
+    expect(
+      XMLNode.fromXmlElement(
+        XmlDocument.parse("<root owo='uwu' />").firstElementChild!,
+      ).toXml(),
+      "<root owo='uwu' />",
+    );
  });

  test('Test the find functions', () {
-    final node1 = XMLNode.fromString('<message><a xmlns="a" /><body>Hallo</body></message>');
+    final node1 = XMLNode.fromString(
+      '<message><a xmlns="a" /><body>Hallo</body></message>',
+    );

-    expect(compareXMLNodes(node1.firstTag('body')!, XMLNode.fromString('<body>Hallo</body>')), true);
-    expect(compareXMLNodes(node1.firstTagByXmlns('a')!, XMLNode.fromString('<a xmlns="a" />')), true);
+    expect(
+      compareXMLNodes(
+        node1.firstTag('body')!,
+        XMLNode.fromString('<body>Hallo</body>'),
+      ),
+      true,
+    );
+    expect(
+      compareXMLNodes(
+        node1.firstTagByXmlns('a')!,
+        XMLNode.fromString('<a xmlns="a" />'),
+      ),
+      true,
+    );
  });

  test('Test compareXMLNodes', () {
-    final node1 = XMLNode.fromString('''
+    final node1 = XMLNode.fromString(
+      '''
 <iq type='set' id='0327c373-2e34-46bd-ab7f-1274a6f7095f' to='pubsub.server.example.org' from='testuser@example.org/MU29eEZn' xmlns='jabber:client'>
  <pubsub xmlns='http://jabber.org/protocol/pubsub'>
    <publish node='princely_musings'>
@ -75,6 +121,12 @@ void main() {
 </iq>
 ''');

-    expect(compareXMLNodes(node1, node2, ignoreId: true), false);
+    expect(
+      compareXMLNodes(
+        node1,
+        node2,
+      ),
+      false,
+    );
  });
 }
--- a/packages/moxxmpp/test/wait_test.dart
+++ b/packages/moxxmpp/test/wait_test.dart
@ -1,27 +1,26 @@
-import 'package:test/test.dart';
 import 'package:moxxmpp/src/util/wait.dart';
+import 'package:test/test.dart';

 void main() {
  test('Test adding and resolving', () async {
    // ID -> Milliseconds since epoch
    final tracker = WaitForTracker<int, int>();

-    int r2 = 0;
-    int r3 = 0;
+    var r2 = 0;
+    var r3 = 0;

    // Queue some jobs
    final r1 = await tracker.waitFor(0);
    expect(r1, null);

-    tracker
-      .waitFor(0)
-      .then((result) async {
+    // ignore: unawaited_futures
+    tracker.waitFor(0).then((result) async {
      expect(result != null, true);
      r2 = await result!;
    });
-    tracker
-      .waitFor(0)
-      .then((result) async {
+
+    // ignore: unawaited_futures
+    tracker.waitFor(0).then((result) async {
      expect(result != null, true);
      r3 = await result!;
    });
--- a/packages/moxxmpp/test/xeps/xep_0004_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0004_test.dart
@ -3,10 +3,14 @@ import 'package:test/test.dart';

 void main() {
  test('Parsing', () {
-    const testData = "<x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='ip_version' type='text-multi' ><value>ipv4</value><value>ipv6</value></field><field var='os'><value>Mac</value></field><field var='os_version'><value>10.5.1</value></field><field var='software'><value>Psi</value></field><field var='software_version'><value>0.11</value></field></x>";
+    const testData =
+        "<x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='ip_version' type='text-multi' ><value>ipv4</value><value>ipv6</value></field><field var='os'><value>Mac</value></field><field var='os_version'><value>10.5.1</value></field><field var='software'><value>Psi</value></field><field var='software_version'><value>0.11</value></field></x>";

    final form = parseDataForm(XMLNode.fromString(testData));
-    expect(form.getFieldByVar('FORM_TYPE')?.values.first, 'urn:xmpp:dataforms:softwareinfo');
+    expect(
+      form.getFieldByVar('FORM_TYPE')?.values.first,
+      'urn:xmpp:dataforms:softwareinfo',
+    );
    expect(form.getFieldByVar('ip_version')?.values, ['ipv4', 'ipv6']);
    expect(form.getFieldByVar('os')?.values.first, 'Mac');
    expect(form.getFieldByVar('os_version')?.values.first, '10.5.1');
--- a/packages/moxxmpp/test/xeps/xep_0030_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0030_test.dart
@ -28,7 +28,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -64,53 +64,54 @@ void main() {
          "<iq type='get' id='ec325efc-9924-4c48-93f8-ed34a2b0e5fc' to='romeo@montague.lit/orchard' from='polynomdivision@test.server/MU29eEZn' xmlns='jabber:client'><query xmlns='http://jabber.org/protocol/disco#info' /></iq>",
          '',
          ignoreId: true,
-          adjustId: false,
        ),
-
      ],
    );
-    final XmppConnection conn = XmppConnection(
+    final conn = XmppConnection(
      TestingReconnectionPolicy(),
      AlwaysConnectedConnectivityManager(),
      fakeSocket,
-    );
-    conn.setConnectionSettings(ConnectionSettings(
+    )..setConnectionSettings(
+        ConnectionSettings(
          jid: JID.fromString('polynomdivision@test.server'),
          password: 'aaaa',
          useDirectTLS: true,
-    ),);
-    conn.registerManagers([
+        ),
+      );
+    await conn.registerManagers([
      PresenceManager(),
      RosterManager(TestingRosterStateManager(null, [])),
      DiscoManager([]),
      PingManager(),
      EntityCapabilitiesManager('http://moxxmpp.example'),
    ]);
-    conn.registerFeatureNegotiators(
-      [
+    conn.registerFeatureNegotiators([
      SaslPlainNegotiator(),
      SaslScramNegotiator(10, '', '', ScramHashType.sha512),
      ResourceBindingNegotiator(),
-      ]
-    );
+    ]);

    final disco = conn.getManagerById<DiscoManager>(discoManager)!;

    await conn.connect();
-    await Future.delayed(const Duration(seconds: 3));
+    await Future<void>.delayed(const Duration(seconds: 3));

    final jid = JID.fromString('romeo@montague.lit/orchard');
    final result1 = disco.discoInfoQuery(jid.toString());
    final result2 = disco.discoInfoQuery(jid.toString());

-    await Future.delayed(const Duration(seconds: 1));
+    await Future<void>.delayed(const Duration(seconds: 1));
    expect(
-      disco.infoTracker.getRunningTasks(DiscoCacheKey(jid.toString(), null)).length,
+      disco.infoTracker
+          .getRunningTasks(DiscoCacheKey(jid.toString(), null))
+          .length,
      1,
    );
-    fakeSocket.injectRawXml("<iq type='result' id='${fakeSocket.lastId!}' from='romeo@montague.lit/orchard' to='polynomdivision@test.server/MU29eEZn' xmlns='jabber:client'><query xmlns='http://jabber.org/protocol/disco#info' /></iq>");
+    fakeSocket.injectRawXml(
+      "<iq type='result' id='${fakeSocket.lastId!}' from='romeo@montague.lit/orchard' to='polynomdivision@test.server/MU29eEZn' xmlns='jabber:client'><query xmlns='http://jabber.org/protocol/disco#info' /></iq>",
+    );

-    await Future.delayed(const Duration(seconds: 2));
+    await Future<void>.delayed(const Duration(seconds: 2));

    expect(fakeSocket.getState(), 6);
    expect(await result1, await result2);
--- a/packages/moxxmpp/test/xeps/xep_0060_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0060_test.dart
@ -11,16 +11,18 @@ class StubbedDiscoManager extends DiscoManager {
  final bool _itemError;

  @override
-  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(String entity, { String? node, bool shouldEncrypt = true }) async {
+  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(
+    String entity, {
+    String? node,
+    bool shouldEncrypt = true,
+  }) async {
    final result = DiscoInfo.fromQuery(
-      XMLNode.fromString(
-        '''
+      XMLNode.fromString('''
 <query xmlns='http://jabber.org/protocol/disco#info'>
  <identity category='pubsub' type='service' />
  <feature var="http://jabber.org/protocol/pubsub" />
  <feature var="http://jabber.org/protocol/pubsub#multi-items" />
-</query>'''
-      ),
+</query>'''),
      JID.fromString('pubsub.server.example.org'),
    );

@ -28,7 +30,11 @@ class StubbedDiscoManager extends DiscoManager {
  }

  @override
-  Future<Result<DiscoError, List<DiscoItem>>> discoItemsQuery(String entity, {String? node, bool shouldEncrypt = true}) async {
+  Future<Result<DiscoError, List<DiscoItem>>> discoItemsQuery(
+    String entity, {
+    String? node,
+    bool shouldEncrypt = true,
+  }) async {
    if (_itemError) {
      return Result(
        UnknownDiscoError(),
@ -43,9 +49,11 @@ class StubbedDiscoManager extends DiscoManager {
 void main() {
  initLogger();

-  test('Test pre-processing with pubsub#max_items when the server does not support it (1/2)', () async {
+  test(
+      'Test pre-processing with pubsub#max_items when the server does not support it (1/2)',
+      () async {
    final manager = PubSubManager();
-    final TestingManagerHolder tm = TestingManagerHolder();
+    final tm = TestingManagerHolder();
    await tm.register(StubbedDiscoManager(false));
    await tm.register(manager);

@ -58,9 +66,11 @@ void main() {
    expect(result.maxItems, '1');
  });

-  test('Test pre-processing with pubsub#max_items when the server does not support it (2/2)', () async {
+  test(
+      'Test pre-processing with pubsub#max_items when the server does not support it (2/2)',
+      () async {
    final manager = PubSubManager();
-    final TestingManagerHolder tm = TestingManagerHolder();
+    final tm = TestingManagerHolder();
    await tm.register(StubbedDiscoManager(true));
    await tm.register(manager);

@ -73,7 +83,9 @@ void main() {
    expect(result.maxItems, '1');
  });

-  test('Test publishing with pubsub#max_items when the server does not support it', () async {
+  test(
+      'Test publishing with pubsub#max_items when the server does not support it',
+      () async {
    final socket = StubTCPSocket.authenticated(
      TestingManagerHolder.settings,
      [
@ -158,7 +170,8 @@ void main() {
      RosterManager(TestingRosterStateManager(null, [])),
      PingManager(),
    ]);
-    connection..registerFeatureNegotiators([
+    connection
+      ..registerFeatureNegotiators([
        SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
      ])
@ -167,8 +180,9 @@ void main() {
      waitUntilLogin: true,
    );

-    final item = XMLNode(tag: "test-item");
-    final result = await connection.getManagerById<PubSubManager>(pubsubManager)!.publish(
+    final item = XMLNode(tag: 'test-item');
+    final result =
+        await connection.getManagerById<PubSubManager>(pubsubManager)!.publish(
              'pubsub.server.example.org',
              'princely_musings',
              item,
--- a/packages/moxxmpp/test/xeps/xep_0115_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0115_test.dart
@ -5,20 +5,20 @@ import 'package:test/test.dart';
 void main() {
  test('Test XEP example', () async {
    final data = DiscoInfo(
-      [
+      const [
        'http://jabber.org/protocol/caps',
        'http://jabber.org/protocol/disco#info',
        'http://jabber.org/protocol/disco#items',
        'http://jabber.org/protocol/muc'
      ],
-      [
+      const [
        Identity(
          category: 'client',
          type: 'pc',
          name: 'Exodus 0.9.1',
        )
      ],
-      [],
+      const [],
      null,
      JID.fromString('some@user.local/test'),
    );
@ -28,22 +28,23 @@ void main() {
  });

  test('Test complex generation example', () async {
-    const extDiscoDataString = "<x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='ip_version' type='text-multi' ><value>ipv4</value><value>ipv6</value></field><field var='os'><value>Mac</value></field><field var='os_version'><value>10.5.1</value></field><field var='software'><value>Psi</value></field><field var='software_version'><value>0.11</value></field></x>";
+    const extDiscoDataString =
+        "<x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='ip_version' type='text-multi' ><value>ipv4</value><value>ipv6</value></field><field var='os'><value>Mac</value></field><field var='os_version'><value>10.5.1</value></field><field var='software'><value>Psi</value></field><field var='software_version'><value>0.11</value></field></x>";
    final data = DiscoInfo(
-      [
+      const [
        'http://jabber.org/protocol/caps',
        'http://jabber.org/protocol/disco#info',
        'http://jabber.org/protocol/disco#items',
        'http://jabber.org/protocol/muc'
      ],
-      [
-        const Identity(
+      const [
+        Identity(
          category: 'client',
          type: 'pc',
          name: 'Psi 0.11',
          lang: 'en',
        ),
-        const Identity(
+        Identity(
          category: 'client',
          type: 'pc',
          name: 'Ψ 0.11',
@ -60,7 +61,7 @@ void main() {
  });

  test('Test Gajim capability hash computation', () async {
-    // TODO: This one fails
+    // TODO(Unknown): This one fails
    /*
    final data = DiscoInfo(
      features: [
@ -120,7 +121,7 @@ void main() {

  test('Test Conversations hash computation', () async {
    final data = DiscoInfo(
-      [
+      const [
        'eu.siacs.conversations.axolotl.devicelist+notify',
        'http://jabber.org/protocol/caps',
        'http://jabber.org/protocol/chatstates',
@ -152,14 +153,14 @@ void main() {
        'urn:xmpp:receipts',
        'urn:xmpp:time'
      ],
-      [
+      const [
        Identity(
          category: 'client',
          type: 'phone',
          name: 'Conversations',
        )
      ],
-      [],
+      const [],
      null,
      JID.fromString('user@server.local/test'),
    );
--- a/packages/moxxmpp/test/xeps/xep_0198_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0198_test.dart
@ -3,21 +3,54 @@ import 'package:test/test.dart';
 import '../helpers/logging.dart';
 import '../helpers/xmpp.dart';

-Future<void> runIncomingStanzaHandlers(StreamManagementManager man, Stanza stanza) async {
+Future<void> runIncomingStanzaHandlers(
+  StreamManagementManager man,
+  Stanza stanza,
+) async {
  for (final handler in man.getIncomingPreStanzaHandlers()) {
-    if (handler.matches(stanza)) await handler.callback(stanza, StanzaHandlerData(false, false, null, stanza));
+    if (handler.matches(stanza)) {
+      await handler.callback(
+        stanza,
+        StanzaHandlerData(
+          false,
+          false,
+          null,
+          stanza,
+        ),
+      );
+    }
  }
 }

-Future<void> runOutgoingStanzaHandlers(StreamManagementManager man, Stanza stanza) async {
+Future<void> runOutgoingStanzaHandlers(
+  StreamManagementManager man,
+  Stanza stanza,
+) async {
  for (final handler in man.getOutgoingPostStanzaHandlers()) {
-    if (handler.matches(stanza)) await handler.callback(stanza, StanzaHandlerData(false, false, null, stanza));
+    if (handler.matches(stanza)) {
+      await handler.callback(
+        stanza,
+        StanzaHandlerData(
+          false,
+          false,
+          null,
+          stanza,
+        ),
+      );
+    }
  }
 }

 XmppManagerAttributes mkAttributes(void Function(Stanza) callback) {
  return XmppManagerAttributes(
-    sendStanza: (stanza, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async {
+    sendStanza: (
+      stanza, {
+      StanzaFromType addFrom = StanzaFromType.full,
+      bool addId = true,
+      bool awaitable = true,
+      bool encrypted = false,
+      bool forceEncryption = false,
+    }) async {
      callback(stanza);

      return Stanza.message();
@ -33,12 +66,22 @@ XmppManagerAttributes mkAttributes(void Function(Stanza) callback) {
    isFeatureSupported: (_) => false,
    getFullJID: () => JID.fromString('hallo@example.server/uwu'),
    getSocket: () => StubTCPSocket([]),
-    getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket([])),
+    getConnection: () => XmppConnection(
+      TestingReconnectionPolicy(),
+      AlwaysConnectedConnectivityManager(),
+      StubTCPSocket([]),
+    ),
    getNegotiatorById: getNegotiatorNullStub,
  );
 }

-XMLNode mkAck(int h) => XMLNode.xmlns(tag: 'a', xmlns: 'urn:xmpp:sm:3', attributes: { 'h': h.toString() });
+XMLNode mkAck(int h) => XMLNode.xmlns(
+      tag: 'a',
+      xmlns: 'urn:xmpp:sm:3',
+      attributes: {
+        'h': h.toString(),
+      },
+    );

 void main() {
  initLogger();
@ -50,8 +93,7 @@ void main() {

  test('Test stream with SM enablement', () async {
    final attributes = mkAttributes((_) {});
-    final manager = StreamManagementManager();
-    manager.register(attributes);
+    final manager = StreamManagementManager()..register(attributes);

    // [...]
    // <enable /> // <enabled />
@ -77,10 +119,10 @@ void main() {
  group('Acking', () {
    test('Test completely clearing the queue', () async {
      final attributes = mkAttributes((_) {});
-      final manager = StreamManagementManager();
-      manager.register(attributes);
+      final manager = StreamManagementManager()..register(attributes);

-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      await manager
+          .onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));

      // Send a stanza 5 times
      for (var i = 0; i < 5; i++) {
@ -93,10 +135,11 @@ void main() {
    });
    test('Test partially clearing the queue', () async {
      final attributes = mkAttributes((_) {});
-      final manager = StreamManagementManager();
-      manager.register(attributes);
+      final manager = StreamManagementManager()..register(attributes);

-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );

      // Send a stanza 5 times
      for (var i = 0; i < 5; i++) {
@ -109,10 +152,11 @@ void main() {
    });
    test('Send an ack with h > c2s', () async {
      final attributes = mkAttributes((_) {});
-      final manager = StreamManagementManager();
-      manager.register(attributes);
+      final manager = StreamManagementManager()..register(attributes);

-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );

      // Send a stanza 5 times
      for (var i = 0; i < 5; i++) {
@ -126,10 +170,11 @@ void main() {
    });
    test('Send an ack with h < c2s', () async {
      final attributes = mkAttributes((_) {});
-      final manager = StreamManagementManager();
-      manager.register(attributes);
+      final manager = StreamManagementManager()..register(attributes);

-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );

      // Send a stanza 5 times
      for (var i = 0; i < 5; i++) {
@ -146,9 +191,10 @@ void main() {
  group('Counting acks', () {
    test('Sending all pending acks at once', () async {
      final attributes = mkAttributes((_) {});
-      final manager = StreamManagementManager();
-      manager.register(attributes);
-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      final manager = StreamManagementManager()..register(attributes);
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );

      // Send a stanza 5 times
      for (var i = 0; i < 5; i++) {
@ -162,9 +208,10 @@ void main() {
    });
    test('Sending partial pending acks at once', () async {
      final attributes = mkAttributes((_) {});
-      final manager = StreamManagementManager();
-      manager.register(attributes);
-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      final manager = StreamManagementManager()..register(attributes);
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );

      // Send a stanza 5 times
      for (var i = 0; i < 5; i++) {
@ -177,9 +224,9 @@ void main() {
      expect(await manager.getPendingAcks(), 2);
    });

-    test('Test counting incoming stanzas for which handlers end early', () async {
-      final fakeSocket = StubTCPSocket(
-        [
+    test('Test counting incoming stanzas for which handlers end early',
+        () async {
+      final fakeSocket = StubTCPSocket([
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
          '''
@ -197,7 +244,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -229,21 +276,21 @@ void main() {
          "<enable xmlns='urn:xmpp:sm:3' resume='true' />",
          '<enabled xmlns="urn:xmpp:sm:3" id="some-long-sm-id" resume="true" />',
        ),
-        ]
-      );
+      ]);

-      final XmppConnection conn = XmppConnection(
+      final conn = XmppConnection(
        TestingReconnectionPolicy(),
        AlwaysConnectedConnectivityManager(),
        fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+      )..setConnectionSettings(
+          ConnectionSettings(
            jid: JID.fromString('polynomdivision@test.server'),
            password: 'aaaa',
            useDirectTLS: true,
-      ),);
+          ),
+        );
      final sm = StreamManagementManager();
-      conn.registerManagers([
+      await conn.registerManagers([
        PresenceManager(),
        RosterManager(TestingRosterStateManager('', [])),
        DiscoManager([]),
@ -252,20 +299,21 @@ void main() {
        CarbonsManager()..forceEnable(),
        EntityCapabilitiesManager('http://moxxmpp.example'),
      ]);
-      conn.registerFeatureNegotiators(
-        [
+      conn.registerFeatureNegotiators([
        SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
        StreamManagementNegotiator(),
-        ]
-      );
+      ]);

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3));
-      expect(fakeSocket.getState(), 6);
+      await conn.connect(
+        waitUntilLogin: true,
+      );
+      expect(fakeSocket.getState(), 5);
      expect(await conn.getConnectionState(), XmppConnectionState.connected);
      expect(
-        conn.getManagerById<StreamManagementManager>(smManager)!.isStreamManagementEnabled(),
+        conn
+            .getManagerById<StreamManagementManager>(smManager)!
+            .isStreamManagementEnabled(),
        true,
      );

@ -289,13 +337,12 @@ void main() {
 </message>
      ''');

-      await Future.delayed(const Duration(seconds: 2));
+      await Future<void>.delayed(const Duration(seconds: 2));
      expect(sm.state.s2c, 1);
    });

    test('Test counting incoming stanzas that are awaited', () async {
-      final fakeSocket = StubTCPSocket(
-        [
+      final fakeSocket = StubTCPSocket([
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
          '''
@ -313,7 +360,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -345,53 +392,54 @@ void main() {
          "<enable xmlns='urn:xmpp:sm:3' resume='true' />",
          '<enabled xmlns="urn:xmpp:sm:3" id="some-long-sm-id" resume="true" />',
        ),
-          StringExpectation(
-            "<presence xmlns='jabber:client' from='polynomdivision@test.server/MU29eEZn'><show>chat</show><c xmlns='http://jabber.org/protocol/caps' hash='sha-1' node='http://moxxmpp.example' ver='3QvQ2RAy45XBDhArjxy/vEWMl+E=' /></presence>",
-            '<iq type="result" />',
-          ),
+        // StringExpectation(
+        //   "<presence xmlns='jabber:client' from='polynomdivision@test.server/MU29eEZn'><show>chat</show></presence>",
+        //   '<iq type="result" />',
+        // ),
        StanzaExpectation(
          "<iq to='user@example.com' type='get' id='a' xmlns='jabber:client' />",
          "<iq from='user@example.com' type='result' id='a' />",
          ignoreId: true,
          adjustId: true,
        ),
-        ]
-      );
+      ]);

-      final XmppConnection conn = XmppConnection(
+      final conn = XmppConnection(
        TestingReconnectionPolicy(),
        AlwaysConnectedConnectivityManager(),
        fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+      )..setConnectionSettings(
+          ConnectionSettings(
            jid: JID.fromString('polynomdivision@test.server'),
            password: 'aaaa',
            useDirectTLS: true,
-      ),);
+          ),
+        );
      final sm = StreamManagementManager();
-      conn.registerManagers([
+      await conn.registerManagers([
        PresenceManager(),
        RosterManager(TestingRosterStateManager('', [])),
        DiscoManager([]),
        PingManager(),
        sm,
        CarbonsManager()..forceEnable(),
-          EntityCapabilitiesManager('http://moxxmpp.example'),
+        //EntityCapabilitiesManager('http://moxxmpp.example'),
      ]);
-      conn.registerFeatureNegotiators(
-        [
+      conn.registerFeatureNegotiators([
        SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
        StreamManagementNegotiator(),
-        ]
-      );
+      ]);

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3));
-      expect(fakeSocket.getState(), 6);
+      await conn.connect(
+        waitUntilLogin: true,
+      );
+      expect(fakeSocket.getState(), 5);
      expect(await conn.getConnectionState(), XmppConnectionState.connected);
      expect(
-        conn.getManagerById<StreamManagementManager>(smManager)!.isStreamManagementEnabled(),
+        conn
+            .getManagerById<StreamManagementManager>(smManager)!
+            .isStreamManagementEnabled(),
        true,
      );

@ -404,7 +452,7 @@ void main() {
        addFrom: StanzaFromType.none,
      );

-      expect(sm.state.s2c, 2);
+      expect(sm.state.s2c, /*2*/ 1);
    });
  });

@ -414,10 +462,11 @@ void main() {
      final attributes = mkAttributes((_) {
        stanzaCount++;
      });
-      final manager = StreamManagementManager();
-      manager.register(attributes);
+      final manager = StreamManagementManager()..register(attributes);

-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );

      // Send 5 stanzas
      for (var i = 0; i < 5; i++) {
@ -440,12 +489,13 @@ void main() {
      final attributes = mkAttributes((_) {
        stanzaCount++;
      });
-      final manager = StreamManagementManager();
-      manager.register(attributes);
+      final manager = StreamManagementManager()..register(attributes);

      // [ ... ]
-      await manager.onXmppEvent(StreamManagementEnabledEvent(resource: 'hallo'));
-      manager.setState(manager.state.copyWith(c2s: 150, s2c: 70));
+      await manager.onXmppEvent(
+        StreamManagementEnabledEvent(resource: 'hallo'),
+      );
+      await manager.setState(manager.state.copyWith(c2s: 150, s2c: 70));

      // Send some stanzas but don't ack them
      for (var i = 0; i < 5; i++) {
@ -463,8 +513,7 @@ void main() {

  group('Test the negotiator', () {
    test('Test successful stream enablement', () async {
-      final fakeSocket = StubTCPSocket(
-        [
+      final fakeSocket = StubTCPSocket([
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
          '''
@ -482,7 +531,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -508,54 +557,54 @@ void main() {
        StanzaExpectation(
          '<iq xmlns="jabber:client" type="set" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"/></iq>',
          '<iq xmlns="jabber:client" type="result" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>polynomdivision@test.server/MU29eEZn</jid></bind></iq>',
-            ignoreId: true
+          ignoreId: true,
        ),
        StringExpectation(
          "<enable xmlns='urn:xmpp:sm:3' resume='true' />",
-            '<enabled xmlns="urn:xmpp:sm:3" id="some-long-sm-id" resume="true" />'
+          '<enabled xmlns="urn:xmpp:sm:3" id="some-long-sm-id" resume="true" />',
        )
-        ]
-      );
+      ]);

-      final XmppConnection conn = XmppConnection(
+      final conn = XmppConnection(
        TestingReconnectionPolicy(),
        AlwaysConnectedConnectivityManager(),
        fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+      )..setConnectionSettings(
+          ConnectionSettings(
            jid: JID.fromString('polynomdivision@test.server'),
            password: 'aaaa',
            useDirectTLS: true,
-      ),);
-      conn.registerManagers([
+          ),
+        );
+      await conn.registerManagers([
        PresenceManager(),
        RosterManager(TestingRosterStateManager('', [])),
        DiscoManager([]),
        PingManager(),
        StreamManagementManager(),
      ]);
-      conn.registerFeatureNegotiators(
-        [
+      conn.registerFeatureNegotiators([
        SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
        StreamManagementNegotiator(),
-        ]
+      ]);
+
+      await conn.connect(
+        waitUntilLogin: true,
      );

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3));
-
-      expect(fakeSocket.getState(), 6);
+      expect(fakeSocket.getState(), 5);
      expect(await conn.getConnectionState(), XmppConnectionState.connected);
      expect(
-        conn.getManagerById<StreamManagementManager>(smManager)!.isStreamManagementEnabled(),
+        conn
+            .getManagerById<StreamManagementManager>(smManager)!
+            .isStreamManagementEnabled(),
        true,
      );
    });

    test('Test a failed stream resumption', () async {
-      final fakeSocket = StubTCPSocket(
-        [
+      final fakeSocket = StubTCPSocket([
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
          '''
@ -573,7 +622,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -603,41 +652,38 @@ void main() {
        StanzaExpectation(
          '<iq xmlns="jabber:client" type="set" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"/></iq>',
          '<iq xmlns="jabber:client" type="result" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>polynomdivision@test.server/MU29eEZn</jid></bind></iq>',
-            ignoreId: true
+          ignoreId: true,
        ),
        StringExpectation(
          "<enable xmlns='urn:xmpp:sm:3' resume='true' />",
-            '<enabled xmlns="urn:xmpp:sm:3" id="id-2" resume="true" />'
+          '<enabled xmlns="urn:xmpp:sm:3" id="id-2" resume="true" />',
        )
-        ]
-      );
+      ]);

-      final XmppConnection conn = XmppConnection(
+      final conn = XmppConnection(
        TestingReconnectionPolicy(),
        AlwaysConnectedConnectivityManager(),
        fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+      )..setConnectionSettings(
+          ConnectionSettings(
            jid: JID.fromString('polynomdivision@test.server'),
            password: 'aaaa',
            useDirectTLS: true,
-      ),);
-      conn.registerManagers([
+          ),
+        );
+      await conn.registerManagers([
        PresenceManager(),
        RosterManager(TestingRosterStateManager('', [])),
        DiscoManager([]),
        PingManager(),
        StreamManagementManager(),
      ]);
-      conn.registerFeatureNegotiators(
-        [
+      conn.registerFeatureNegotiators([
        SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
        StreamManagementNegotiator(),
-        ]
-      );
-      conn.getManagerById<StreamManagementManager>(smManager)!
-        .setState(
+      ]);
+      await conn.getManagerById<StreamManagementManager>(smManager)!.setState(
            StreamManagementState(
              10,
              10,
@ -645,9 +691,10 @@ void main() {
            ),
          );

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3));
-      expect(fakeSocket.getState(), 7);
+      await conn.connect(
+        waitUntilLogin: true,
+      );
+      expect(fakeSocket.getState(), 6);
      expect(await conn.getConnectionState(), XmppConnectionState.connected);
      expect(
        conn
@ -658,8 +705,7 @@ void main() {
    });

    test('Test a successful stream resumption', () async {
-      final fakeSocket = StubTCPSocket(
-        [
+      final fakeSocket = StubTCPSocket([
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
          '''
@ -677,7 +723,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -704,35 +750,32 @@ void main() {
          "<resume xmlns='urn:xmpp:sm:3' previd='id-1' h='10' />",
          "<resumed xmlns='urn:xmpp:sm:3' h='id-1' h='12' />",
        ),
-        ]
-      );
+      ]);

-      final XmppConnection conn = XmppConnection(
+      final conn = XmppConnection(
        TestingReconnectionPolicy(),
        AlwaysConnectedConnectivityManager(),
        fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+      )..setConnectionSettings(
+          ConnectionSettings(
            jid: JID.fromString('polynomdivision@test.server'),
            password: 'aaaa',
            useDirectTLS: true,
-      ),);
-      conn.registerManagers([
+          ),
+        );
+      await conn.registerManagers([
        PresenceManager(),
        RosterManager(TestingRosterStateManager('', [])),
        DiscoManager([]),
        PingManager(),
        StreamManagementManager(),
      ]);
-      conn.registerFeatureNegotiators(
-        [
+      conn.registerFeatureNegotiators([
        SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
        StreamManagementNegotiator(),
-        ]
-      );
-      conn.getManagerById<StreamManagementManager>(smManager)!
-        .setState(
+      ]);
+      await conn.getManagerById<StreamManagementManager>(smManager)!.setState(
            StreamManagementState(
              10,
              10,
@ -740,14 +783,15 @@ void main() {
            ),
          );

-      await conn.connect(lastResource: 'abc123');
-      await Future.delayed(const Duration(seconds: 3), () async {
-        expect(fakeSocket.getState(), 5);
+      await conn.connect(
+        lastResource: 'abc123',
+        waitUntilLogin: true,
+      );
+      expect(fakeSocket.getState(), 4);
      expect(await conn.getConnectionState(), XmppConnectionState.connected);
      final sm = conn.getManagerById<StreamManagementManager>(smManager)!;
      expect(sm.isStreamManagementEnabled(), true);
      expect(sm.streamResumed, true);
    });
  });
-  });
 }
--- a/packages/moxxmpp/test/xeps/xep_0280_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0280_test.dart
@ -3,9 +3,18 @@ import 'package:test/test.dart';
 import '../helpers/xmpp.dart';

 void main() {
-  test("Test if we're vulnerable against CVE-2020-26547 style vulnerabilities", () async {
+  test("Test if we're vulnerable against CVE-2020-26547 style vulnerabilities",
+      () async {
    final attributes = XmppManagerAttributes(
-      sendStanza: (stanza, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool retransmitted = false, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async {
+      sendStanza: (
+        stanza, {
+        StanzaFromType addFrom = StanzaFromType.full,
+        bool addId = true,
+        bool retransmitted = false,
+        bool awaitable = true,
+        bool encrypted = false,
+        bool forceEncryption = false,
+      }) async {
        // ignore: avoid_print
        print('==> ${stanza.toXml()}');
        return XMLNode(tag: 'iq', attributes: {'type': 'result'});
@ -21,15 +30,27 @@ void main() {
      isFeatureSupported: (_) => false,
      getFullJID: () => JID.fromString('bob@xmpp.example/uwu'),
      getSocket: () => StubTCPSocket([]),
-      getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket([])),
+      getConnection: () => XmppConnection(
+        TestingReconnectionPolicy(),
+        AlwaysConnectedConnectivityManager(),
+        StubTCPSocket([]),
+      ),
      getNegotiatorById: getNegotiatorNullStub,
    );
-    final manager = CarbonsManager();
-    manager.register(attributes);
+    final manager = CarbonsManager()..register(attributes);
    await manager.enableCarbons();

-    expect(manager.isCarbonValid(JID.fromString('mallory@evil.example')), false);
-    expect(manager.isCarbonValid(JID.fromString('bob@xmpp.example')), true);
-    expect(manager.isCarbonValid(JID.fromString('bob@xmpp.example/abc')), false);
+    expect(
+      manager.isCarbonValid(JID.fromString('mallory@evil.example')),
+      false,
+    );
+    expect(
+      manager.isCarbonValid(JID.fromString('bob@xmpp.example')),
+      true,
+    );
+    expect(
+      manager.isCarbonValid(JID.fromString('bob@xmpp.example/abc')),
+      false,
+    );
  });
 }
--- a/packages/moxxmpp/test/xeps/xep_0352_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0352_test.dart
@ -31,10 +31,19 @@ void main() {
  group('Test the XEP-0352 implementation', () {
    test('Test setting the CSI state when CSI is unsupported', () {
      var nonzaSent = false;
-      final csi = CSIManager();
-      csi.register(
+      CSIManager()
+        ..register(
          XmppManagerAttributes(
-          sendStanza: (_, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool retransmitted = false, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async => XMLNode(tag: 'hallo'),
+            sendStanza: (
+              _, {
+              StanzaFromType addFrom = StanzaFromType.full,
+              bool addId = true,
+              bool retransmitted = false,
+              bool awaitable = true,
+              bool encrypted = false,
+              bool forceEncryption = false,
+            }) async =>
+                XMLNode(tag: 'hallo'),
            sendEvent: (event) {},
            sendNonza: (nonza) {
              nonzaSent = true;
@ -49,23 +58,39 @@ void main() {
            isFeatureSupported: (_) => false,
            getFullJID: () => JID.fromString('some.user@example.server/aaaaa'),
            getSocket: () => StubTCPSocket([]),
-          getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket([])),
+            getConnection: () => XmppConnection(
+              TestingReconnectionPolicy(),
+              AlwaysConnectedConnectivityManager(),
+              StubTCPSocket([]),
            ),
-      );
-
-      csi.setActive();
-      csi.setInactive();
+          ),
+        )
+        ..setActive()
+        ..setInactive();

      expect(nonzaSent, false, reason: 'Expected that no nonza is sent');
    });
    test('Test setting the CSI state when CSI is supported', () {
-      final csi = CSIManager();
-      csi.register(
+      CSIManager()
+        ..register(
          XmppManagerAttributes(
-          sendStanza: (_, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool retransmitted = false, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async => XMLNode(tag: 'hallo'),
+            sendStanza: (
+              _, {
+              StanzaFromType addFrom = StanzaFromType.full,
+              bool addId = true,
+              bool retransmitted = false,
+              bool awaitable = true,
+              bool encrypted = false,
+              bool forceEncryption = false,
+            }) async =>
+                XMLNode(tag: 'hallo'),
            sendEvent: (event) {},
            sendNonza: (nonza) {
-            expect(nonza.attributes['xmlns'] == csiXmlns, true, reason: "Expected only nonzas with XMLNS '$csiXmlns'");
+              expect(
+                nonza.attributes['xmlns'] == csiXmlns,
+                true,
+                reason: "Expected only nonzas with XMLNS '$csiXmlns'",
+              );
            },
            getConnectionSettings: () => ConnectionSettings(
              jid: JID.fromString('some.user@example.server'),
@ -77,12 +102,15 @@ void main() {
            isFeatureSupported: (_) => false,
            getFullJID: () => JID.fromString('some.user@example.server/aaaaa'),
            getSocket: () => StubTCPSocket([]),
-          getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket([])),
+            getConnection: () => XmppConnection(
+              TestingReconnectionPolicy(),
+              AlwaysConnectedConnectivityManager(),
+              StubTCPSocket([]),
            ),
-      );
-
-      csi.setActive();
-      csi.setInactive();
+          ),
+        )
+        ..setActive()
+        ..setInactive();
    });
  });
 }
--- a/packages/moxxmpp/test/xeps/xep_0363_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0363_test.dart
@ -29,26 +29,20 @@ void main() {
        'Cookie': 'foo=bar; user=romeo',
        'X-Tracking': 'Base64String=='
      };
-      expect(
-        prepareHeaders(headers),
-        {
+      expect(prepareHeaders(headers), {
        'Authorization': 'Basic Base64String==',
        'Cookie': 'foo=bar; user=romeo',
-        }
-      );
+      });
    });
    test('remove newlines', () {
      final headers = {
        'Authorization': '\n\nBasic Base64String==\n\n',
        '\nCookie\r\n': 'foo=bar; user=romeo',
      };
-      expect(
-        prepareHeaders(headers),
-        {
+      expect(prepareHeaders(headers), {
        'Authorization': 'Basic Base64String==',
        'Cookie': 'foo=bar; user=romeo',
-        }
-      );
+      });
    });
  });
 }
--- a/packages/moxxmpp/test/xeps/xep_0447.dart
+++ b/packages/moxxmpp/test/xeps/xep_0447.dart
@ -27,7 +27,13 @@ void main() {
      '''),
    );

-    expect(sfs.metadata.hashes['sha3-256'], '2XarmwTlNxDAMkvymloX3S5+VbylNrJt/l5QyPa+YoU=');
-    expect(sfs.metadata.hashes['id-blake2b256'], '2AfMGH8O7UNPTvUVAM9aK13mpCY=');
+    expect(
+      sfs.metadata.hashes['sha3-256'],
+      '2XarmwTlNxDAMkvymloX3S5+VbylNrJt/l5QyPa+YoU=',
+    );
+    expect(
+      sfs.metadata.hashes['id-blake2b256'],
+      '2AfMGH8O7UNPTvUVAM9aK13mpCY=',
+    );
  });
 }
--- a/packages/moxxmpp/test/xeps/xep_0449_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0449_test.dart
@ -1,5 +1,5 @@
-import 'package:test/test.dart';
 import 'package:moxxmpp/moxxmpp.dart';
+import 'package:test/test.dart';

 void main() {
  test('Test parsing a large sticker pack', () {
--- a/packages/moxxmpp/test/xeps/xep_0461_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0461_test.dart
@ -10,15 +10,18 @@ void main() {
  });

  test('Test building a multiline quote', () {
-    final quote = QuoteData.fromBodies('Hallo Welt\nHallo Erde', 'How are you?');
+    final quote = QuoteData.fromBodies(
+      'Hallo Welt\nHallo Erde',
+      'How are you?',
+    );

    expect(quote.body, '> Hallo Welt\n> Hallo Erde\nHow are you?');
    expect(quote.fallbackLength, 26);
  });

  test('Applying a singleline quote', () {
-    final body = '> Hallo Welt\nHello right back!';
-    final reply = ReplyData(
+    const body = '> Hallo Welt\nHello right back!';
+    const reply = ReplyData(
      to: '',
      id: '',
      start: 0,
@ -30,8 +33,8 @@ void main() {
  });

  test('Applying a multiline quote', () {
-    final body = "> Hallo Welt\n> How are you?\nI'm fine.\nThank you!";
-    final reply = ReplyData(
+    const body = "> Hallo Welt\n> How are you?\nI'm fine.\nThank you!";
+    const reply = ReplyData(
      to: '',
      id: '',
      start: 0,
--- a/packages/moxxmpp/test/xmlstreambuffer_test.dart
+++ b/packages/moxxmpp/test/xmlstreambuffer_test.dart
@ -10,23 +10,21 @@ void main() {
    final buffer = XmlStreamBuffer();
    final controller = StreamController<String>();

-    controller
-      .stream
-      .transform(buffer)
-      .forEach((node) {
+    unawaited(
+      controller.stream.transform(buffer).forEach((node) {
        if (node.tag == 'childa') {
          childa = true;
        } else if (node.tag == 'childb') {
          childb = true;
        }
-      });
+      }),
+    );
    controller.add('<childa /><childb />');

-    await Future.delayed(const Duration(seconds: 2), () {
+    await Future<void>.delayed(const Duration(seconds: 2));
    expect(childa, true);
    expect(childb, true);
  });
-  });
  test('Test broken up Xml data', () async {
    var childa = false;
    var childb = false;
@ -34,24 +32,23 @@ void main() {
    final buffer = XmlStreamBuffer();
    final controller = StreamController<String>();

-    controller
-      .stream
-      .transform(buffer)
-      .forEach((node) {
+    unawaited(
+      controller.stream.transform(buffer).forEach((node) {
        if (node.tag == 'childa') {
          childa = true;
        } else if (node.tag == 'childb') {
          childb = true;
        }
-      });
-    controller.add('<childa');
-    controller.add(' /><childb />');
+      }),
+    );
+    controller
+      ..add('<childa')
+      ..add(' /><childb />');

-    await Future.delayed(const Duration(seconds: 2), () {
+    await Future<void>.delayed(const Duration(seconds: 2));
    expect(childa, true);
    expect(childb, true);
  });
-  });

  test('Test closing the stream', () async {
    var childa = false;
@ -60,23 +57,22 @@ void main() {
    final buffer = XmlStreamBuffer();
    final controller = StreamController<String>();

-    controller
-      .stream
-      .transform(buffer)
-      .forEach((node) {
+    unawaited(
+      controller.stream.transform(buffer).forEach((node) {
        if (node.tag == 'childa') {
          childa = true;
        } else if (node.tag == 'childb') {
          childb = true;
        }
-      });
-    controller.add('<childa');
-    controller.add(' /><childb />');
-    controller.add('</stream:stream>');
+      }),
+    );
+    controller
+      ..add('<childa')
+      ..add(' /><childb />')
+      ..add('</stream:stream>');

-    await Future.delayed(const Duration(seconds: 2), () {
+    await Future<void>.delayed(const Duration(seconds: 2));
    expect(childa, true);
    expect(childb, true);
  });
-  });
 }
--- a/packages/moxxmpp/test/xmpp_test.dart
+++ b/packages/moxxmpp/test/xmpp_test.dart
@ -5,11 +5,25 @@ import 'helpers/logging.dart';
 import 'helpers/xmpp.dart';

 /// Returns true if the roster manager triggeres an event for a given stanza
-Future<bool> testRosterManager(String bareJid, String resource, String stanzaString) async {
+Future<bool> testRosterManager(
+  String bareJid,
+  String resource,
+  String stanzaString,
+) async {
  var eventTriggered = false;
-  final roster = RosterManager(TestingRosterStateManager('', []));
-  roster.register(XmppManagerAttributes(
-      sendStanza: (_, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool retransmitted = false, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async => XMLNode(tag: 'hallo'),
+  final roster = RosterManager(TestingRosterStateManager('', []))
+    ..register(
+      XmppManagerAttributes(
+        sendStanza: (
+          _, {
+          StanzaFromType addFrom = StanzaFromType.full,
+          bool addId = true,
+          bool retransmitted = false,
+          bool awaitable = true,
+          bool encrypted = false,
+          bool forceEncryption = false,
+        }) async =>
+            XMLNode(tag: 'hallo'),
        sendEvent: (event) {
          eventTriggered = true;
        },
@ -24,12 +38,27 @@ Future<bool> testRosterManager(String bareJid, String resource, String stanzaStr
        isFeatureSupported: (_) => false,
        getFullJID: () => JID.fromString('$bareJid/$resource'),
        getSocket: () => StubTCPSocket([]),
-      getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket([])),
-  ),);
+        getConnection: () => XmppConnection(
+          TestingReconnectionPolicy(),
+          AlwaysConnectedConnectivityManager(),
+          StubTCPSocket([]),
+        ),
+      ),
+    );

  final stanza = Stanza.fromXMLNode(XMLNode.fromString(stanzaString));
  for (final handler in roster.getIncomingStanzaHandlers()) {
-    if (handler.matches(stanza)) await handler.callback(stanza, StanzaHandlerData(false, false, null, stanza));
+    if (handler.matches(stanza)) {
+      await handler.callback(
+        stanza,
+        StanzaHandlerData(
+          false,
+          false,
+          null,
+          stanza,
+        ),
+      );
+    }
  }

  return eventTriggered;
@ -58,7 +87,7 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />'
+          '<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
        ),
        StringExpectation(
          "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
@ -86,48 +115,25 @@ void main() {
          '<iq xmlns="jabber:client" type="result" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>polynomdivision@test.server/MU29eEZn</jid></bind></iq>',
          ignoreId: true,
        ),
-          /*
-          Expectation(
-            XMLNode.xmlns(
-              tag: 'presence',
-              xmlns: 'jabber:client',
-              attributes: { 'from': 'polynomdivision@test.server/MU29eEZn' },
-              children: [
-                XMLNode(
-                  tag: 'show',
-                  text: 'chat',
+        StanzaExpectation(
+          "<enable xmlns='urn:xmpp:sm:3' resume='true' />",
+          "<enabled xmlns='urn:xmpp:sm:3' id='some-long-sm-id' resume='true'/>",
        ),
-                XMLNode.xmlns(
-                  tag: 'c',
-                  xmlns: 'http://jabber.org/protocol/caps',
-                  attributes: {
-                    // TODO: Somehow make the test ignore this attribute
-                    'ver': 'QRTBC5cg/oYd+UOTYazSQR4zb/I=',
-                    'node': 'http://moxxmpp.example',
-                    'hash': 'sha-1'
-                  },
-                )
-              ],
-            ),
-            XMLNode(
-              tag: 'presence',
-            ),
-          ),
-          */
      ],
    );
-      // TODO: This test is broken since we query the server and enable carbons
-      final XmppConnection conn = XmppConnection(
+    // TODO(Unknown): This test is broken since we query the server and enable carbons
+    final conn = XmppConnection(
      TestingReconnectionPolicy(),
      AlwaysConnectedConnectivityManager(),
      fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+    )..setConnectionSettings(
+        ConnectionSettings(
          jid: JID.fromString('polynomdivision@test.server'),
          password: 'aaaa',
          useDirectTLS: true,
-      ),);
-      conn.registerManagers([
+        ),
+      );
+    await conn.registerManagers([
      PresenceManager(),
      RosterManager(TestingRosterStateManager('', [])),
      DiscoManager([]),
@ -135,20 +141,18 @@ void main() {
      StreamManagementManager(),
      EntityCapabilitiesManager('http://moxxmpp.example'),
    ]);
-      conn.registerFeatureNegotiators(
-        [
+    conn.registerFeatureNegotiators([
      SaslPlainNegotiator(),
      SaslScramNegotiator(10, '', '', ScramHashType.sha512),
      ResourceBindingNegotiator(),
      StreamManagementNegotiator(),
-        ]
-      );
+    ]);

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3), () {
+    await conn.connect(
+      waitUntilLogin: true,
+    );
    expect(fakeSocket.getState(), /*6*/ 5);
  });
-  });

  test('Test a failed SASL auth', () async {
    final fakeSocket = StubTCPSocket(
@ -170,22 +174,23 @@ void main() {
        ),
        StringExpectation(
          "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            '<failure xmlns="urn:ietf:params:xml:ns:xmpp-sasl"><not-authorized /></failure>'
+          '<failure xmlns="urn:ietf:params:xml:ns:xmpp-sasl"><not-authorized /></failure>',
        ),
      ],
    );
    var receivedEvent = false;
-      final XmppConnection conn = XmppConnection(
+    final conn = XmppConnection(
      TestingReconnectionPolicy(),
      AlwaysConnectedConnectivityManager(),
      fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+    )..setConnectionSettings(
+        ConnectionSettings(
          jid: JID.fromString('polynomdivision@test.server'),
          password: 'aaaa',
          useDirectTLS: true,
-      ),);
-      conn.registerManagers([
+        ),
+      );
+    await conn.registerManagers([
      PresenceManager(),
      RosterManager(TestingRosterStateManager('', [])),
      DiscoManager([]),
@ -193,20 +198,21 @@ void main() {
      EntityCapabilitiesManager('http://moxxmpp.example'),
    ]);
    conn.registerFeatureNegotiators([
-        SaslPlainNegotiator()
+      SaslPlainNegotiator(),
    ]);

    conn.asBroadcastStream().listen((event) {
-        if (event is AuthenticationFailedEvent && event.saslError == 'not-authorized') {
+      if (event is AuthenticationFailedEvent &&
+          event.saslError == 'not-authorized') {
        receivedEvent = true;
      }
    });

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3), () {
+    await conn.connect(
+      waitUntilLogin: true,
+    );
    expect(receivedEvent, true);
  });
-  });

  test('Test another failed SASL auth', () async {
    final fakeSocket = StubTCPSocket(
@ -233,94 +239,55 @@ void main() {
      ],
    );
    var receivedEvent = false;
-      final XmppConnection conn = XmppConnection(
+    final conn = XmppConnection(
      TestingReconnectionPolicy(),
      AlwaysConnectedConnectivityManager(),
      fakeSocket,
-      );
-      conn.setConnectionSettings(ConnectionSettings(
+    )..setConnectionSettings(
+        ConnectionSettings(
          jid: JID.fromString('polynomdivision@test.server'),
          password: 'aaaa',
          useDirectTLS: true,
-      ),);
-      conn.registerManagers([
+        ),
+      );
+    await conn.registerManagers([
      PresenceManager(),
      RosterManager(TestingRosterStateManager('', [])),
      DiscoManager([]),
      PingManager(),
      EntityCapabilitiesManager('http://moxxmpp.example'),
    ]);
-      conn.registerFeatureNegotiators([
-        SaslPlainNegotiator()
-      ]);
+    conn.registerFeatureNegotiators([SaslPlainNegotiator()]);

    conn.asBroadcastStream().listen((event) {
-          if (event is AuthenticationFailedEvent && event.saslError == 'mechanism-too-weak') {
+      if (event is AuthenticationFailedEvent &&
+          event.saslError == 'mechanism-too-weak') {
        receivedEvent = true;
      }
    });

-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3), () {
+    await conn.connect(
+      waitUntilLogin: true,
+    );
    expect(receivedEvent, true);
  });
-  });
-
-  /*test('Test choosing SCRAM-SHA-1', () async {
-      final fakeSocket = StubTCPSocket(
-        play: [
-          StringExpectation(
-            "<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' xml:lang='en'>",
-            '''
-<stream:stream
-    xmlns="jabber:client"
-    version="1.0"
-    xmlns:stream="http://etherx.jabber.org/streams"
-    from="test.server"
-    xml:lang="en">
-  <stream:features xmlns="http://etherx.jabber.org/streams">
-    <mechanisms xmlns="urn:ietf:params:xml:ns:xmpp-sasl">
-      <mechanism>PLAIN</mechanism>
-      <mechanism>SCRAM-SHA-1</mechanism>
-    </mechanisms>
-  </stream:features>''',
-          ),
-          // TODO(Unknown): This test is currently broken
-          StringExpectation(
-            "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='SCRAM-SHA-1'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
-            "..."
-          )
-        ],
-      );
-      final XmppConnection conn = XmppConnection(TestingReconnectionPolicy(), fakeSocket);
-      conn.setConnectionSettings(ConnectionSettings(
-        jid: JID.fromString('polynomdivision@test.server'),
-        password: 'aaaa',
-        useDirectTLS: true,
-      ),);
-      conn.registerManagers([
-        PresenceManager('http://moxxmpp.example'),
-        RosterManager(TestingRosterStateManager('', [])),
-        DiscoManager(),
-        PingManager(),
-      ]);
-      conn.registerFeatureNegotiators([
-        SaslPlainNegotiator(),
-        SaslScramNegotiator(10, '', '', ScramHashType.sha1),
-      ]);
-
-      await conn.connect();
-      await Future.delayed(const Duration(seconds: 3), () {
-          expect(fakeSocket.getState(), 2);
-      });
-  });*/

  group('Test roster pushes', () {
    test('Test for a CVE-2015-8688 style vulnerability', () async {
      var eventTriggered = false;
-          final roster = RosterManager(TestingRosterStateManager('', []));
-          roster.register(XmppManagerAttributes(
-              sendStanza: (_, { StanzaFromType addFrom = StanzaFromType.full, bool addId = true, bool retransmitted = false, bool awaitable = true, bool encrypted = false, bool forceEncryption = false, }) async => XMLNode(tag: 'hallo'),
+      final roster = RosterManager(TestingRosterStateManager('', []))
+        ..register(
+          XmppManagerAttributes(
+            sendStanza: (
+              _, {
+              StanzaFromType addFrom = StanzaFromType.full,
+              bool addId = true,
+              bool retransmitted = false,
+              bool awaitable = true,
+              bool encrypted = false,
+              bool forceEncryption = false,
+            }) async =>
+                XMLNode(tag: 'hallo'),
            sendEvent: (event) {
              eventTriggered = true;
            },
@ -335,29 +302,80 @@ void main() {
            isFeatureSupported: (_) => false,
            getFullJID: () => JID.fromString('some.user@example.server/aaaaa'),
            getSocket: () => StubTCPSocket([]),
-              getConnection: () => XmppConnection(TestingReconnectionPolicy(), AlwaysConnectedConnectivityManager(), StubTCPSocket([])),
-          ),);
+            getConnection: () => XmppConnection(
+              TestingReconnectionPolicy(),
+              AlwaysConnectedConnectivityManager(),
+              StubTCPSocket([]),
+            ),
+          ),
+        );

      // NOTE: Based on https://gultsch.de/gajim_roster_push_and_message_interception.html
      // NOTE: Added a from attribute as a server would add it itself.
-          final maliciousStanza = Stanza.fromXMLNode(XMLNode.fromString("<iq type=\"set\" from=\"eve@siacs.eu/bbbbb\" to=\"some.user@example.server/aaaaa\"><query xmlns='jabber:iq:roster'><item subscription=\"both\" jid=\"eve@siacs.eu\" name=\"Bob\" /></query></iq>"));
+      final maliciousStanza = Stanza.fromXMLNode(
+        XMLNode.fromString(
+          "<iq type=\"set\" from=\"eve@siacs.eu/bbbbb\" to=\"some.user@example.server/aaaaa\"><query xmlns='jabber:iq:roster'><item subscription=\"both\" jid=\"eve@siacs.eu\" name=\"Bob\" /></query></iq>",
+        ),
+      );

      for (final handler in roster.getIncomingStanzaHandlers()) {
-            if (handler.matches(maliciousStanza)) await handler.callback(maliciousStanza, StanzaHandlerData(false, false, null, maliciousStanza));
+        if (handler.matches(maliciousStanza)) {
+          await handler.callback(
+            maliciousStanza,
+            StanzaHandlerData(
+              false,
+              false,
+              null,
+              maliciousStanza,
+            ),
+          );
+        }
      }

-          expect(eventTriggered, false, reason: 'Was able to inject a malicious roster push');
+      expect(
+        eventTriggered,
+        false,
+        reason: 'Was able to inject a malicious roster push',
+      );
    });
    test('The manager should accept pushes from our bare jid', () async {
-          final result = await testRosterManager('test.user@server.example', 'aaaaa', "<iq from='test.user@server.example' type='result' id='82c2aa1e-cac3-4f62-9e1f-bbe6b057daf3' to='test.user@server.example/aaaaa' xmlns='jabber:client'><query ver='64' xmlns='jabber:iq:roster'><item jid='some.other.user@server.example' subscription='to' /></query></iq>");
-          expect(result, true, reason: 'Roster pushes from our bare JID should be accepted');
+      final result = await testRosterManager(
+        'test.user@server.example',
+        'aaaaa',
+        "<iq from='test.user@server.example' type='result' id='82c2aa1e-cac3-4f62-9e1f-bbe6b057daf3' to='test.user@server.example/aaaaa' xmlns='jabber:client'><query ver='64' xmlns='jabber:iq:roster'><item jid='some.other.user@server.example' subscription='to' /></query></iq>",
+      );
+      expect(
+        result,
+        true,
+        reason: 'Roster pushes from our bare JID should be accepted',
+      );
    });
-      test('The manager should accept pushes from a jid that, if the resource is stripped, is our bare jid', () async {
-          final result1 = await testRosterManager('test.user@server.example', 'aaaaa', "<iq from='test.user@server.example/aaaaa' type='result' id='82c2aa1e-cac3-4f62-9e1f-bbe6b057daf3' to='test.user@server.example/aaaaa' xmlns='jabber:client'><query ver='64' xmlns='jabber:iq:roster'><item jid='some.other.user@server.example' subscription='to' /></query></iq>");
-          expect(result1, true, reason: 'Roster pushes should be accepted if the bare JIDs are the same');
+    test(
+        'The manager should accept pushes from a jid that, if the resource is stripped, is our bare jid',
+        () async {
+      final result1 = await testRosterManager(
+        'test.user@server.example',
+        'aaaaa',
+        "<iq from='test.user@server.example/aaaaa' type='result' id='82c2aa1e-cac3-4f62-9e1f-bbe6b057daf3' to='test.user@server.example/aaaaa' xmlns='jabber:client'><query ver='64' xmlns='jabber:iq:roster'><item jid='some.other.user@server.example' subscription='to' /></query></iq>",
+      );
+      expect(
+        result1,
+        true,
+        reason:
+            'Roster pushes should be accepted if the bare JIDs are the same',
+      );

-          final result2 = await testRosterManager('test.user@server.example', 'aaaaa', "<iq from='test.user@server.example/bbbbb' type='result' id='82c2aa1e-cac3-4f62-9e1f-bbe6b057daf3' to='test.user@server.example/aaaaa' xmlns='jabber:client'><query ver='64' xmlns='jabber:iq:roster'><item jid='some.other.user@server.example' subscription='to' /></query></iq>");
-          expect(result2, true, reason: 'Roster pushes should be accepted if the bare JIDs are the same');
+      final result2 = await testRosterManager(
+        'test.user@server.example',
+        'aaaaa',
+        "<iq from='test.user@server.example/bbbbb' type='result' id='82c2aa1e-cac3-4f62-9e1f-bbe6b057daf3' to='test.user@server.example/aaaaa' xmlns='jabber:client'><query ver='64' xmlns='jabber:iq:roster'><item jid='some.other.user@server.example' subscription='to' /></query></iq>",
+      );
+      expect(
+        result2,
+        true,
+        reason:
+            'Roster pushes should be accepted if the bare JIDs are the same',
+      );
    });
  });

@ -387,19 +405,18 @@ void main() {
      AlwaysConnectedConnectivityManager(),
      fakeSocket,
    );
-      conn.registerManagers([
+    await conn.registerManagers([
      PresenceManager(),
      RosterManager(TestingRosterStateManager('', [])),
      DiscoManager([]),
      PingManager(),
    ]);
-      conn.registerFeatureNegotiators(
-        [
+    conn
+      ..registerFeatureNegotiators([
        // SaslPlainNegotiator(),
        ResourceBindingNegotiator(),
-        ]
-      );
-      conn.setConnectionSettings(
+      ])
+      ..setConnectionSettings(
        ConnectionSettings(
          jid: JID.fromString('testuser@example.org'),
          password: 'abc123',
@ -411,6 +428,9 @@ void main() {
      waitUntilLogin: true,
    );

-      expect(result.isType<NoMatchingAuthenticationMechanismAvailableError>(), true);
+    expect(
+      result.isType<NoMatchingAuthenticationMechanismAvailableError>(),
+      true,
+    );
  });
 }
Author	SHA1	Message	Date
Alexander "PapaTutuWawa	e1e492832e	chore(tests): Format and lint tests	2023-03-18 16:13:45 +01:00
Alexander "PapaTutuWawa	1950394f7d	fix(meta): Add 'example' as a 'commit target'	2023-03-18 15:00:54 +01:00