From 931d24331f8d302a6207f9e357af877cb54adcfb Mon Sep 17 00:00:00 2001 From: Julian Bissekkou Date: Mon, 19 Feb 2024 17:06:48 +0100 Subject: [PATCH] resolve conflicts --- .../integration_test_android_option.dart | 3 +- ...tegration_test_android_option.freezed.dart | 29 ++++++++++++++++--- .../integration_test_ios_option.freezed.dart | 29 ++++++++++++++++--- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/lib/src/integration_test/option/integration_test_android_option.dart b/lib/src/integration_test/option/integration_test_android_option.dart index 064197b..93615ee 100644 --- a/lib/src/integration_test/option/integration_test_android_option.dart +++ b/lib/src/integration_test/option/integration_test_android_option.dart @@ -34,7 +34,8 @@ class IntegrationTestAndroidOption with _$IntegrationTestAndroidOption { ..addOption( IntegrationTestParameter.devicesParam, defaultsTo: "Samsung Galaxy S22-12.0", - ); + ) + ..addOption(IntegrationTestParameter.customIdParam); final argResults = parser.parse(arguments); diff --git a/lib/src/integration_test/option/integration_test_android_option.freezed.dart b/lib/src/integration_test/option/integration_test_android_option.freezed.dart index ce49511..a5313bd 100644 --- a/lib/src/integration_test/option/integration_test_android_option.freezed.dart +++ b/lib/src/integration_test/option/integration_test_android_option.freezed.dart @@ -20,6 +20,7 @@ mixin _$IntegrationTestAndroidOption { String get browserstackAccessKey => throw _privateConstructorUsedError; File get apk => throw _privateConstructorUsedError; File get testSuite => throw _privateConstructorUsedError; + String? get customId => throw _privateConstructorUsedError; List get devices => throw _privateConstructorUsedError; bool get networkLogs => throw _privateConstructorUsedError; bool get deviceLogs => throw _privateConstructorUsedError; @@ -42,6 +43,7 @@ abstract class $IntegrationTestAndroidOptionCopyWith<$Res> { String browserstackAccessKey, File apk, File testSuite, + String? customId, List devices, bool networkLogs, bool deviceLogs}); @@ -65,6 +67,7 @@ class _$IntegrationTestAndroidOptionCopyWithImpl<$Res, Object? browserstackAccessKey = null, Object? apk = null, Object? testSuite = null, + Object? customId = freezed, Object? devices = null, Object? networkLogs = null, Object? deviceLogs = null, @@ -86,6 +89,10 @@ class _$IntegrationTestAndroidOptionCopyWithImpl<$Res, ? _value.testSuite : testSuite // ignore: cast_nullable_to_non_nullable as File, + customId: freezed == customId + ? _value.customId + : customId // ignore: cast_nullable_to_non_nullable + as String?, devices: null == devices ? _value.devices : devices // ignore: cast_nullable_to_non_nullable @@ -116,6 +123,7 @@ abstract class _$$IntegrationTestAndroidOptionImplCopyWith<$Res> String browserstackAccessKey, File apk, File testSuite, + String? customId, List devices, bool networkLogs, bool deviceLogs}); @@ -138,6 +146,7 @@ class __$$IntegrationTestAndroidOptionImplCopyWithImpl<$Res> Object? browserstackAccessKey = null, Object? apk = null, Object? testSuite = null, + Object? customId = freezed, Object? devices = null, Object? networkLogs = null, Object? deviceLogs = null, @@ -159,6 +168,10 @@ class __$$IntegrationTestAndroidOptionImplCopyWithImpl<$Res> ? _value.testSuite : testSuite // ignore: cast_nullable_to_non_nullable as File, + customId: freezed == customId + ? _value.customId + : customId // ignore: cast_nullable_to_non_nullable + as String?, devices: null == devices ? _value._devices : devices // ignore: cast_nullable_to_non_nullable @@ -183,7 +196,8 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { required this.browserstackAccessKey, required this.apk, required this.testSuite, - final List devices = const ["Samsung Galaxy S22-12.0"], + this.customId, + required final List devices, this.networkLogs = true, this.deviceLogs = true}) : _devices = devices, @@ -197,9 +211,10 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { final File apk; @override final File testSuite; + @override + final String? customId; final List _devices; @override - @JsonKey() List get devices { if (_devices is EqualUnmodifiableListView) return _devices; // ignore: implicit_dynamic_type @@ -215,7 +230,7 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { @override String toString() { - return 'IntegrationTestAndroidOption(browserstackUsername: $browserstackUsername, browserstackAccessKey: $browserstackAccessKey, apk: $apk, testSuite: $testSuite, devices: $devices, networkLogs: $networkLogs, deviceLogs: $deviceLogs)'; + return 'IntegrationTestAndroidOption(browserstackUsername: $browserstackUsername, browserstackAccessKey: $browserstackAccessKey, apk: $apk, testSuite: $testSuite, customId: $customId, devices: $devices, networkLogs: $networkLogs, deviceLogs: $deviceLogs)'; } @override @@ -230,6 +245,8 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { (identical(other.apk, apk) || other.apk == apk) && (identical(other.testSuite, testSuite) || other.testSuite == testSuite) && + (identical(other.customId, customId) || + other.customId == customId) && const DeepCollectionEquality().equals(other._devices, _devices) && (identical(other.networkLogs, networkLogs) || other.networkLogs == networkLogs) && @@ -244,6 +261,7 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { browserstackAccessKey, apk, testSuite, + customId, const DeepCollectionEquality().hash(_devices), networkLogs, deviceLogs); @@ -264,7 +282,8 @@ abstract class _IntegrationTestAndroidOption required final String browserstackAccessKey, required final File apk, required final File testSuite, - final List devices, + final String? customId, + required final List devices, final bool networkLogs, final bool deviceLogs}) = _$IntegrationTestAndroidOptionImpl; const _IntegrationTestAndroidOption._() : super._(); @@ -278,6 +297,8 @@ abstract class _IntegrationTestAndroidOption @override File get testSuite; @override + String? get customId; + @override List get devices; @override bool get networkLogs; diff --git a/lib/src/integration_test/option/integration_test_ios_option.freezed.dart b/lib/src/integration_test/option/integration_test_ios_option.freezed.dart index 02c897c..4532dbc 100644 --- a/lib/src/integration_test/option/integration_test_ios_option.freezed.dart +++ b/lib/src/integration_test/option/integration_test_ios_option.freezed.dart @@ -19,6 +19,7 @@ mixin _$IntegrationTestIosOption { String get browserstackUsername => throw _privateConstructorUsedError; String get browserstackAccessKey => throw _privateConstructorUsedError; File get testPackage => throw _privateConstructorUsedError; + String? get customId => throw _privateConstructorUsedError; List get devices => throw _privateConstructorUsedError; bool get networkLogs => throw _privateConstructorUsedError; bool get deviceLogs => throw _privateConstructorUsedError; @@ -38,6 +39,7 @@ abstract class $IntegrationTestIosOptionCopyWith<$Res> { {String browserstackUsername, String browserstackAccessKey, File testPackage, + String? customId, List devices, bool networkLogs, bool deviceLogs}); @@ -60,6 +62,7 @@ class _$IntegrationTestIosOptionCopyWithImpl<$Res, Object? browserstackUsername = null, Object? browserstackAccessKey = null, Object? testPackage = null, + Object? customId = freezed, Object? devices = null, Object? networkLogs = null, Object? deviceLogs = null, @@ -77,6 +80,10 @@ class _$IntegrationTestIosOptionCopyWithImpl<$Res, ? _value.testPackage : testPackage // ignore: cast_nullable_to_non_nullable as File, + customId: freezed == customId + ? _value.customId + : customId // ignore: cast_nullable_to_non_nullable + as String?, devices: null == devices ? _value.devices : devices // ignore: cast_nullable_to_non_nullable @@ -106,6 +113,7 @@ abstract class _$$IntegrationTestIosOptionImplCopyWith<$Res> {String browserstackUsername, String browserstackAccessKey, File testPackage, + String? customId, List devices, bool networkLogs, bool deviceLogs}); @@ -127,6 +135,7 @@ class __$$IntegrationTestIosOptionImplCopyWithImpl<$Res> Object? browserstackUsername = null, Object? browserstackAccessKey = null, Object? testPackage = null, + Object? customId = freezed, Object? devices = null, Object? networkLogs = null, Object? deviceLogs = null, @@ -144,6 +153,10 @@ class __$$IntegrationTestIosOptionImplCopyWithImpl<$Res> ? _value.testPackage : testPackage // ignore: cast_nullable_to_non_nullable as File, + customId: freezed == customId + ? _value.customId + : customId // ignore: cast_nullable_to_non_nullable + as String?, devices: null == devices ? _value._devices : devices // ignore: cast_nullable_to_non_nullable @@ -167,7 +180,8 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { {required this.browserstackUsername, required this.browserstackAccessKey, required this.testPackage, - final List devices = const ["Samsung Galaxy S22-12.0"], + this.customId, + required final List devices, this.networkLogs = true, this.deviceLogs = true}) : _devices = devices, @@ -179,9 +193,10 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { final String browserstackAccessKey; @override final File testPackage; + @override + final String? customId; final List _devices; @override - @JsonKey() List get devices { if (_devices is EqualUnmodifiableListView) return _devices; // ignore: implicit_dynamic_type @@ -197,7 +212,7 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { @override String toString() { - return 'IntegrationTestIosOption(browserstackUsername: $browserstackUsername, browserstackAccessKey: $browserstackAccessKey, testPackage: $testPackage, devices: $devices, networkLogs: $networkLogs, deviceLogs: $deviceLogs)'; + return 'IntegrationTestIosOption(browserstackUsername: $browserstackUsername, browserstackAccessKey: $browserstackAccessKey, testPackage: $testPackage, customId: $customId, devices: $devices, networkLogs: $networkLogs, deviceLogs: $deviceLogs)'; } @override @@ -211,6 +226,8 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { other.browserstackAccessKey == browserstackAccessKey) && (identical(other.testPackage, testPackage) || other.testPackage == testPackage) && + (identical(other.customId, customId) || + other.customId == customId) && const DeepCollectionEquality().equals(other._devices, _devices) && (identical(other.networkLogs, networkLogs) || other.networkLogs == networkLogs) && @@ -224,6 +241,7 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { browserstackUsername, browserstackAccessKey, testPackage, + customId, const DeepCollectionEquality().hash(_devices), networkLogs, deviceLogs); @@ -241,7 +259,8 @@ abstract class _IntegrationTestIosOption extends IntegrationTestIosOption { {required final String browserstackUsername, required final String browserstackAccessKey, required final File testPackage, - final List devices, + final String? customId, + required final List devices, final bool networkLogs, final bool deviceLogs}) = _$IntegrationTestIosOptionImpl; const _IntegrationTestIosOption._() : super._(); @@ -253,6 +272,8 @@ abstract class _IntegrationTestIosOption extends IntegrationTestIosOption { @override File get testPackage; @override + String? get customId; + @override List get devices; @override bool get networkLogs;