From a6db0f3057b304b7fc689d14b7c07ffda076d50e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 13 Jan 2026 11:37:01 -0800 Subject: [PATCH 1/5] [interactive_media_ads] Migrate XCTest to Swift Testing --- packages/interactive_media_ads/CHANGELOG.md | 4 + .../ios/Runner.xcodeproj/project.pbxproj | 6 +- .../RunnerTests/AdDisplayContainerTests.swift | 34 ++-- .../ios/RunnerTests/AdErrorTests.swift | 16 +- .../ios/RunnerTests/AdEventTests.swift | 22 +-- .../RunnerTests/AdLoadingErrorDataTests.swift | 8 +- .../RunnerTests/AdPodInfoProxyAPITests.swift | 34 ++-- .../ios/RunnerTests/AdProxyAPITests.swift | 147 +++++++++++------- .../ios/RunnerTests/AdsLoadedDataTests.swift | 9 +- .../RunnerTests/AdsLoaderDelegateTests.swift | 17 +- .../ios/RunnerTests/AdsLoaderTests.swift | 23 +-- .../RunnerTests/AdsManagerDelegateTests.swift | 25 +-- .../ios/RunnerTests/AdsManagerTests.swift | 41 ++--- .../AdsRenderingSettingsTests.swift | 39 ++--- .../ios/RunnerTests/AdsRequestTests.swift | 89 +++++------ .../CompanionAdProxyApiTests.swift | 24 +-- .../CompanionAdSlotProxyApiTests.swift | 33 ++-- .../CompanionDelegateProxyApiTests.swift | 20 ++- .../RunnerTests/ContentPlayheadTests.swift | 12 +- .../FriendlyObstructionTests.swift | 27 ++-- .../ios/RunnerTests/SettingsTests.swift | 56 +++---- .../RunnerTests/TestProxyApiRegistrar.swift | 1 - .../UniversalAdIDProxyAPITests.swift | 14 +- .../ios/RunnerTests/ViewControllerTests.swift | 17 +- .../example/ios/RunnerTests/ViewTests.swift | 9 +- 25 files changed, 393 insertions(+), 334 deletions(-) diff --git a/packages/interactive_media_ads/CHANGELOG.md b/packages/interactive_media_ads/CHANGELOG.md index ea35c591a101..b9dd25c8dfa5 100644 --- a/packages/interactive_media_ads/CHANGELOG.md +++ b/packages/interactive_media_ads/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates tests to use the Swift Testing framework. + ## 0.3.0+9 * Bumps kotlin_version to 2.3.0. diff --git a/packages/interactive_media_ads/example/ios/Runner.xcodeproj/project.pbxproj b/packages/interactive_media_ads/example/ios/Runner.xcodeproj/project.pbxproj index cf164f39c3e8..5fbf619a658d 100644 --- a/packages/interactive_media_ads/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/interactive_media_ads/example/ios/Runner.xcodeproj/project.pbxproj @@ -594,7 +594,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; }; name = Debug; @@ -610,7 +610,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.packages.interactiveMediaAdsExample.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; }; name = Release; @@ -626,7 +626,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.packages.interactiveMediaAdsExample.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; }; name = Profile; diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift index 9f449805bac9..5373e5a783ea 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift @@ -4,42 +4,43 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdDisplayContainerTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct AdDisplayContainerTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adContainer: UIView(), companionSlots: [], adContainerViewController: UIViewController()) - XCTAssertNotNil(instance) + #expect(instance != nil) } - func testAdContainer() { + @Test func adContainer() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = TestAdDisplayContainer() let value = try? api.pigeonDelegate.adContainer(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adContainer) + #expect(value == instance.adContainer) } - func testCompanionSlots() { + @Test func companionSlots() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = TestAdDisplayContainer() let value = try? api.pigeonDelegate.companionSlots(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.companionSlots) + #expect(value == instance.companionSlots) } - func testSetAdContainerViewController() { + @Test func setAdContainerViewController() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -48,10 +49,10 @@ final class AdDisplayContainerTests: XCTestCase { try? api.pigeonDelegate.setAdContainerViewController( pigeonApi: api, pigeonInstance: instance, controller: controller) - XCTAssertEqual(instance.adContainerViewController, controller) + #expect(instance.adContainerViewController == controller) } - func testGetAdContainerViewController() { + @Test func getAdContainerViewController() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -61,10 +62,10 @@ final class AdDisplayContainerTests: XCTestCase { let value = try? api.pigeonDelegate.getAdContainerViewController( pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, adContainerViewController) + #expect(value == adContainerViewController) } - func testRegisterFriendlyObstruction() { + @Test func registerFriendlyObstruction() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -74,10 +75,10 @@ final class AdDisplayContainerTests: XCTestCase { try? api.pigeonDelegate.registerFriendlyObstruction( pigeonApi: api, pigeonInstance: instance, friendlyObstruction: friendlyObstruction) - XCTAssertEqual(instance.registerFriendlyObstructionArgs, [friendlyObstruction]) + #expect(instance.registerFriendlyObstructionArgs as! [AnyHashable] == [friendlyObstruction]) } - func testUnregisterAllFriendlyObstructions() { + @Test func unregisterAllFriendlyObstructions() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -85,10 +86,11 @@ final class AdDisplayContainerTests: XCTestCase { try? api.pigeonDelegate.unregisterAllFriendlyObstructions( pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.unregisterAllFriendlyObstructionsCalled) + #expect(instance.unregisterAllFriendlyObstructionsCalled) } } +@MainActor class TestAdDisplayContainer: IMAAdDisplayContainer { private var adContainerTestValue = UIView() private var companionSlotsTestValue = [IMACompanionAdSlot(view: UIView())] diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift index d640359df32b..eabb355f29e3 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift @@ -4,12 +4,12 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdErrorTests: XCTestCase { - func testType() { +struct AdErrorTests { + @Test func type() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdError(registrar) @@ -17,10 +17,10 @@ final class AdErrorTests: XCTestCase { let value = try? api.pigeonDelegate.type(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, .loadingFailed) + #expect(value == .loadingFailed) } - func testCode() { + @Test func code() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdError(registrar) @@ -28,10 +28,10 @@ final class AdErrorTests: XCTestCase { let value = try? api.pigeonDelegate.code(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, .apiError) + #expect(value == .apiError) } - func testMessage() { + @Test func message() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdError(registrar) @@ -39,7 +39,7 @@ final class AdErrorTests: XCTestCase { let value = try? api.pigeonDelegate.message(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, "message") + #expect(value == "message") } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift index 14a23d3cfe34..b27b5f899a0c 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift @@ -4,12 +4,12 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdEventTests: XCTestCase { - func testType() { +struct AdEventTests { + @Test func type() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) @@ -17,10 +17,10 @@ final class AdEventTests: XCTestCase { let value = try? api.pigeonDelegate.type(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, .adBreakEnded) + #expect(value == .adBreakEnded) } - func testMessage() { + @Test func message() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) @@ -28,10 +28,10 @@ final class AdEventTests: XCTestCase { let value = try? api.pigeonDelegate.typeString(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, "message") + #expect(value == "message") } - func testAdData() { + @Test func adData() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) @@ -39,18 +39,18 @@ final class AdEventTests: XCTestCase { let value = try? api.pigeonDelegate.adData(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value as! [String: String], ["my": "string"]) + #expect((value as! [String: String]) == ["my": "string"]) } - func testAd() { + @Test func ad() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) let instance = TestAdEvent.customInit() let value = try? api.pigeonDelegate.ad(pigeonApi: api, pigeonInstance: instance) - XCTAssertNotNil(value) - XCTAssertEqual(value, instance.ad) + #expect(value != nil) + #expect(value == instance.ad) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift index 73ff17eaf60c..20afdd257cfb 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift @@ -4,12 +4,12 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdLoadingErrorTests: XCTestCase { - func testAdError() { +struct AdLoadingErrorTests { + @Test func adError() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdLoadingErrorData(registrar) @@ -17,7 +17,7 @@ final class AdLoadingErrorTests: XCTestCase { let value = try? api.pigeonDelegate.adError(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(value is TestAdError) + #expect(value is TestAdError) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift index 42d2fdfb8d15..df01cc7c3a81 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift @@ -4,69 +4,75 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -class AdPodInfoProxyAPITests: XCTestCase { - func testAdPosition() { +struct AdPodInfoProxyAPITests { + @Test + func adPosition() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() let value = try? api.pigeonDelegate.adPosition(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, Int64(instance.adPosition)) + #expect(value == Int64(instance.adPosition)) } - func testMaxDuration() { + @Test + func maxDuration() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() let value = try? api.pigeonDelegate.maxDuration(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.maxDuration) + #expect(value == instance.maxDuration) } - func testPodIndex() { + @Test + func podIndex() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() let value = try? api.pigeonDelegate.podIndex(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, Int64(instance.podIndex)) + #expect(value == Int64(instance.podIndex)) } - func testTimeOffset() { + @Test + func timeOffset() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() let value = try? api.pigeonDelegate.timeOffset(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.timeOffset) + #expect(value == instance.timeOffset) } - func testTotalAds() { + @Test + func totalAds() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() let value = try? api.pigeonDelegate.totalAds(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, Int64(instance.totalAds)) + #expect(value == Int64(instance.totalAds)) } - func testIsBumper() { + @Test + func isBumper() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() let value = try? api.pigeonDelegate.isBumper(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.isBumper) + #expect(value == instance.isBumper) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift index 35b0e10c4a21..8072624d05cc 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift @@ -4,82 +4,91 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -class AdProxyAPITests: XCTestCase { - func testAdId() { +struct AdProxyAPITests { + @Test + func adId() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.adId(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adId) + #expect(value == instance.adId) } - func testAdTitle() { + @Test + func adTitle() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.adTitle(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adTitle) + #expect(value == instance.adTitle) } - func testAdDescription() { + @Test + func adDescription() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.adDescription(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adDescription) + #expect(value == instance.adDescription) } - func testAdSystem() { + @Test + func adSystem() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.adSystem(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adSystem) + #expect(value == instance.adSystem) } - @MainActor func testCompanionAds() { + @MainActor + @Test + func companionAds() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try! api.pigeonDelegate.companionAds(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.companionAds) + #expect(value == instance.companionAds) } - func testContentType() { + @Test + func contentType() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.contentType(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.contentType) + #expect(value == instance.contentType) } - func testDuration() { + @Test + func duration() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.duration(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.duration) + #expect(value == instance.duration) } - func testUiElements() { + @Test + func uiElements() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -89,10 +98,11 @@ class AdProxyAPITests: XCTestCase { instance.testElements = elementArray let value = try? api.pigeonDelegate.uiElements(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, [UIElementType.adAttribution]) + #expect(value == [UIElementType.adAttribution]) } - func testUiElementsWithStrings() { + @Test + func uiElementsWithStrings() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -102,100 +112,111 @@ class AdProxyAPITests: XCTestCase { instance.testElements = elementArray let value = try? api.pigeonDelegate.uiElements(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, [UIElementType.adAttribution]) + #expect(value == [UIElementType.adAttribution]) } - func testWidth() { + @Test + func width() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.width)) + #expect(try #require(value) == Int64(instance.width)) } - func testHeight() { + @Test + func height() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.height)) + #expect(try #require(value) == Int64(instance.height)) } - func testVastMediaWidth() { + @Test + func vastMediaWidth() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.vastMediaWidth(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.vastMediaWidth)) + #expect(try #require(value) == Int64(instance.vastMediaWidth)) } - func testVastMediaHeight() { + @Test + func vastMediaHeight() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.vastMediaHeight(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.vastMediaHeight)) + #expect(try #require(value) == Int64(instance.vastMediaHeight)) } - func testVastMediaBitrate() { + @Test + func vastMediaBitrate() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.vastMediaBitrate(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.vastMediaBitrate)) + #expect(try #require(value) == Int64(instance.vastMediaBitrate)) } - func testIsLinear() { + @Test + func isLinear() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.isLinear(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.isLinear) + #expect(value == instance.isLinear) } - func testIsSkippable() { + @Test + func isSkippable() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.isSkippable(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.isSkippable) + #expect(value == instance.isSkippable) } - func testSkipTimeOffset() { + @Test + func skipTimeOffset() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.skipTimeOffset(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.skipTimeOffset) + #expect(value == instance.skipTimeOffset) } - @MainActor func testAdPodInfo() { + @MainActor + @Test + func adPodInfo() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.adPodInfo(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adPodInfo) + #expect(value == instance.adPodInfo) } - func testTraffickingParameters() { + @Test + func traffickingParameters() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -203,97 +224,107 @@ class AdProxyAPITests: XCTestCase { let value = try? api.pigeonDelegate.traffickingParameters( pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.traffickingParameters) + #expect(value == instance.traffickingParameters) } - func testCreativeID() { + @Test + func creativeID() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.creativeID(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.creativeID) + #expect(value == instance.creativeID) } - func testCreativeAdID() { + @Test + func creativeAdID() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.creativeAdID(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.creativeAdID) + #expect(value == instance.creativeAdID) } - @MainActor func testUniversalAdIDs() { + @MainActor + @Test + func universalAdIDs() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try! api.pigeonDelegate.universalAdIDs(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.universalAdIDs) + #expect(value == instance.universalAdIDs) } - func testAdvertiserName() { + @Test + func advertiserName() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.advertiserName(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.advertiserName) + #expect(value == instance.advertiserName) } - func testSurveyURL() { + @Test + func surveyURL() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.surveyURL(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.surveyURL) + #expect(value == instance.surveyURL) } - func testDealID() { + @Test + func dealID() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.dealID(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.dealID) + #expect(value == instance.dealID) } - func testWrapperAdIDs() { + @Test + func wrapperAdIDs() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.wrapperAdIDs(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.wrapperAdIDs) + #expect(value == instance.wrapperAdIDs) } - func testWrapperCreativeIDs() { + @Test + func wrapperCreativeIDs() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.wrapperCreativeIDs(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.wrapperCreativeIDs) + #expect(value == instance.wrapperCreativeIDs) } - func testWrapperSystems() { + @Test + func wrapperSystems() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() let value = try? api.pigeonDelegate.wrapperSystems(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.wrapperSystems) + #expect(value == instance.wrapperSystems) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoadedDataTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoadedDataTests.swift index 7b97b1d637b4..ffeb4c595459 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoadedDataTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoadedDataTests.swift @@ -4,12 +4,13 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsLoadedDataTests: XCTestCase { - func testAdsManager() { +@MainActor +struct AdsLoadedDataTests { + @Test func adsManager() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoadedData(registrar) @@ -17,7 +18,7 @@ final class AdsLoadedDataTests: XCTestCase { let value = try? api.pigeonDelegate.adsManager(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(value is TestAdsManager) + #expect(value is TestAdsManager) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderDelegateTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderDelegateTests.swift index 8e52d592585c..e1beeb817cb9 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderDelegateTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderDelegateTests.swift @@ -4,21 +4,22 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsLoaderDelegateTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct AdsLoaderDelegateTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoaderDelegate(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - XCTAssertTrue(instance is AdsLoaderDelegateImpl) + #expect(instance is AdsLoaderDelegateImpl) } - func testAdLoaderLoadedWith() { + @Test func adLoaderLoadedWith() { let api = TestAdsLoaderDelegateApi() let instance = AdsLoaderDelegateImpl(api: api) @@ -26,10 +27,10 @@ final class AdsLoaderDelegateTests: XCTestCase { let data = TestAdsLoadedData() instance.adsLoader(adsLoader, adsLoadedWith: data) - XCTAssertEqual(api.adLoaderLoadedWithArgs, [adsLoader, data]) + #expect(api.adLoaderLoadedWithArgs as! [AnyHashable] == [adsLoader, data]) } - func testAdsLoaderFailedWithErrorData() { + @Test func adsLoaderFailedWithErrorData() { let api = TestAdsLoaderDelegateApi() let instance = AdsLoaderDelegateImpl(api: api) @@ -37,7 +38,7 @@ final class AdsLoaderDelegateTests: XCTestCase { let error = TestAdLoadingErrorData.customInit() instance.adsLoader(adsLoader, failedWith: error) - XCTAssertEqual(api.adsLoaderFailedWithErrorDataArgs, [adsLoader, error]) + #expect(api.adsLoaderFailedWithErrorDataArgs as! [AnyHashable] == [adsLoader, error]) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift index 6c7ff33268c2..65de08d0c874 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift @@ -4,12 +4,13 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsLoaderTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct AdsLoaderTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -18,11 +19,11 @@ final class AdsLoaderTests: XCTestCase { let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, settings: settings) - XCTAssertNotNil(instance) - XCTAssertEqual(instance?.settings.ppid, settings.ppid) + #expect(instance != nil) + #expect(instance?.settings.ppid == settings.ppid) } - func testContentComplete() { + @Test func contentComplete() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -30,10 +31,10 @@ final class AdsLoaderTests: XCTestCase { try? api.pigeonDelegate.contentComplete(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.contentCompleteCalled) + #expect(instance.contentCompleteCalled) } - func testRequestAds() { + @Test func requestAds() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -46,10 +47,10 @@ final class AdsLoaderTests: XCTestCase { try? api.pigeonDelegate.requestAds( pigeonApi: api, pigeonInstance: instance, request: request) - XCTAssertIdentical(instance.adsRequested, request) + #expect(instance.adsRequested === request) } - func testSetDelegate() { + @Test func setDelegate() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -60,7 +61,7 @@ final class AdsLoaderTests: XCTestCase { try? api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) - XCTAssertIdentical(instance.delegate, delegate) + #expect(instance.delegate === delegate) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerDelegateTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerDelegateTests.swift index 94b055308958..407b9683c2cd 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerDelegateTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerDelegateTests.swift @@ -4,21 +4,22 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsManagerDelegateTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct AdsManagerDelegateTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManagerDelegate(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - XCTAssertTrue(instance is AdsManagerDelegateImpl) + #expect(instance is AdsManagerDelegateImpl) } - func testDidReceiveAdEvent() { + @Test func didReceiveAdEvent() { let api = TestAdsManagerDelegateApi() let instance = AdsManagerDelegateImpl(api: api) @@ -26,10 +27,10 @@ final class AdsManagerDelegateTests: XCTestCase { let event = TestAdEvent.customInit() instance.adsManager(manager, didReceive: event) - XCTAssertEqual(api.didReceiveAdEventArgs, [manager, event]) + #expect(api.didReceiveAdEventArgs as! [AnyHashable] == [manager, event]) } - func testDidReceiveAdError() { + @Test func didReceiveAdError() { let api = TestAdsManagerDelegateApi() let instance = AdsManagerDelegateImpl(api: api) @@ -37,27 +38,27 @@ final class AdsManagerDelegateTests: XCTestCase { let error = TestAdError.customInit() instance.adsManager(manager, didReceive: error) - XCTAssertEqual(api.didReceiveAdErrorArgs, [manager, error]) + #expect(api.didReceiveAdErrorArgs as! [AnyHashable] == [manager, error]) } - func testDidRequestContentPause() { + @Test func didRequestContentPause() { let api = TestAdsManagerDelegateApi() let instance = AdsManagerDelegateImpl(api: api) let manager = TestAdsManager.customInit() instance.adsManagerDidRequestContentPause(manager) - XCTAssertEqual(api.didRequestContentPauseArgs, [manager]) + #expect(api.didRequestContentPauseArgs as! [AnyHashable] == [manager]) } - func testDidRequestContentResume() { + @Test func didRequestContentResume() { let api = TestAdsManagerDelegateApi() let instance = AdsManagerDelegateImpl(api: api) let manager = TestAdsManager.customInit() instance.adsManagerDidRequestContentResume(manager) - XCTAssertEqual(api.didRequestContentResumeArgs, [manager]) + #expect(api.didRequestContentResumeArgs as! [AnyHashable] == [manager]) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift index 206ccc66994e..ab91c6f0fcb5 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift @@ -4,12 +4,13 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsManagerTests: XCTestCase { - func testSetDelegate() { +@MainActor +struct AdsManagerTests { + @Test func setDelegate() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -20,10 +21,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) - XCTAssertIdentical(instance.delegate, delegate) + #expect(instance.delegate === delegate) } - func testInitialize() { + @Test func initialize() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -33,10 +34,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.initialize( pigeonApi: api, pigeonInstance: instance, adsRenderingSettings: renderingSettings) - XCTAssertEqual(instance.renderingSettings, renderingSettings) + #expect(instance.renderingSettings == renderingSettings) } - func testStart() { + @Test func start() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -44,10 +45,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.start(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.startCalled) + #expect(instance.startCalled) } - func testPause() { + @Test func pause() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -55,10 +56,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.pause(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.pauseCalled) + #expect(instance.pauseCalled) } - func testSkip() { + @Test func skip() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -66,10 +67,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.skip(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.skipCalled) + #expect(instance.skipCalled) } - func testDiscardAdBreak() { + @Test func discardAdBreak() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -77,10 +78,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.discardAdBreak(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.discardAdBreakCalled) + #expect(instance.discardAdBreakCalled) } - func testResume() { + @Test func resume() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -88,10 +89,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.resume(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.resumeCalled) + #expect(instance.resumeCalled) } - func testDestroy() { + @Test func destroy() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -99,10 +100,10 @@ final class AdsManagerTests: XCTestCase { try? api.pigeonDelegate.destroy(pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.destroyCalled) + #expect(instance.destroyCalled) } - func testAdCuePoints() { + @Test func adCuePoints() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -110,7 +111,7 @@ final class AdsManagerTests: XCTestCase { let value = try? api.pigeonDelegate.adCuePoints(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, [2.2, 3.3]) + #expect(value as! [Double] == [2.2, 3.3]) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift index 9cfb4b6b4d98..0e9b4888f9f6 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift @@ -4,22 +4,23 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsRenderingSettingsTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct AdsRenderingSettingsTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api) - XCTAssertTrue(instance != nil) + #expect(instance != nil) } - func testSetMimeTypes() { + @Test func setMimeTypes() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -27,10 +28,10 @@ final class AdsRenderingSettingsTests: XCTestCase { let types = ["myString"] try? api.pigeonDelegate.setMimeTypes(pigeonApi: api, pigeonInstance: instance, types: types) - XCTAssertEqual(instance.mimeTypes, types) + #expect(instance.mimeTypes == types) } - func testSetBitrate() { + @Test func setBitrate() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -39,10 +40,10 @@ final class AdsRenderingSettingsTests: XCTestCase { try? api.pigeonDelegate.setBitrate( pigeonApi: api, pigeonInstance: instance, bitrate: Int64(bitrate)) - XCTAssertEqual(instance.bitrate, bitrate) + #expect(instance.bitrate == bitrate) } - func testSetLoadVideoTimeout() { + @Test func setLoadVideoTimeout() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -51,10 +52,10 @@ final class AdsRenderingSettingsTests: XCTestCase { try? api.pigeonDelegate.setLoadVideoTimeout( pigeonApi: api, pigeonInstance: instance, seconds: seconds) - XCTAssertEqual(instance.loadVideoTimeout, seconds) + #expect(instance.loadVideoTimeout == seconds) } - func testSetPlayAdsAfterTime() { + @Test func setPlayAdsAfterTime() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -63,10 +64,10 @@ final class AdsRenderingSettingsTests: XCTestCase { try? api.pigeonDelegate.setPlayAdsAfterTime( pigeonApi: api, pigeonInstance: instance, seconds: seconds) - XCTAssertEqual(instance.playAdsAfterTime, seconds) + #expect(instance.playAdsAfterTime == seconds) } - func testSetUIElements() { + @Test func setUIElements() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -74,11 +75,11 @@ final class AdsRenderingSettingsTests: XCTestCase { let types = [UIElementType.adAttribution] try? api.pigeonDelegate.setUIElements(pigeonApi: api, pigeonInstance: instance, types: types) - XCTAssertEqual( - instance.uiElements, [IMAUiElementType.elements_AD_ATTRIBUTION.rawValue as NSNumber]) + #expect( + instance.uiElements == [IMAUiElementType.elements_AD_ATTRIBUTION.rawValue as NSNumber]) } - func testSetEnablePreloading() { + @Test func setEnablePreloading() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -87,10 +88,10 @@ final class AdsRenderingSettingsTests: XCTestCase { try? api.pigeonDelegate.setEnablePreloading( pigeonApi: api, pigeonInstance: instance, enable: enable) - XCTAssertTrue(instance.enablePreloading) + #expect(instance.enablePreloading) } - func testSetLinkOpenerPresentingController() { + @Test func setLinkOpenerPresentingController() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) @@ -99,6 +100,6 @@ final class AdsRenderingSettingsTests: XCTestCase { try? api.pigeonDelegate.setLinkOpenerPresentingController( pigeonApi: api, pigeonInstance: instance, controller: controller) - XCTAssertEqual(instance.linkOpenerPresentingController, controller) + #expect(instance.linkOpenerPresentingController == controller) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift index 73f94db072c7..f87c25f58b3d 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift @@ -4,12 +4,13 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdsRequestTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct AdsRequestTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -19,14 +20,14 @@ final class AdsRequestTests: XCTestCase { pigeonApi: api, adTagUrl: "adTag?", adDisplayContainer: container, contentPlayhead: contentPlayhead) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adTagUrl, - "adTag?&request_agent=Flutter-IMA-\(AdsRequestProxyAPIDelegate.pluginVersion)") - XCTAssertIdentical(instance?.adDisplayContainer, container) + #expect(instance != nil) + #expect( + instance?.adTagUrl + == "adTag?&request_agent=Flutter-IMA-\(AdsRequestProxyAPIDelegate.pluginVersion)") + #expect(instance?.adDisplayContainer === container) } - func testPigeonDefaultConstructorDoesNotAddRequestAgentToIncompatibleURLs() { + @Test func pigeonDefaultConstructorDoesNotAddRequestAgentToIncompatibleURLs() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -36,21 +37,17 @@ final class AdsRequestTests: XCTestCase { var instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adTagUrl: "adTag#", adDisplayContainer: container, contentPlayhead: contentPlayhead) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adTagUrl, - "adTag#") + #expect(instance != nil) + #expect(instance?.adTagUrl == "adTag#") instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adTagUrl: "adTag#?", adDisplayContainer: container, contentPlayhead: contentPlayhead) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adTagUrl, - "adTag#?") + #expect(instance != nil) + #expect(instance?.adTagUrl == "adTag#?") } - func testWithAdsResponse() { + @Test func withAdsResponse() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -60,14 +57,12 @@ final class AdsRequestTests: XCTestCase { pigeonApi: api, adsResponse: "response", adDisplayContainer: container, contentPlayhead: contentPlayhead) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adsResponse, - "response") - XCTAssertIdentical(instance?.adDisplayContainer, container) + #expect(instance != nil) + #expect(instance?.adsResponse == "response") + #expect(instance?.adDisplayContainer === container) } - func testGetAdTagUrl() { + @Test func getAdTagUrl() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -80,10 +75,10 @@ final class AdsRequestTests: XCTestCase { let value = try? api.pigeonDelegate.getAdTagUrl(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, adTagUrl) + #expect(value == adTagUrl) } - func testGetAdsResponse() { + @Test func getAdsResponse() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -96,10 +91,10 @@ final class AdsRequestTests: XCTestCase { let value = try? api.pigeonDelegate.getAdsResponse(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, adsResponse) + #expect(value == adsResponse) } - func testGetAdDisplayContainer() { + @Test func getAdDisplayContainer() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -112,10 +107,10 @@ final class AdsRequestTests: XCTestCase { let value = try? api.pigeonDelegate.getAdDisplayContainer( pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, container) + #expect(value == container) } - func testSetAdWillAutoPlay() { + @Test func setAdWillAutoPlay() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -129,10 +124,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setAdWillAutoPlay( pigeonApi: api, pigeonInstance: instance, adWillAutoPlay: adWillAutoPlay) - XCTAssertEqual(instance.adWillAutoPlay, adWillAutoPlay) + #expect(instance.adWillAutoPlay == adWillAutoPlay) } - func testSetAdWillPlayMuted() { + @Test func setAdWillPlayMuted() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -146,10 +141,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setAdWillPlayMuted( pigeonApi: api, pigeonInstance: instance, adWillPlayMuted: adWillPlayMuted) - XCTAssertEqual(instance.adWillPlayMuted, adWillPlayMuted) + #expect(instance.adWillPlayMuted == adWillPlayMuted) } - func testSetContinuousPlayback() { + @Test func setContinuousPlayback() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -163,10 +158,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setContinuousPlayback( pigeonApi: api, pigeonInstance: instance, continuousPlayback: continuousPlayback) - XCTAssertEqual(instance.continuousPlayback, continuousPlayback) + #expect(instance.continuousPlayback == continuousPlayback) } - func testSetContentDuration() { + @Test func setContentDuration() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -180,10 +175,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setContentDuration( pigeonApi: api, pigeonInstance: instance, duration: duration) - XCTAssertEqual(instance.contentDuration, Float(duration)) + #expect(instance.contentDuration == Float(duration)) } - func testSetContentKeywords() { + @Test func setContentKeywords() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -197,10 +192,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setContentKeywords( pigeonApi: api, pigeonInstance: instance, keywords: keywords) - XCTAssertEqual(instance.contentKeywords, keywords) + #expect(instance.contentKeywords == keywords) } - func testSetContentTitle() { + @Test func setContentTitle() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -213,10 +208,10 @@ final class AdsRequestTests: XCTestCase { let title = "hello" try? api.pigeonDelegate.setContentTitle(pigeonApi: api, pigeonInstance: instance, title: title) - XCTAssertEqual(instance.contentTitle, title) + #expect(instance.contentTitle == title) } - func testSetContentURL() { + @Test func setContentURL() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -230,10 +225,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setContentURL( pigeonApi: api, pigeonInstance: instance, contentURL: contentURL) - XCTAssertEqual(instance.contentURL, URL(string: contentURL)) + #expect(instance.contentURL == URL(string: contentURL)) } - func testSetVastLoadTimeout() { + @Test func setVastLoadTimeout() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -247,10 +242,10 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setVastLoadTimeout( pigeonApi: api, pigeonInstance: instance, timeout: timeout) - XCTAssertEqual(instance.vastLoadTimeout, Float(timeout)) + #expect(instance.vastLoadTimeout == Float(timeout)) } - func testSetLiveStreamPrefetchSeconds() { + @Test func setLiveStreamPrefetchSeconds() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -264,6 +259,6 @@ final class AdsRequestTests: XCTestCase { try? api.pigeonDelegate.setLiveStreamPrefetchSeconds( pigeonApi: api, pigeonInstance: instance, seconds: seconds) - XCTAssertEqual(instance.liveStreamPrefetchSeconds, Float(seconds)) + #expect(instance.liveStreamPrefetchSeconds == Float(seconds)) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift index 4f5a15268a73..48d6cd8f6faa 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift @@ -4,49 +4,53 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -class CompanionAdProxyApiTests: XCTestCase { - func testResourceValue() { +struct CompanionAdProxyApiTests { + @Test + func resourceValue() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() let value = try? api.pigeonDelegate.resourceValue(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.resourceValue) + #expect(value == instance.resourceValue) } - func testApiFramework() { + @Test + func apiFramework() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() let value = try? api.pigeonDelegate.apiFramework(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.apiFramework) + #expect(value == instance.apiFramework) } - func testWidth() { + @Test + func width() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() let value = try? api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, Int64(instance.width)) + #expect(value == Int64(instance.width)) } - func testHeight() { + @Test + func height() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() let value = try? api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, Int64(instance.height)) + #expect(value == Int64(instance.height)) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift index adace45f2936..67ddb75d2607 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift @@ -4,46 +4,51 @@ import Flutter import GoogleInteractiveMediaAds +import Testing import UIKit -import XCTest @testable import interactive_media_ads -class CompanionAdSlotProxyApiTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct CompanionAdSlotProxyApiTests { + @Test + func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAdSlot(registrar) let view = UIView() - let instance = try! api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api, view: view) - XCTAssertEqual(instance.view, view) + let instance = try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api, view: view) + #expect(instance.view == view) } - func testSize() { + @Test + func size() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAdSlot(registrar) let view = UIView() let width = 0 let height = 1 - let instance = try! api.pigeonDelegate.size( + let instance = try api.pigeonDelegate.size( pigeonApi: api, view: view, width: Int64(width), height: Int64(height)) - XCTAssertEqual(instance.view, view) - XCTAssertEqual(instance.width, width) - XCTAssertEqual(instance.height, height) + #expect(instance.view == view) + #expect(instance.width == width) + #expect(instance.height == height) } - func testView() { + @Test + func view() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAdSlot(registrar) let instance = IMACompanionAdSlot(view: UIView()) let value = try? api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.view) + #expect(value == instance.view) } - func testSetDelegate() { + @Test + func setDelegate() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAdSlot(registrar) @@ -53,6 +58,6 @@ class CompanionAdSlotProxyApiTests: XCTestCase { try? api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) - XCTAssertIdentical(instance.delegate, delegate) + #expect(instance.delegate === delegate) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift index 635d2603ab23..c761ad20bd58 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift @@ -4,37 +4,41 @@ import Flutter import GoogleInteractiveMediaAds +import Testing import UIKit -import XCTest @testable import interactive_media_ads -class CompanionDelegateProxyApiTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct CompanionDelegateProxyApiTests { + @Test + func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionDelegate(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - XCTAssertNotNil(instance) + #expect(instance != nil) } - func testCompanionAdSlotFilled() { + @Test + func companionAdSlotFilled() { let api = TestCompanionDelegateApi() let instance = CompanionDelegateImpl(api: api) let slot = IMACompanionAdSlot(view: UIView()) let filled = true instance.companionSlot(slot, filled: filled) - XCTAssertEqual(api.companionAdSlotFilledArgs, [slot, filled]) + #expect(api.companionAdSlotFilledArgs == [slot, filled]) } - func testCompanionSlotWasClicked() { + @Test + func companionSlotWasClicked() { let api = TestCompanionDelegateApi() let instance = CompanionDelegateImpl(api: api) let slot = IMACompanionAdSlot(view: UIView()) instance.companionSlotWasClicked(slot) - XCTAssertEqual(api.companionSlotWasClickedArgs, [slot]) + #expect(api.companionSlotWasClickedArgs == [slot]) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift index 48f97e73ac02..f511e0b41f1b 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift @@ -4,22 +4,22 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class ContentPlayheadTests: XCTestCase { - func testPigeonDefaultConstructor() { +struct ContentPlayheadTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAContentPlayhead(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api) - XCTAssertNotNil(instance) + #expect(instance != nil) } - func testSetCurrentTime() { + @Test func setCurrentTime() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAContentPlayhead(registrar) @@ -27,6 +27,6 @@ final class ContentPlayheadTests: XCTestCase { try? api.pigeonDelegate.setCurrentTime( pigeonApi: api, pigeonInstance: instance, timeInterval: 12) - XCTAssertEqual(instance.currentTime, 12) + #expect(instance.currentTime == 12) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift index 42b4cf7b5dc9..5b0c8f912546 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift @@ -4,34 +4,33 @@ import Flutter import GoogleInteractiveMediaAds +import Testing import UIKit -import XCTest @testable import interactive_media_ads -class FriendlyObstructionProxyApiTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct FriendlyObstructionProxyApiTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, view: UIView(), purpose: .mediaControls, detailedReason: "myString") - XCTAssertNotNil(instance) + #expect(instance != nil) } - func testPigeonDefaultConstructorWithUnknownPurpose() { + @Test func pigeonDefaultConstructorWithUnknownPurpose() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) - XCTAssertThrowsError( + #expect(throws: PigeonError.self) { try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, view: UIView(), purpose: .unknown, detailedReason: "myString") - ) { error in - XCTAssertTrue(error is PigeonError) } } - func testView() { + @Test func view() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) @@ -39,10 +38,10 @@ class FriendlyObstructionProxyApiTests: XCTestCase { view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") let value = try? api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.view) + #expect(value == instance.view) } - func testPurpose() { + @Test func purpose() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) @@ -50,10 +49,10 @@ class FriendlyObstructionProxyApiTests: XCTestCase { view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") let value = try? api.pigeonDelegate.purpose(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, FriendlyObstructionPurpose.closeAd) + #expect(value == FriendlyObstructionPurpose.closeAd) } - func testDetailedReason() { + @Test func detailedReason() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) @@ -61,6 +60,6 @@ class FriendlyObstructionProxyApiTests: XCTestCase { view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") let value = try? api.pigeonDelegate.detailedReason(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.detailedReason) + #expect(value == instance.detailedReason) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift index e4a6447defd6..3552c7a169ad 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift @@ -4,20 +4,20 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -class SettingsTests: XCTestCase { - func testPigeonDefaultConstructor() { +struct SettingsTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - XCTAssertNotNil(instance) + #expect(instance != nil) } - func testSetPPID() { + @Test func setPPID() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -25,10 +25,10 @@ class SettingsTests: XCTestCase { let ppid = "myString" try? api.pigeonDelegate.setPPID(pigeonApi: api, pigeonInstance: instance, ppid: ppid) - XCTAssertEqual(instance.ppid, ppid) + #expect(instance.ppid == ppid) } - func testSetLanguage() { + @Test func setLanguage() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -37,10 +37,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setLanguage( pigeonApi: api, pigeonInstance: instance, language: language) - XCTAssertEqual(instance.language, language) + #expect(instance.language == language) } - func testSetMaxRedirects() { + @Test func setMaxRedirects() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -49,10 +49,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setMaxRedirects( pigeonApi: api, pigeonInstance: instance, max: Int64(max)) - XCTAssertEqual(instance.maxRedirects, UInt(max)) + #expect(instance.maxRedirects == UInt(max)) } - func testSetFeatureFlags() { + @Test func setFeatureFlags() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -60,10 +60,10 @@ class SettingsTests: XCTestCase { let flags = ["myString": "myString"] try? api.pigeonDelegate.setFeatureFlags(pigeonApi: api, pigeonInstance: instance, flags: flags) - XCTAssertEqual(instance.featureFlags, flags) + #expect(instance.featureFlags == flags) } - func testSetEnableBackgroundPlayback() { + @Test func setEnableBackgroundPlayback() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -72,10 +72,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setEnableBackgroundPlayback( pigeonApi: api, pigeonInstance: instance, enabled: enabled) - XCTAssertEqual(instance.enableBackgroundPlayback, enabled) + #expect(instance.enableBackgroundPlayback == enabled) } - func testSetAutoPlayAdBreaks() { + @Test func setAutoPlayAdBreaks() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -84,10 +84,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setAutoPlayAdBreaks( pigeonApi: api, pigeonInstance: instance, autoPlay: autoPlay) - XCTAssertEqual(instance.autoPlayAdBreaks, autoPlay) + #expect(instance.autoPlayAdBreaks == autoPlay) } - func testSetDisableNowPlayingInfo() { + @Test func setDisableNowPlayingInfo() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -96,10 +96,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setDisableNowPlayingInfo( pigeonApi: api, pigeonInstance: instance, disable: disable) - XCTAssertEqual(instance.disableNowPlayingInfo, disable) + #expect(instance.disableNowPlayingInfo == disable) } - func testSetPlayerType() { + @Test func setPlayerType() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -107,10 +107,10 @@ class SettingsTests: XCTestCase { let type = "myString" try? api.pigeonDelegate.setPlayerType(pigeonApi: api, pigeonInstance: instance, type: type) - XCTAssertEqual(instance.playerType, type) + #expect(instance.playerType == type) } - func testSetPlayerVersion() { + @Test func setPlayerVersion() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -119,10 +119,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setPlayerVersion( pigeonApi: api, pigeonInstance: instance, version: version) - XCTAssertEqual(instance.playerVersion, version) + #expect(instance.playerVersion == version) } - func testSetSessionID() { + @Test func setSessionID() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -131,10 +131,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setSessionID( pigeonApi: api, pigeonInstance: instance, sessionID: sessionID) - XCTAssertEqual(instance.sessionID, sessionID) + #expect(instance.sessionID == sessionID) } - func testSetSameAppKeyEnabled() { + @Test func setSameAppKeyEnabled() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -143,10 +143,10 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setSameAppKeyEnabled( pigeonApi: api, pigeonInstance: instance, enabled: enabled) - XCTAssertEqual(instance.sameAppKeyEnabled, enabled) + #expect(instance.sameAppKeyEnabled == enabled) } - func testSetEnableDebugMode() { + @Test func setEnableDebugMode() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) @@ -155,6 +155,6 @@ class SettingsTests: XCTestCase { try? api.pigeonDelegate.setEnableDebugMode( pigeonApi: api, pigeonInstance: instance, enable: enable) - XCTAssertEqual(instance.enableDebugMode, enable) + #expect(instance.enableDebugMode == enable) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/TestProxyApiRegistrar.swift b/packages/interactive_media_ads/example/ios/RunnerTests/TestProxyApiRegistrar.swift index ccf5913bf1ca..2b1beb9125e6 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/TestProxyApiRegistrar.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/TestProxyApiRegistrar.swift @@ -3,7 +3,6 @@ // found in the LICENSE file. import Flutter -import XCTest @testable import interactive_media_ads diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift index 45ad6a2f1e36..712be4f901e8 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift @@ -4,29 +4,31 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -class UniversalAdIDProxyAPITests: XCTestCase { - func testAdIDValue() { +struct UniversalAdIDProxyAPITests { + @Test + func adIDValue() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAUniversalAdID(registrar) let instance = TestUniversalAdID.customInit() let value = try? api.pigeonDelegate.adIDValue(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adIDValue) + #expect(value == instance.adIDValue) } - func testAdIDRegistry() { + @Test + func adIDRegistry() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAUniversalAdID(registrar) let instance = TestUniversalAdID.customInit() let value = try? api.pigeonDelegate.adIDRegistry(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adIDRegistry) + #expect(value == instance.adIDRegistry) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift index a5d528647dd5..a9a04a8f0ce0 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift @@ -3,38 +3,39 @@ // found in the LICENSE file. import Flutter -import XCTest +import Testing @testable import interactive_media_ads -final class ViewControllerTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct ViewControllerTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIViewController(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api) - XCTAssertNotNil(instance) + #expect(instance != nil) } - func testView() { + @Test func view() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIViewController(registrar) let instance = UIViewController() let view = try? api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) - XCTAssertNotNil(view) + #expect(view != nil) } - func testViewDidAppear() { + @Test func viewDidAppear() { let api = TestUIViewControllerApi() let instance = ViewControllerImpl(api: api) instance.viewDidAppear(true) - XCTAssertEqual(api.viewDidAppearArgs, [instance, true]) + #expect(api.viewDidAppearArgs as! [AnyHashable] == [instance, true]) } } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift index 561669354fa9..b35b4fe72616 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift @@ -3,18 +3,19 @@ // found in the LICENSE file. import Flutter -import XCTest +import Testing @testable import interactive_media_ads -final class ViewTests: XCTestCase { - func testPigeonDefaultConstructor() { +@MainActor +struct ViewTests { + @Test func pigeonDefaultConstructor() { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIView(registrar) let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api) - XCTAssertNotNil(instance) + #expect(instance != nil) } } From ecc9046b2dff26072c4861339ba2a14cef361f95 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 13 Jan 2026 21:19:35 -0800 Subject: [PATCH 2/5] Passing --- packages/interactive_media_ads/CHANGELOG.md | 4 -- .../RunnerTests/AdDisplayContainerTests.swift | 37 ++++++++----------- .../ios/RunnerTests/AdsManagerTests.swift | 2 +- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/packages/interactive_media_ads/CHANGELOG.md b/packages/interactive_media_ads/CHANGELOG.md index b9dd25c8dfa5..ea35c591a101 100644 --- a/packages/interactive_media_ads/CHANGELOG.md +++ b/packages/interactive_media_ads/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Updates tests to use the Swift Testing framework. - ## 0.3.0+9 * Bumps kotlin_version to 2.3.0. diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift index 5373e5a783ea..259e739c2f31 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift @@ -24,7 +24,8 @@ struct AdDisplayContainerTests { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) let value = try? api.pigeonDelegate.adContainer(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adContainer) @@ -34,7 +35,10 @@ struct AdDisplayContainerTests { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() + let instance = TestAdDisplayContainer( + adContainer: UIView(), + viewController: UIViewController(), + companionSlots: [IMACompanionAdSlot(view: UIView())]) let value = try? api.pigeonDelegate.companionSlots(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.companionSlots) @@ -44,7 +48,8 @@ struct AdDisplayContainerTests { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) let controller = UIViewController() try? api.pigeonDelegate.setAdContainerViewController( pigeonApi: api, pigeonInstance: instance, controller: controller) @@ -56,7 +61,8 @@ struct AdDisplayContainerTests { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) let adContainerViewController = UIViewController() instance.adContainerViewController = adContainerViewController let value = try? api.pigeonDelegate.getAdContainerViewController( @@ -69,7 +75,8 @@ struct AdDisplayContainerTests { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) let friendlyObstruction = IMAFriendlyObstruction( view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") try? api.pigeonDelegate.registerFriendlyObstruction( @@ -82,7 +89,8 @@ struct AdDisplayContainerTests { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) try? api.pigeonDelegate.unregisterAllFriendlyObstructions( pigeonApi: api, pigeonInstance: instance) @@ -90,25 +98,10 @@ struct AdDisplayContainerTests { } } -@MainActor -class TestAdDisplayContainer: IMAAdDisplayContainer { - private var adContainerTestValue = UIView() - private var companionSlotsTestValue = [IMACompanionAdSlot(view: UIView())] +class TestAdDisplayContainer: IMAAdDisplayContainer, @unchecked Sendable { var registerFriendlyObstructionArgs: [AnyHashable?]? = nil var unregisterAllFriendlyObstructionsCalled = false - convenience init() { - self.init(adContainer: UIView(), viewController: UIViewController()) - } - - override var adContainer: UIView { - return adContainerTestValue - } - - override var companionSlots: [IMACompanionAdSlot] { - return companionSlotsTestValue - } - override func register(_ friendlyObstruction: IMAFriendlyObstruction) { registerFriendlyObstructionArgs = [friendlyObstruction] } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift index ab91c6f0fcb5..47ba9b3c4f28 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift @@ -111,7 +111,7 @@ struct AdsManagerTests { let value = try? api.pigeonDelegate.adCuePoints(pigeonApi: api, pigeonInstance: instance) - #expect(value as! [Double] == [2.2, 3.3]) + #expect(value! == [2.2, 3.3]) } } From 87453fb5998ac0a761f6efe3dd3f8a9439bf874d Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 13 Jan 2026 21:41:31 -0800 Subject: [PATCH 3/5] Remove try? and throw --- .../RunnerTests/AdDisplayContainerTests.swift | 35 +++++++++-------- .../ios/RunnerTests/AdsLoaderTests.swift | 21 +++++----- .../ios/RunnerTests/AdsManagerTests.swift | 38 +++++++++---------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift index 259e739c2f31..89aed0fd0200 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift @@ -10,28 +10,27 @@ import Testing @MainActor struct AdDisplayContainerTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api, adContainer: UIView(), companionSlots: [], - adContainerViewController: UIViewController()) - #expect(instance != nil) + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api, adContainer: UIView(), companionSlots: [], + adContainerViewController: UIViewController()) } - @Test func adContainer() { + @Test func adContainer() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = TestAdDisplayContainer( adContainer: UIView(), viewController: UIViewController()) - let value = try? api.pigeonDelegate.adContainer(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adContainer(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adContainer) } - @Test func companionSlots() { + @Test func companionSlots() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -39,25 +38,25 @@ struct AdDisplayContainerTests { adContainer: UIView(), viewController: UIViewController(), companionSlots: [IMACompanionAdSlot(view: UIView())]) - let value = try? api.pigeonDelegate.companionSlots(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.companionSlots(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.companionSlots) } - @Test func setAdContainerViewController() { + @Test func setAdContainerViewController() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = TestAdDisplayContainer( adContainer: UIView(), viewController: UIViewController()) let controller = UIViewController() - try? api.pigeonDelegate.setAdContainerViewController( + try api.pigeonDelegate.setAdContainerViewController( pigeonApi: api, pigeonInstance: instance, controller: controller) #expect(instance.adContainerViewController == controller) } - @Test func getAdContainerViewController() { + @Test func getAdContainerViewController() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -65,13 +64,13 @@ struct AdDisplayContainerTests { adContainer: UIView(), viewController: UIViewController()) let adContainerViewController = UIViewController() instance.adContainerViewController = adContainerViewController - let value = try? api.pigeonDelegate.getAdContainerViewController( - pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.getAdContainerViewController( + pigeonApi: api, pigeonInstance: instance) #expect(value == adContainerViewController) } - @Test func registerFriendlyObstruction() { + @Test func registerFriendlyObstruction() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) @@ -79,19 +78,19 @@ struct AdDisplayContainerTests { adContainer: UIView(), viewController: UIViewController()) let friendlyObstruction = IMAFriendlyObstruction( view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") - try? api.pigeonDelegate.registerFriendlyObstruction( + try api.pigeonDelegate.registerFriendlyObstruction( pigeonApi: api, pigeonInstance: instance, friendlyObstruction: friendlyObstruction) #expect(instance.registerFriendlyObstructionArgs as! [AnyHashable] == [friendlyObstruction]) } - @Test func unregisterAllFriendlyObstructions() { + @Test func unregisterAllFriendlyObstructions() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = TestAdDisplayContainer( adContainer: UIView(), viewController: UIViewController()) - try? api.pigeonDelegate.unregisterAllFriendlyObstructions( + try api.pigeonDelegate.unregisterAllFriendlyObstructions( pigeonApi: api, pigeonInstance: instance) #expect(instance.unregisterAllFriendlyObstructionsCalled) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift index 65de08d0c874..23e28387bf5a 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift @@ -10,31 +10,30 @@ import Testing @MainActor struct AdsLoaderTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) let settings = IMASettings() settings.ppid = "ppid" - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api, settings: settings) + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api, settings: settings) - #expect(instance != nil) - #expect(instance?.settings.ppid == settings.ppid) + #expect(instance.settings.ppid == settings.ppid) } - @Test func contentComplete() { + @Test func contentComplete() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) let instance = TestAdsLoader(settings: nil) - try? api.pigeonDelegate.contentComplete(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.contentComplete(pigeonApi: api, pigeonInstance: instance) #expect(instance.contentCompleteCalled) } - @Test func requestAds() { + @Test func requestAds() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -44,13 +43,13 @@ struct AdsLoaderTests { adTagUrl: "", adDisplayContainer: IMAAdDisplayContainer(adContainer: UIView(), viewController: nil), contentPlayhead: ContentPlayheadImpl(), userContext: nil) - try? api.pigeonDelegate.requestAds( + try api.pigeonDelegate.requestAds( pigeonApi: api, pigeonInstance: instance, request: request) #expect(instance.adsRequested === request) } - @Test func setDelegate() { + @Test func setDelegate() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -58,7 +57,7 @@ struct AdsLoaderTests { let delegate = AdsLoaderDelegateImpl( api: registrar.apiDelegate.pigeonApiIMAAdsLoaderDelegate(registrar)) - try? api.pigeonDelegate.setDelegate( + try api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) #expect(instance.delegate === delegate) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift index 47ba9b3c4f28..2b2b85799ac9 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsManagerTests.swift @@ -10,7 +10,7 @@ import Testing @MainActor struct AdsManagerTests { - @Test func setDelegate() { + @Test func setDelegate() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -18,100 +18,100 @@ struct AdsManagerTests { let delegate = AdsManagerDelegateImpl( api: registrar.apiDelegate.pigeonApiIMAAdsManagerDelegate(registrar)) - try? api.pigeonDelegate.setDelegate( + try api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) #expect(instance.delegate === delegate) } - @Test func initialize() { + @Test func initialize() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() let renderingSettings = IMAAdsRenderingSettings() - try? api.pigeonDelegate.initialize( + try api.pigeonDelegate.initialize( pigeonApi: api, pigeonInstance: instance, adsRenderingSettings: renderingSettings) #expect(instance.renderingSettings == renderingSettings) } - @Test func start() { + @Test func start() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - try? api.pigeonDelegate.start(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.start(pigeonApi: api, pigeonInstance: instance) #expect(instance.startCalled) } - @Test func pause() { + @Test func pause() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - try? api.pigeonDelegate.pause(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.pause(pigeonApi: api, pigeonInstance: instance) #expect(instance.pauseCalled) } - @Test func skip() { + @Test func skip() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - try? api.pigeonDelegate.skip(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.skip(pigeonApi: api, pigeonInstance: instance) #expect(instance.skipCalled) } - @Test func discardAdBreak() { + @Test func discardAdBreak() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - try? api.pigeonDelegate.discardAdBreak(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.discardAdBreak(pigeonApi: api, pigeonInstance: instance) #expect(instance.discardAdBreakCalled) } - @Test func resume() { + @Test func resume() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - try? api.pigeonDelegate.resume(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.resume(pigeonApi: api, pigeonInstance: instance) #expect(instance.resumeCalled) } - @Test func destroy() { + @Test func destroy() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - try? api.pigeonDelegate.destroy(pigeonApi: api, pigeonInstance: instance) + try api.pigeonDelegate.destroy(pigeonApi: api, pigeonInstance: instance) #expect(instance.destroyCalled) } - @Test func adCuePoints() { + @Test func adCuePoints() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) let instance = TestAdsManager.customInit() - let value = try? api.pigeonDelegate.adCuePoints(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adCuePoints(pigeonApi: api, pigeonInstance: instance) - #expect(value! == [2.2, 3.3]) + #expect(value == [2.2, 3.3]) } } From b68361a67509a57e579d962ee695290997e8e31a Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 13 Jan 2026 22:02:37 -0800 Subject: [PATCH 4/5] format --- .../example/ios/RunnerTests/AdDisplayContainerTests.swift | 6 +++--- .../example/ios/RunnerTests/AdsLoaderTests.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift index 89aed0fd0200..f51cd9cc6cc3 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift @@ -15,8 +15,8 @@ struct AdDisplayContainerTests { let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) let instance = try api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api, adContainer: UIView(), companionSlots: [], - adContainerViewController: UIViewController()) + pigeonApi: api, adContainer: UIView(), companionSlots: [], + adContainerViewController: UIViewController()) } @Test func adContainer() throws { @@ -65,7 +65,7 @@ struct AdDisplayContainerTests { let adContainerViewController = UIViewController() instance.adContainerViewController = adContainerViewController let value = try api.pigeonDelegate.getAdContainerViewController( - pigeonApi: api, pigeonInstance: instance) + pigeonApi: api, pigeonInstance: instance) #expect(value == adContainerViewController) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift index 23e28387bf5a..bc99a184db72 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift @@ -17,7 +17,7 @@ struct AdsLoaderTests { let settings = IMASettings() settings.ppid = "ppid" let instance = try api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api, settings: settings) + pigeonApi: api, settings: settings) #expect(instance.settings.ppid == settings.ppid) } From 054f781538e18ce0c78f34b821b58d30d09b7f43 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 13 Jan 2026 23:14:19 -0800 Subject: [PATCH 5/5] try throws --- .../ios/RunnerTests/AdErrorTests.swift | 12 +- .../ios/RunnerTests/AdEventTests.swift | 16 +-- .../RunnerTests/AdLoadingErrorDataTests.swift | 4 +- .../RunnerTests/AdPodInfoProxyAPITests.swift | 24 ++-- .../ios/RunnerTests/AdProxyAPITests.swift | 112 +++++++++--------- .../AdsRenderingSettingsTests.swift | 32 ++--- .../ios/RunnerTests/AdsRequestTests.swift | 78 ++++++------ .../CompanionAdProxyApiTests.swift | 16 +-- .../CompanionAdSlotProxyApiTests.swift | 8 +- .../CompanionDelegateProxyApiTests.swift | 5 +- .../RunnerTests/ContentPlayheadTests.swift | 13 +- .../FriendlyObstructionTests.swift | 20 ++-- .../ios/RunnerTests/SettingsTests.swift | 53 ++++----- .../UniversalAdIDProxyAPITests.swift | 8 +- .../ios/RunnerTests/ViewControllerTests.swift | 15 +-- .../example/ios/RunnerTests/ViewTests.swift | 9 +- 16 files changed, 207 insertions(+), 218 deletions(-) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift index eabb355f29e3..9b0602a42898 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift @@ -9,35 +9,35 @@ import Testing @testable import interactive_media_ads struct AdErrorTests { - @Test func type() { + @Test func type() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdError(registrar) let instance = TestAdError.customInit() - let value = try? api.pigeonDelegate.type(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.type(pigeonApi: api, pigeonInstance: instance) #expect(value == .loadingFailed) } - @Test func code() { + @Test func code() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdError(registrar) let instance = TestAdError.customInit() - let value = try? api.pigeonDelegate.code(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.code(pigeonApi: api, pigeonInstance: instance) #expect(value == .apiError) } - @Test func message() { + @Test func message() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdError(registrar) let instance = TestAdError.customInit() - let value = try? api.pigeonDelegate.message(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.message(pigeonApi: api, pigeonInstance: instance) #expect(value == "message") } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift index b27b5f899a0c..a9fb33a27830 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift @@ -9,45 +9,45 @@ import Testing @testable import interactive_media_ads struct AdEventTests { - @Test func type() { + @Test func type() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) let instance = TestAdEvent.customInit() - let value = try? api.pigeonDelegate.type(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.type(pigeonApi: api, pigeonInstance: instance) #expect(value == .adBreakEnded) } - @Test func message() { + @Test func message() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) let instance = TestAdEvent.customInit() - let value = try? api.pigeonDelegate.typeString(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.typeString(pigeonApi: api, pigeonInstance: instance) #expect(value == "message") } - @Test func adData() { + @Test func adData() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) let instance = TestAdEvent.customInit() - let value = try? api.pigeonDelegate.adData(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adData(pigeonApi: api, pigeonInstance: instance) #expect((value as! [String: String]) == ["my": "string"]) } - @Test func ad() { + @Test func ad() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdEvent(registrar) let instance = TestAdEvent.customInit() - let value = try? api.pigeonDelegate.ad(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.ad(pigeonApi: api, pigeonInstance: instance) #expect(value != nil) #expect(value == instance.ad) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift index 20afdd257cfb..edbcd2df4152 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift @@ -9,13 +9,13 @@ import Testing @testable import interactive_media_ads struct AdLoadingErrorTests { - @Test func adError() { + @Test func adError() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdLoadingErrorData(registrar) let instance = TestAdLoadingErrorData.customInit() - let value = try? api.pigeonDelegate.adError(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adError(pigeonApi: api, pigeonInstance: instance) #expect(value is TestAdError) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift index df01cc7c3a81..3056ff31c87a 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdPodInfoProxyAPITests.swift @@ -10,67 +10,67 @@ import Testing struct AdPodInfoProxyAPITests { @Test - func adPosition() { + func adPosition() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() - let value = try? api.pigeonDelegate.adPosition(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adPosition(pigeonApi: api, pigeonInstance: instance) #expect(value == Int64(instance.adPosition)) } @Test - func maxDuration() { + func maxDuration() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() - let value = try? api.pigeonDelegate.maxDuration(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.maxDuration(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.maxDuration) } @Test - func podIndex() { + func podIndex() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() - let value = try? api.pigeonDelegate.podIndex(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.podIndex(pigeonApi: api, pigeonInstance: instance) #expect(value == Int64(instance.podIndex)) } @Test - func timeOffset() { + func timeOffset() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() - let value = try? api.pigeonDelegate.timeOffset(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.timeOffset(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.timeOffset) } @Test - func totalAds() { + func totalAds() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() - let value = try? api.pigeonDelegate.totalAds(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.totalAds(pigeonApi: api, pigeonInstance: instance) #expect(value == Int64(instance.totalAds)) } @Test - func isBumper() { + func isBumper() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdPodInfo(registrar) let instance = TestAdPodInfo.customInit() - let value = try? api.pigeonDelegate.isBumper(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.isBumper(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.isBumper) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift index 8072624d05cc..f004ba52e0e7 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdProxyAPITests.swift @@ -10,85 +10,85 @@ import Testing struct AdProxyAPITests { @Test - func adId() { + func adId() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.adId(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adId(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adId) } @Test - func adTitle() { + func adTitle() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.adTitle(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adTitle(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adTitle) } @Test - func adDescription() { + func adDescription() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.adDescription(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adDescription(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adDescription) } @Test - func adSystem() { + func adSystem() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.adSystem(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adSystem(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adSystem) } @MainActor @Test - func companionAds() { + func companionAds() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try! api.pigeonDelegate.companionAds(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.companionAds(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.companionAds) } @Test - func contentType() { + func contentType() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.contentType(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.contentType(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.contentType) } @Test - func duration() { + func duration() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.duration(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.duration(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.duration) } @Test - func uiElements() { + func uiElements() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -96,13 +96,13 @@ struct AdProxyAPITests { elementArray.add(NSNumber(value: IMAUiElementType.elements_AD_ATTRIBUTION.rawValue)) let instance = TestAd.customInit() instance.testElements = elementArray - let value = try? api.pigeonDelegate.uiElements(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.uiElements(pigeonApi: api, pigeonInstance: instance) #expect(value == [UIElementType.adAttribution]) } @Test - func uiElementsWithStrings() { + func uiElementsWithStrings() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -110,7 +110,7 @@ struct AdProxyAPITests { elementArray.add("adAttribution") let instance = TestAd.customInit() instance.testElements = elementArray - let value = try? api.pigeonDelegate.uiElements(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.uiElements(pigeonApi: api, pigeonInstance: instance) #expect(value == [UIElementType.adAttribution]) } @@ -121,9 +121,9 @@ struct AdProxyAPITests { let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) - #expect(try #require(value) == Int64(instance.width)) + #expect(value == Int64(instance.width)) } @Test @@ -132,9 +132,9 @@ struct AdProxyAPITests { let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) - #expect(try #require(value) == Int64(instance.height)) + #expect(value == Int64(instance.height)) } @Test @@ -143,9 +143,9 @@ struct AdProxyAPITests { let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.vastMediaWidth(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.vastMediaWidth(pigeonApi: api, pigeonInstance: instance) - #expect(try #require(value) == Int64(instance.vastMediaWidth)) + #expect(value == Int64(instance.vastMediaWidth)) } @Test @@ -154,9 +154,9 @@ struct AdProxyAPITests { let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.vastMediaHeight(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.vastMediaHeight(pigeonApi: api, pigeonInstance: instance) - #expect(try #require(value) == Int64(instance.vastMediaHeight)) + #expect(value == Int64(instance.vastMediaHeight)) } @Test @@ -165,164 +165,164 @@ struct AdProxyAPITests { let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.vastMediaBitrate(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.vastMediaBitrate(pigeonApi: api, pigeonInstance: instance) - #expect(try #require(value) == Int64(instance.vastMediaBitrate)) + #expect(value == Int64(instance.vastMediaBitrate)) } @Test - func isLinear() { + func isLinear() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.isLinear(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.isLinear(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.isLinear) } @Test - func isSkippable() { + func isSkippable() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.isSkippable(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.isSkippable(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.isSkippable) } @Test - func skipTimeOffset() { + func skipTimeOffset() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.skipTimeOffset(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.skipTimeOffset(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.skipTimeOffset) } @MainActor @Test - func adPodInfo() { + func adPodInfo() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.adPodInfo(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adPodInfo(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adPodInfo) } @Test - func traffickingParameters() { + func traffickingParameters() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.traffickingParameters( + let value = try api.pigeonDelegate.traffickingParameters( pigeonApi: api, pigeonInstance: instance) #expect(value == instance.traffickingParameters) } @Test - func creativeID() { + func creativeID() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.creativeID(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.creativeID(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.creativeID) } @Test - func creativeAdID() { + func creativeAdID() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.creativeAdID(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.creativeAdID(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.creativeAdID) } @MainActor @Test - func universalAdIDs() { + func universalAdIDs() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try! api.pigeonDelegate.universalAdIDs(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.universalAdIDs(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.universalAdIDs) } @Test - func advertiserName() { + func advertiserName() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.advertiserName(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.advertiserName(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.advertiserName) } @Test - func surveyURL() { + func surveyURL() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.surveyURL(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.surveyURL(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.surveyURL) } @Test - func dealID() { + func dealID() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.dealID(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.dealID(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.dealID) } @Test - func wrapperAdIDs() { + func wrapperAdIDs() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.wrapperAdIDs(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.wrapperAdIDs(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.wrapperAdIDs) } @Test - func wrapperCreativeIDs() { + func wrapperCreativeIDs() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.wrapperCreativeIDs(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.wrapperCreativeIDs(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.wrapperCreativeIDs) } @Test - func wrapperSystems() { + func wrapperSystems() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) let instance = TestAd.customInit() - let value = try? api.pigeonDelegate.wrapperSystems(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.wrapperSystems(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.wrapperSystems) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift index 0e9b4888f9f6..01d418a079d0 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift @@ -10,94 +10,94 @@ import Testing @MainActor struct AdsRenderingSettingsTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api) #expect(instance != nil) } - @Test func setMimeTypes() { + @Test func setMimeTypes() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let types = ["myString"] - try? api.pigeonDelegate.setMimeTypes(pigeonApi: api, pigeonInstance: instance, types: types) + try api.pigeonDelegate.setMimeTypes(pigeonApi: api, pigeonInstance: instance, types: types) #expect(instance.mimeTypes == types) } - @Test func setBitrate() { + @Test func setBitrate() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let bitrate = 0 - try? api.pigeonDelegate.setBitrate( + try api.pigeonDelegate.setBitrate( pigeonApi: api, pigeonInstance: instance, bitrate: Int64(bitrate)) #expect(instance.bitrate == bitrate) } - @Test func setLoadVideoTimeout() { + @Test func setLoadVideoTimeout() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let seconds = 1.0 - try? api.pigeonDelegate.setLoadVideoTimeout( + try api.pigeonDelegate.setLoadVideoTimeout( pigeonApi: api, pigeonInstance: instance, seconds: seconds) #expect(instance.loadVideoTimeout == seconds) } - @Test func setPlayAdsAfterTime() { + @Test func setPlayAdsAfterTime() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let seconds = 1.0 - try? api.pigeonDelegate.setPlayAdsAfterTime( + try api.pigeonDelegate.setPlayAdsAfterTime( pigeonApi: api, pigeonInstance: instance, seconds: seconds) #expect(instance.playAdsAfterTime == seconds) } - @Test func setUIElements() { + @Test func setUIElements() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let types = [UIElementType.adAttribution] - try? api.pigeonDelegate.setUIElements(pigeonApi: api, pigeonInstance: instance, types: types) + try api.pigeonDelegate.setUIElements(pigeonApi: api, pigeonInstance: instance, types: types) #expect( instance.uiElements == [IMAUiElementType.elements_AD_ATTRIBUTION.rawValue as NSNumber]) } - @Test func setEnablePreloading() { + @Test func setEnablePreloading() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let enable = true - try? api.pigeonDelegate.setEnablePreloading( + try api.pigeonDelegate.setEnablePreloading( pigeonApi: api, pigeonInstance: instance, enable: enable) #expect(instance.enablePreloading) } - @Test func setLinkOpenerPresentingController() { + @Test func setLinkOpenerPresentingController() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) let instance = IMAAdsRenderingSettings() let controller = UIViewController() - try? api.pigeonDelegate.setLinkOpenerPresentingController( + try api.pigeonDelegate.setLinkOpenerPresentingController( pigeonApi: api, pigeonInstance: instance, controller: controller) #expect(instance.linkOpenerPresentingController == controller) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift index f87c25f58b3d..745d1ed49a4b 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift @@ -10,59 +10,55 @@ import Testing @MainActor struct AdsRequestTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) let container = IMAAdDisplayContainer(adContainer: UIView(), viewController: nil) let contentPlayhead = ContentPlayheadImpl() - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adTagUrl: "adTag?", adDisplayContainer: container, contentPlayhead: contentPlayhead) - #expect(instance != nil) #expect( - instance?.adTagUrl + instance.adTagUrl == "adTag?&request_agent=Flutter-IMA-\(AdsRequestProxyAPIDelegate.pluginVersion)") - #expect(instance?.adDisplayContainer === container) + #expect(instance.adDisplayContainer === container) } - @Test func pigeonDefaultConstructorDoesNotAddRequestAgentToIncompatibleURLs() { + @Test func pigeonDefaultConstructorDoesNotAddRequestAgentToIncompatibleURLs() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) let container = IMAAdDisplayContainer(adContainer: UIView(), viewController: nil) let contentPlayhead = ContentPlayheadImpl() - var instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + var instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adTagUrl: "adTag#", adDisplayContainer: container, contentPlayhead: contentPlayhead) - #expect(instance != nil) - #expect(instance?.adTagUrl == "adTag#") + #expect(instance.adTagUrl == "adTag#") - instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adTagUrl: "adTag#?", adDisplayContainer: container, contentPlayhead: contentPlayhead) - #expect(instance != nil) - #expect(instance?.adTagUrl == "adTag#?") + #expect(instance.adTagUrl == "adTag#?") } - @Test func withAdsResponse() { + @Test func withAdsResponse() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) let container = IMAAdDisplayContainer(adContainer: UIView(), viewController: nil) let contentPlayhead = ContentPlayheadImpl() - let instance = try? api.pigeonDelegate.withAdsResponse( + let instance = try api.pigeonDelegate.withAdsResponse( pigeonApi: api, adsResponse: "response", adDisplayContainer: container, contentPlayhead: contentPlayhead) - #expect(instance != nil) - #expect(instance?.adsResponse == "response") - #expect(instance?.adDisplayContainer === container) + #expect(instance.adsResponse == "response") + #expect(instance.adDisplayContainer === container) } - @Test func getAdTagUrl() { + @Test func getAdTagUrl() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -73,12 +69,12 @@ struct AdsRequestTests { adTagUrl: adTagUrl, adDisplayContainer: container, contentPlayhead: contentPlayhead, userContext: nil) - let value = try? api.pigeonDelegate.getAdTagUrl(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.getAdTagUrl(pigeonApi: api, pigeonInstance: instance) #expect(value == adTagUrl) } - @Test func getAdsResponse() { + @Test func getAdsResponse() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -89,12 +85,12 @@ struct AdsRequestTests { adsResponse: adsResponse, adDisplayContainer: container, contentPlayhead: contentPlayhead, userContext: nil) - let value = try? api.pigeonDelegate.getAdsResponse(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.getAdsResponse(pigeonApi: api, pigeonInstance: instance) #expect(value == adsResponse) } - @Test func getAdDisplayContainer() { + @Test func getAdDisplayContainer() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -104,13 +100,13 @@ struct AdsRequestTests { adTagUrl: "url", adDisplayContainer: container, contentPlayhead: contentPlayhead, userContext: nil) - let value = try? api.pigeonDelegate.getAdDisplayContainer( + let value = try api.pigeonDelegate.getAdDisplayContainer( pigeonApi: api, pigeonInstance: instance) #expect(value == container) } - @Test func setAdWillAutoPlay() { + @Test func setAdWillAutoPlay() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -121,13 +117,13 @@ struct AdsRequestTests { userContext: nil) let adWillAutoPlay = true - try? api.pigeonDelegate.setAdWillAutoPlay( + try api.pigeonDelegate.setAdWillAutoPlay( pigeonApi: api, pigeonInstance: instance, adWillAutoPlay: adWillAutoPlay) #expect(instance.adWillAutoPlay == adWillAutoPlay) } - @Test func setAdWillPlayMuted() { + @Test func setAdWillPlayMuted() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -138,13 +134,13 @@ struct AdsRequestTests { userContext: nil) let adWillPlayMuted = false - try? api.pigeonDelegate.setAdWillPlayMuted( + try api.pigeonDelegate.setAdWillPlayMuted( pigeonApi: api, pigeonInstance: instance, adWillPlayMuted: adWillPlayMuted) #expect(instance.adWillPlayMuted == adWillPlayMuted) } - @Test func setContinuousPlayback() { + @Test func setContinuousPlayback() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -155,13 +151,13 @@ struct AdsRequestTests { userContext: nil) let continuousPlayback = true - try? api.pigeonDelegate.setContinuousPlayback( + try api.pigeonDelegate.setContinuousPlayback( pigeonApi: api, pigeonInstance: instance, continuousPlayback: continuousPlayback) #expect(instance.continuousPlayback == continuousPlayback) } - @Test func setContentDuration() { + @Test func setContentDuration() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -172,13 +168,13 @@ struct AdsRequestTests { userContext: nil) let duration = 3.0 - try? api.pigeonDelegate.setContentDuration( + try api.pigeonDelegate.setContentDuration( pigeonApi: api, pigeonInstance: instance, duration: duration) #expect(instance.contentDuration == Float(duration)) } - @Test func setContentKeywords() { + @Test func setContentKeywords() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -189,13 +185,13 @@ struct AdsRequestTests { userContext: nil) let keywords = ["hello"] - try? api.pigeonDelegate.setContentKeywords( + try api.pigeonDelegate.setContentKeywords( pigeonApi: api, pigeonInstance: instance, keywords: keywords) #expect(instance.contentKeywords == keywords) } - @Test func setContentTitle() { + @Test func setContentTitle() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -206,12 +202,12 @@ struct AdsRequestTests { userContext: nil) let title = "hello" - try? api.pigeonDelegate.setContentTitle(pigeonApi: api, pigeonInstance: instance, title: title) + try api.pigeonDelegate.setContentTitle(pigeonApi: api, pigeonInstance: instance, title: title) #expect(instance.contentTitle == title) } - @Test func setContentURL() { + @Test func setContentURL() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -222,13 +218,13 @@ struct AdsRequestTests { userContext: nil) let contentURL = "https://www.google.com" - try? api.pigeonDelegate.setContentURL( + try api.pigeonDelegate.setContentURL( pigeonApi: api, pigeonInstance: instance, contentURL: contentURL) #expect(instance.contentURL == URL(string: contentURL)) } - @Test func setVastLoadTimeout() { + @Test func setVastLoadTimeout() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -239,13 +235,13 @@ struct AdsRequestTests { userContext: nil) let timeout = 3.0 - try? api.pigeonDelegate.setVastLoadTimeout( + try api.pigeonDelegate.setVastLoadTimeout( pigeonApi: api, pigeonInstance: instance, timeout: timeout) #expect(instance.vastLoadTimeout == Float(timeout)) } - @Test func setLiveStreamPrefetchSeconds() { + @Test func setLiveStreamPrefetchSeconds() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -256,7 +252,7 @@ struct AdsRequestTests { userContext: nil) let seconds = 3.0 - try? api.pigeonDelegate.setLiveStreamPrefetchSeconds( + try api.pigeonDelegate.setLiveStreamPrefetchSeconds( pigeonApi: api, pigeonInstance: instance, seconds: seconds) #expect(instance.liveStreamPrefetchSeconds == Float(seconds)) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift index 48d6cd8f6faa..7b5a06ddc802 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdProxyApiTests.swift @@ -10,45 +10,45 @@ import Testing struct CompanionAdProxyApiTests { @Test - func resourceValue() { + func resourceValue() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() - let value = try? api.pigeonDelegate.resourceValue(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.resourceValue(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.resourceValue) } @Test - func apiFramework() { + func apiFramework() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() - let value = try? api.pigeonDelegate.apiFramework(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.apiFramework(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.apiFramework) } @Test - func width() { + func width() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() - let value = try? api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) #expect(value == Int64(instance.width)) } @Test - func height() { + func height() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAd(registrar) let instance = TestCompanionAd.customInit() - let value = try? api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) #expect(value == Int64(instance.height)) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift index 67ddb75d2607..3855a0fb4366 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift @@ -37,25 +37,25 @@ struct CompanionAdSlotProxyApiTests { } @Test - func view() { + func view() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAdSlot(registrar) let instance = IMACompanionAdSlot(view: UIView()) - let value = try? api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.view) } @Test - func setDelegate() { + func setDelegate() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionAdSlot(registrar) let instance = IMACompanionAdSlot(view: UIView()) let delegate = CompanionDelegateImpl( api: registrar.apiDelegate.pigeonApiIMACompanionDelegate(registrar)) - try? api.pigeonDelegate.setDelegate( + try api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) #expect(instance.delegate === delegate) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift index c761ad20bd58..8bc2a143f63a 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift @@ -12,12 +12,11 @@ import UIKit @MainActor struct CompanionDelegateProxyApiTests { @Test - func pigeonDefaultConstructor() { + func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionDelegate(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - #expect(instance != nil) + let instance = try #require(try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api)) } @Test diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift index f511e0b41f1b..91c366f12d44 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift @@ -9,22 +9,21 @@ import Testing @testable import interactive_media_ads struct ContentPlayheadTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAContentPlayhead(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api) - - #expect(instance != nil) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api)) } - @Test func setCurrentTime() { + @Test func setCurrentTime() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAContentPlayhead(registrar) let instance = ContentPlayheadImpl() - try? api.pigeonDelegate.setCurrentTime( + try api.pigeonDelegate.setCurrentTime( pigeonApi: api, pigeonInstance: instance, timeInterval: 12) #expect(instance.currentTime == 12) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift index 5b0c8f912546..f5233bf6a174 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift @@ -11,13 +11,13 @@ import UIKit @MainActor struct FriendlyObstructionProxyApiTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api, view: UIView(), purpose: .mediaControls, detailedReason: "myString") - #expect(instance != nil) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api, view: UIView(), purpose: .mediaControls, detailedReason: "myString")) } @Test func pigeonDefaultConstructorWithUnknownPurpose() throws { @@ -30,35 +30,35 @@ struct FriendlyObstructionProxyApiTests { } } - @Test func view() { + @Test func view() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) let instance = IMAFriendlyObstruction( view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") - let value = try? api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.view) } - @Test func purpose() { + @Test func purpose() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) let instance = IMAFriendlyObstruction( view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") - let value = try? api.pigeonDelegate.purpose(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.purpose(pigeonApi: api, pigeonInstance: instance) #expect(value == FriendlyObstructionPurpose.closeAd) } - @Test func detailedReason() { + @Test func detailedReason() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAFriendlyObstruction(registrar) let instance = IMAFriendlyObstruction( view: UIView(), purpose: IMAFriendlyObstructionPurpose.closeAd, detailedReason: "reason") - let value = try? api.pigeonDelegate.detailedReason(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.detailedReason(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.detailedReason) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift index 3552c7a169ad..9beafd97b572 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift @@ -9,150 +9,149 @@ import Testing @testable import interactive_media_ads struct SettingsTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - #expect(instance != nil) + let instance = try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) } - @Test func setPPID() { + @Test func setPPID() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let ppid = "myString" - try? api.pigeonDelegate.setPPID(pigeonApi: api, pigeonInstance: instance, ppid: ppid) + try api.pigeonDelegate.setPPID(pigeonApi: api, pigeonInstance: instance, ppid: ppid) #expect(instance.ppid == ppid) } - @Test func setLanguage() { + @Test func setLanguage() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let language = "en" - try? api.pigeonDelegate.setLanguage( + try api.pigeonDelegate.setLanguage( pigeonApi: api, pigeonInstance: instance, language: language) #expect(instance.language == language) } - @Test func setMaxRedirects() { + @Test func setMaxRedirects() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let max = 0 - try? api.pigeonDelegate.setMaxRedirects( + try api.pigeonDelegate.setMaxRedirects( pigeonApi: api, pigeonInstance: instance, max: Int64(max)) #expect(instance.maxRedirects == UInt(max)) } - @Test func setFeatureFlags() { + @Test func setFeatureFlags() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let flags = ["myString": "myString"] - try? api.pigeonDelegate.setFeatureFlags(pigeonApi: api, pigeonInstance: instance, flags: flags) + try api.pigeonDelegate.setFeatureFlags(pigeonApi: api, pigeonInstance: instance, flags: flags) #expect(instance.featureFlags == flags) } - @Test func setEnableBackgroundPlayback() { + @Test func setEnableBackgroundPlayback() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let enabled = true - try? api.pigeonDelegate.setEnableBackgroundPlayback( + try api.pigeonDelegate.setEnableBackgroundPlayback( pigeonApi: api, pigeonInstance: instance, enabled: enabled) #expect(instance.enableBackgroundPlayback == enabled) } - @Test func setAutoPlayAdBreaks() { + @Test func setAutoPlayAdBreaks() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let autoPlay = true - try? api.pigeonDelegate.setAutoPlayAdBreaks( + try api.pigeonDelegate.setAutoPlayAdBreaks( pigeonApi: api, pigeonInstance: instance, autoPlay: autoPlay) #expect(instance.autoPlayAdBreaks == autoPlay) } - @Test func setDisableNowPlayingInfo() { + @Test func setDisableNowPlayingInfo() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let disable = true - try? api.pigeonDelegate.setDisableNowPlayingInfo( + try api.pigeonDelegate.setDisableNowPlayingInfo( pigeonApi: api, pigeonInstance: instance, disable: disable) #expect(instance.disableNowPlayingInfo == disable) } - @Test func setPlayerType() { + @Test func setPlayerType() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let type = "myString" - try? api.pigeonDelegate.setPlayerType(pigeonApi: api, pigeonInstance: instance, type: type) + try api.pigeonDelegate.setPlayerType(pigeonApi: api, pigeonInstance: instance, type: type) #expect(instance.playerType == type) } - @Test func setPlayerVersion() { + @Test func setPlayerVersion() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let version = "myString" - try? api.pigeonDelegate.setPlayerVersion( + try api.pigeonDelegate.setPlayerVersion( pigeonApi: api, pigeonInstance: instance, version: version) #expect(instance.playerVersion == version) } - @Test func setSessionID() { + @Test func setSessionID() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let sessionID = "myString" - try? api.pigeonDelegate.setSessionID( + try api.pigeonDelegate.setSessionID( pigeonApi: api, pigeonInstance: instance, sessionID: sessionID) #expect(instance.sessionID == sessionID) } - @Test func setSameAppKeyEnabled() { + @Test func setSameAppKeyEnabled() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let enabled = true - try? api.pigeonDelegate.setSameAppKeyEnabled( + try api.pigeonDelegate.setSameAppKeyEnabled( pigeonApi: api, pigeonInstance: instance, enabled: enabled) #expect(instance.sameAppKeyEnabled == enabled) } - @Test func setEnableDebugMode() { + @Test func setEnableDebugMode() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) let instance = IMASettings() let enable = true - try? api.pigeonDelegate.setEnableDebugMode( + try api.pigeonDelegate.setEnableDebugMode( pigeonApi: api, pigeonInstance: instance, enable: enable) #expect(instance.enableDebugMode == enable) diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift index 712be4f901e8..058e251a8704 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/UniversalAdIDProxyAPITests.swift @@ -10,23 +10,23 @@ import Testing struct UniversalAdIDProxyAPITests { @Test - func adIDValue() { + func adIDValue() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAUniversalAdID(registrar) let instance = TestUniversalAdID.customInit() - let value = try? api.pigeonDelegate.adIDValue(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adIDValue(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adIDValue) } @Test - func adIDRegistry() { + func adIDRegistry() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAUniversalAdID(registrar) let instance = TestUniversalAdID.customInit() - let value = try? api.pigeonDelegate.adIDRegistry(pigeonApi: api, pigeonInstance: instance) + let value = try api.pigeonDelegate.adIDRegistry(pigeonApi: api, pigeonInstance: instance) #expect(value == instance.adIDRegistry) } diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift index a9a04a8f0ce0..e088515f3c6c 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift @@ -9,24 +9,21 @@ import Testing @MainActor struct ViewControllerTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIViewController(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api) - - #expect(instance != nil) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api)) } - @Test func view() { + @Test func view() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIViewController(registrar) let instance = UIViewController() - let view = try? api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance) - - #expect(view != nil) + let view = try #require(try api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance)) } @Test func viewDidAppear() { diff --git a/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift index b35b4fe72616..78371754ee4a 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift @@ -9,13 +9,12 @@ import Testing @MainActor struct ViewTests { - @Test func pigeonDefaultConstructor() { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIView(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api) - - #expect(instance != nil) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api)) } }