Fix broken tests

dart/test/mocks.dart

@@ -131,7 +131,7 @@ typedef EventProcessorFunction = FutureOr<SentryEvent?>
 var fakeEnvelope = SentryEnvelope.fromEvent(
   fakeEvent,
   SdkVersion(name: 'sdk1', version: '1.0.0'),
-  fakeDsn,
+  dsn: fakeDsn,
 );
 
 class MockRateLimiter implements RateLimiter {

dart/test/sentry_envelope_header_test.dart

@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 void main() {
   group('SentryEnvelopeHeader', () {
     test('toJson empty', () {
-      final sut = SentryEnvelopeHeader(null, null, null);
+      final sut = SentryEnvelopeHeader(null, null);
       final expected = <String, dynamic>{};
       expect(sut.toJson(), expected);
     });

dart/test/sentry_envelope_test.dart

@@ -143,14 +143,14 @@ void main() {
       final sut = SentryEnvelope.fromEvent(
         sentryEvent,
         sdkVersion,
-        fakeDsn,
+        dsn: fakeDsn,
         attachments: [attachment],
       );
 
       final expectedEnvelopeItem = SentryEnvelope.fromEvent(
         sentryEvent,
         sdkVersion,
-        fakeDsn,
+        dsn: fakeDsn,
       );
 
       final sutEnvelopeData = <int>[];
@@ -177,7 +177,7 @@ void main() {
           name: 'test',
           version: '1',
         ),
-        fakeDsn,
+        dsn: fakeDsn,
       );
 
       final _ = sut.envelopeStream(SentryOptions()).map((e) => e);

dart/test/sentry_envelope_vm_test.dart

@@ -27,7 +27,7 @@ void main() {
 
       final eventId = SentryId.fromId('3b382f22ee67491f80f7dee18016a7b1');
       final sdkVersion = SdkVersion(name: 'test', version: 'version');
-      final header = SentryEnvelopeHeader(eventId, sdkVersion, null);
+      final header = SentryEnvelopeHeader(eventId, sdkVersion);
       final envelope = SentryEnvelope(header, [attachmentItem]);
 
       final envelopeData = <int>[];
@@ -50,12 +50,9 @@ void main() {
       final sdkVersion = SdkVersion(name: '', version: '');
       final attachment =
           IoSentryAttachment.fromPath('this_path_does_not_exist.txt');
-      final fakeDsn = 'https://[email protected]/1234567';
-
       final envelope = SentryEnvelope.fromEvent(
         event,
         sdkVersion,
-        fakeDsn,
         attachments: [attachment],
       );
 

dart/test/transport/http_transport_test.dart

@@ -2,25 +2,24 @@ import 'dart:convert';
 
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart';
+import 'package:sentry/sentry.dart';
 import 'package:sentry/src/client_reports/discard_reason.dart';
 import 'package:sentry/src/sentry_envelope_header.dart';
 import 'package:sentry/src/sentry_envelope_item_header.dart';
 import 'package:sentry/src/sentry_item_type.dart';
+import 'package:sentry/src/sentry_tracer.dart';
 import 'package:sentry/src/transport/data_category.dart';
+import 'package:sentry/src/transport/http_transport.dart';
 import 'package:sentry/src/transport/rate_limiter.dart';
 import 'package:test/test.dart';
-import 'package:sentry/src/sentry_tracer.dart';
-
-import 'package:sentry/sentry.dart';
-import 'package:sentry/src/transport/http_transport.dart';
 
 import '../mocks.dart';
 import '../mocks/mock_client_report_recorder.dart';
 import '../mocks/mock_hub.dart';
 
 void main() {
   SentryEnvelope givenEnvelope() {
-    final filteredEnvelopeHeader = SentryEnvelopeHeader(SentryId.empty(), null, null);
+    final filteredEnvelopeHeader = SentryEnvelopeHeader(SentryId.empty(), null);
     final filteredItemHeader =
         SentryEnvelopeItemHeader(SentryItemType.event, () async {
       return 2;
@@ -71,8 +70,9 @@ void main() {
 
       final sentryEvent = SentryEvent();
       final fakeDsn = 'https://[email protected]/1234567';
-      final envelope =
-          SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk, fakeDsn);
+      final envelope = SentryEnvelope.fromEvent(
+          sentryEvent, fixture.options.sdk,
+          dsn: fakeDsn);
       await sut.send(envelope);
 
       final envelopeData = <int>[];
@@ -96,8 +96,9 @@ void main() {
 
       final sentryEvent = SentryEvent();
       final fakeDsn = 'https://[email protected]/1234567';
-      final envelope =
-          SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk, fakeDsn);
+      final envelope = SentryEnvelope.fromEvent(
+          sentryEvent, fixture.options.sdk,
+          dsn: fakeDsn);
       final eventId = await sut.send(envelope);
 
       expect(eventId, SentryId.empty());
@@ -121,8 +122,9 @@ void main() {
 
       final sentryEvent = SentryEvent();
       final fakeDsn = 'https://[email protected]/1234567';
-      final envelope =
-          SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk, fakeDsn);
+      final envelope = SentryEnvelope.fromEvent(
+          sentryEvent, fixture.options.sdk,
+          dsn: fakeDsn);
       await sut.send(envelope);
 
       expect(mockRateLimiter.envelopeToFilter?.header.eventId,
@@ -143,8 +145,9 @@ void main() {
 
       final sentryEvent = SentryEvent();
       final fakeDsn = 'https://[email protected]/1234567';
-      final envelope =
-          SentryEnvelope.fromEvent(sentryEvent, fixture.options.sdk, fakeDsn);
+      final envelope = SentryEnvelope.fromEvent(
+          sentryEvent, fixture.options.sdk,
+          dsn: fakeDsn);
       await sut.send(envelope);
 
       expect(mockRateLimiter.errorCode, 200);

flutter/test/file_system_transport_test.dart

@@ -34,7 +34,7 @@ void main() {
         SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
     final fakeDsn = 'https://[email protected]/1234567';
 
-    final envelope = SentryEnvelope.fromEvent(event, sdkVersion, fakeDsn);
+    final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
     final sentryId = await transport.send(envelope);
 
     expect(sentryId, sentryId);
@@ -51,7 +51,7 @@ void main() {
         SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
     final fakeDsn = 'https://[email protected]/1234567';
 
-    final envelope = SentryEnvelope.fromEvent(event, sdkVersion, fakeDsn);
+    final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
     final sentryId = await transport.send(envelope);
 
     expect(SentryId.empty(), sentryId);
@@ -70,7 +70,7 @@ void main() {
     final sdkVersion =
         SdkVersion(name: 'fixture-sdkName', version: 'fixture-sdkVersion');
     final fakeDsn = 'https://[email protected]/1234567';
-    final envelope = SentryEnvelope.fromEvent(event, sdkVersion, fakeDsn);
+    final envelope = SentryEnvelope.fromEvent(event, sdkVersion, dsn: fakeDsn);
     await transport.send(envelope);
 
     final envelopeList = arguments as List;