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..f51cd9cc6cc3 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdDisplayContainerTests.swift @@ -4,109 +4,103 @@ 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, adContainer: UIView(), companionSlots: [], adContainerViewController: UIViewController()) - XCTAssertNotNil(instance) } - func testAdContainer() { + @Test func adContainer() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() - let value = try? api.pigeonDelegate.adContainer(pigeonApi: api, pigeonInstance: instance) + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) + let value = try api.pigeonDelegate.adContainer(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.adContainer) + #expect(value == instance.adContainer) } - func testCompanionSlots() { + @Test func companionSlots() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() - let value = try? api.pigeonDelegate.companionSlots(pigeonApi: api, pigeonInstance: instance) + let instance = TestAdDisplayContainer( + adContainer: UIView(), + viewController: UIViewController(), + companionSlots: [IMACompanionAdSlot(view: UIView())]) + let value = try api.pigeonDelegate.companionSlots(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, instance.companionSlots) + #expect(value == instance.companionSlots) } - func testSetAdContainerViewController() { + @Test func setAdContainerViewController() throws { 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( + try api.pigeonDelegate.setAdContainerViewController( pigeonApi: api, pigeonInstance: instance, controller: controller) - XCTAssertEqual(instance.adContainerViewController, controller) + #expect(instance.adContainerViewController == controller) } - func testGetAdContainerViewController() { + @Test func getAdContainerViewController() throws { 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( + let value = try api.pigeonDelegate.getAdContainerViewController( pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, adContainerViewController) + #expect(value == adContainerViewController) } - func testRegisterFriendlyObstruction() { + @Test func registerFriendlyObstruction() throws { 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( + 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdDisplayContainer(registrar) - let instance = TestAdDisplayContainer() - try? api.pigeonDelegate.unregisterAllFriendlyObstructions( + let instance = TestAdDisplayContainer( + adContainer: UIView(), viewController: UIViewController()) + try api.pigeonDelegate.unregisterAllFriendlyObstructions( pigeonApi: api, pigeonInstance: instance) - XCTAssertTrue(instance.unregisterAllFriendlyObstructionsCalled) + #expect(instance.unregisterAllFriendlyObstructionsCalled) } } -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/AdErrorTests.swift b/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift index d640359df32b..9b0602a42898 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdErrorTests.swift @@ -4,42 +4,42 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdErrorTests: XCTestCase { - func testType() { +struct AdErrorTests { + @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) - XCTAssertEqual(value, .loadingFailed) + #expect(value == .loadingFailed) } - func testCode() { + @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) - XCTAssertEqual(value, .apiError) + #expect(value == .apiError) } - func testMessage() { + @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) - 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..a9fb33a27830 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdEventTests.swift @@ -4,53 +4,53 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdEventTests: XCTestCase { - func testType() { +struct AdEventTests { + @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) - XCTAssertEqual(value, .adBreakEnded) + #expect(value == .adBreakEnded) } - func testMessage() { + @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) - XCTAssertEqual(value, "message") + #expect(value == "message") } - func testAdData() { + @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) - XCTAssertEqual(value as! [String: String], ["my": "string"]) + #expect((value as! [String: String]) == ["my": "string"]) } - func testAd() { + @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) - 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..edbcd2df4152 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdLoadingErrorDataTests.swift @@ -4,20 +4,20 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class AdLoadingErrorTests: XCTestCase { - func testAdError() { +struct AdLoadingErrorTests { + @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) - 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..3056ff31c87a 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() 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) - XCTAssertEqual(value, Int64(instance.adPosition)) + #expect(value == Int64(instance.adPosition)) } - func testMaxDuration() { + @Test + 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) - XCTAssertEqual(value, instance.maxDuration) + #expect(value == instance.maxDuration) } - func testPodIndex() { + @Test + 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) - XCTAssertEqual(value, Int64(instance.podIndex)) + #expect(value == Int64(instance.podIndex)) } - func testTimeOffset() { + @Test + 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) - XCTAssertEqual(value, instance.timeOffset) + #expect(value == instance.timeOffset) } - func testTotalAds() { + @Test + 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) - XCTAssertEqual(value, Int64(instance.totalAds)) + #expect(value == Int64(instance.totalAds)) } - func testIsBumper() { + @Test + 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) - 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..f004ba52e0e7 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() 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) - XCTAssertEqual(value, instance.adId) + #expect(value == instance.adId) } - func testAdTitle() { + @Test + 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) - XCTAssertEqual(value, instance.adTitle) + #expect(value == instance.adTitle) } - func testAdDescription() { + @Test + 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) - XCTAssertEqual(value, instance.adDescription) + #expect(value == instance.adDescription) } - func testAdSystem() { + @Test + 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) - XCTAssertEqual(value, instance.adSystem) + #expect(value == instance.adSystem) } - @MainActor func testCompanionAds() { + @MainActor + @Test + 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) - XCTAssertEqual(value, instance.companionAds) + #expect(value == instance.companionAds) } - func testContentType() { + @Test + 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) - XCTAssertEqual(value, instance.contentType) + #expect(value == instance.contentType) } - func testDuration() { + @Test + 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) - XCTAssertEqual(value, instance.duration) + #expect(value == instance.duration) } - func testUiElements() { + @Test + func uiElements() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -87,12 +96,13 @@ class AdProxyAPITests: XCTestCase { 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) - XCTAssertEqual(value, [UIElementType.adAttribution]) + #expect(value == [UIElementType.adAttribution]) } - func testUiElementsWithStrings() { + @Test + func uiElementsWithStrings() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAd(registrar) @@ -100,200 +110,221 @@ class AdProxyAPITests: XCTestCase { 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) - 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) + let value = try api.pigeonDelegate.width(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.width)) + #expect(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) + let value = try api.pigeonDelegate.height(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.height)) + #expect(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) + let value = try api.pigeonDelegate.vastMediaWidth(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.vastMediaWidth)) + #expect(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) + let value = try api.pigeonDelegate.vastMediaHeight(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.vastMediaHeight)) + #expect(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) + let value = try api.pigeonDelegate.vastMediaBitrate(pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(try XCTUnwrap(value), Int64(instance.vastMediaBitrate)) + #expect(value == Int64(instance.vastMediaBitrate)) } - func testIsLinear() { + @Test + 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) - XCTAssertEqual(value, instance.isLinear) + #expect(value == instance.isLinear) } - func testIsSkippable() { + @Test + 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) - XCTAssertEqual(value, instance.isSkippable) + #expect(value == instance.isSkippable) } - func testSkipTimeOffset() { + @Test + 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) - XCTAssertEqual(value, instance.skipTimeOffset) + #expect(value == instance.skipTimeOffset) } - @MainActor func testAdPodInfo() { + @MainActor + @Test + 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) - XCTAssertEqual(value, instance.adPodInfo) + #expect(value == instance.adPodInfo) } - func testTraffickingParameters() { + @Test + 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) - XCTAssertEqual(value, instance.traffickingParameters) + #expect(value == instance.traffickingParameters) } - func testCreativeID() { + @Test + 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) - XCTAssertEqual(value, instance.creativeID) + #expect(value == instance.creativeID) } - func testCreativeAdID() { + @Test + 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) - XCTAssertEqual(value, instance.creativeAdID) + #expect(value == instance.creativeAdID) } - @MainActor func testUniversalAdIDs() { + @MainActor + @Test + 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) - XCTAssertEqual(value, instance.universalAdIDs) + #expect(value == instance.universalAdIDs) } - func testAdvertiserName() { + @Test + 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) - XCTAssertEqual(value, instance.advertiserName) + #expect(value == instance.advertiserName) } - func testSurveyURL() { + @Test + 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) - XCTAssertEqual(value, instance.surveyURL) + #expect(value == instance.surveyURL) } - func testDealID() { + @Test + 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) - XCTAssertEqual(value, instance.dealID) + #expect(value == instance.dealID) } - func testWrapperAdIDs() { + @Test + 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) - XCTAssertEqual(value, instance.wrapperAdIDs) + #expect(value == instance.wrapperAdIDs) } - func testWrapperCreativeIDs() { + @Test + 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) - XCTAssertEqual(value, instance.wrapperCreativeIDs) + #expect(value == instance.wrapperCreativeIDs) } - func testWrapperSystems() { + @Test + 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) - 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..bc99a184db72 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsLoaderTests.swift @@ -4,36 +4,36 @@ 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) let settings = IMASettings() settings.ppid = "ppid" - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api, settings: settings) - XCTAssertNotNil(instance) - XCTAssertEqual(instance?.settings.ppid, settings.ppid) + #expect(instance.settings.ppid == settings.ppid) } - func testContentComplete() { + @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) - XCTAssertTrue(instance.contentCompleteCalled) + #expect(instance.contentCompleteCalled) } - func testRequestAds() { + @Test func requestAds() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -43,13 +43,13 @@ final class AdsLoaderTests: XCTestCase { 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) - XCTAssertIdentical(instance.adsRequested, request) + #expect(instance.adsRequested === request) } - func testSetDelegate() { + @Test func setDelegate() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsLoader(registrar) @@ -57,10 +57,10 @@ final class AdsLoaderTests: XCTestCase { let delegate = AdsLoaderDelegateImpl( api: registrar.apiDelegate.pigeonApiIMAAdsLoaderDelegate(registrar)) - try? api.pigeonDelegate.setDelegate( + 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..2b2b85799ac9 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsManager(registrar) @@ -17,100 +18,100 @@ final class AdsManagerTests: XCTestCase { let delegate = AdsManagerDelegateImpl( api: registrar.apiDelegate.pigeonApiIMAAdsManagerDelegate(registrar)) - try? api.pigeonDelegate.setDelegate( + try api.pigeonDelegate.setDelegate( pigeonApi: api, pigeonInstance: instance, delegate: delegate) - XCTAssertIdentical(instance.delegate, delegate) + #expect(instance.delegate === delegate) } - func testInitialize() { + @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) - XCTAssertEqual(instance.renderingSettings, renderingSettings) + #expect(instance.renderingSettings == renderingSettings) } - func testStart() { + @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) - XCTAssertTrue(instance.startCalled) + #expect(instance.startCalled) } - func testPause() { + @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) - XCTAssertTrue(instance.pauseCalled) + #expect(instance.pauseCalled) } - func testSkip() { + @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) - XCTAssertTrue(instance.skipCalled) + #expect(instance.skipCalled) } - func testDiscardAdBreak() { + @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) - XCTAssertTrue(instance.discardAdBreakCalled) + #expect(instance.discardAdBreakCalled) } - func testResume() { + @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) - XCTAssertTrue(instance.resumeCalled) + #expect(instance.resumeCalled) } - func testDestroy() { + @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) - XCTAssertTrue(instance.destroyCalled) + #expect(instance.destroyCalled) } - func testAdCuePoints() { + @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) - XCTAssertEqual(value, [2.2, 3.3]) + #expect(value == [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..01d418a079d0 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRenderingSettingsTests.swift @@ -4,101 +4,102 @@ 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRenderingSettings(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( + let instance = try api.pigeonDelegate.pigeonDefaultConstructor( pigeonApi: api) - XCTAssertTrue(instance != nil) + #expect(instance != nil) } - func testSetMimeTypes() { + @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) - XCTAssertEqual(instance.mimeTypes, types) + #expect(instance.mimeTypes == types) } - func testSetBitrate() { + @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)) - XCTAssertEqual(instance.bitrate, bitrate) + #expect(instance.bitrate == bitrate) } - func testSetLoadVideoTimeout() { + @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) - XCTAssertEqual(instance.loadVideoTimeout, seconds) + #expect(instance.loadVideoTimeout == seconds) } - func testSetPlayAdsAfterTime() { + @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) - XCTAssertEqual(instance.playAdsAfterTime, seconds) + #expect(instance.playAdsAfterTime == seconds) } - func testSetUIElements() { + @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) - 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() 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) - XCTAssertTrue(instance.enablePreloading) + #expect(instance.enablePreloading) } - func testSetLinkOpenerPresentingController() { + @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) - 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..745d1ed49a4b 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/AdsRequestTests.swift @@ -4,70 +4,61 @@ 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() 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) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adTagUrl, - "adTag?&request_agent=Flutter-IMA-\(AdsRequestProxyAPIDelegate.pluginVersion)") - XCTAssertIdentical(instance?.adDisplayContainer, container) + #expect( + instance.adTagUrl + == "adTag?&request_agent=Flutter-IMA-\(AdsRequestProxyAPIDelegate.pluginVersion)") + #expect(instance.adDisplayContainer === container) } - func testPigeonDefaultConstructorDoesNotAddRequestAgentToIncompatibleURLs() { + @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) - XCTAssertNotNil(instance) - XCTAssertEqual( - 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) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adTagUrl, - "adTag#?") + #expect(instance.adTagUrl == "adTag#?") } - func testWithAdsResponse() { + @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) - XCTAssertNotNil(instance) - XCTAssertEqual( - instance?.adsResponse, - "response") - XCTAssertIdentical(instance?.adDisplayContainer, container) + #expect(instance.adsResponse == "response") + #expect(instance.adDisplayContainer === container) } - func testGetAdTagUrl() { + @Test func getAdTagUrl() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -78,12 +69,12 @@ final class AdsRequestTests: XCTestCase { 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) - XCTAssertEqual(value, adTagUrl) + #expect(value == adTagUrl) } - func testGetAdsResponse() { + @Test func getAdsResponse() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -94,12 +85,12 @@ final class AdsRequestTests: XCTestCase { 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) - XCTAssertEqual(value, adsResponse) + #expect(value == adsResponse) } - func testGetAdDisplayContainer() { + @Test func getAdDisplayContainer() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -109,13 +100,13 @@ final class AdsRequestTests: XCTestCase { adTagUrl: "url", adDisplayContainer: container, contentPlayhead: contentPlayhead, userContext: nil) - let value = try? api.pigeonDelegate.getAdDisplayContainer( + let value = try api.pigeonDelegate.getAdDisplayContainer( pigeonApi: api, pigeonInstance: instance) - XCTAssertEqual(value, container) + #expect(value == container) } - func testSetAdWillAutoPlay() { + @Test func setAdWillAutoPlay() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -126,13 +117,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let adWillAutoPlay = true - try? api.pigeonDelegate.setAdWillAutoPlay( + try api.pigeonDelegate.setAdWillAutoPlay( pigeonApi: api, pigeonInstance: instance, adWillAutoPlay: adWillAutoPlay) - XCTAssertEqual(instance.adWillAutoPlay, adWillAutoPlay) + #expect(instance.adWillAutoPlay == adWillAutoPlay) } - func testSetAdWillPlayMuted() { + @Test func setAdWillPlayMuted() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -143,13 +134,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let adWillPlayMuted = false - try? api.pigeonDelegate.setAdWillPlayMuted( + try api.pigeonDelegate.setAdWillPlayMuted( pigeonApi: api, pigeonInstance: instance, adWillPlayMuted: adWillPlayMuted) - XCTAssertEqual(instance.adWillPlayMuted, adWillPlayMuted) + #expect(instance.adWillPlayMuted == adWillPlayMuted) } - func testSetContinuousPlayback() { + @Test func setContinuousPlayback() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -160,13 +151,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let continuousPlayback = true - try? api.pigeonDelegate.setContinuousPlayback( + try api.pigeonDelegate.setContinuousPlayback( pigeonApi: api, pigeonInstance: instance, continuousPlayback: continuousPlayback) - XCTAssertEqual(instance.continuousPlayback, continuousPlayback) + #expect(instance.continuousPlayback == continuousPlayback) } - func testSetContentDuration() { + @Test func setContentDuration() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -177,13 +168,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let duration = 3.0 - try? api.pigeonDelegate.setContentDuration( + 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -194,13 +185,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let keywords = ["hello"] - try? api.pigeonDelegate.setContentKeywords( + try api.pigeonDelegate.setContentKeywords( pigeonApi: api, pigeonInstance: instance, keywords: keywords) - XCTAssertEqual(instance.contentKeywords, keywords) + #expect(instance.contentKeywords == keywords) } - func testSetContentTitle() { + @Test func setContentTitle() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -211,12 +202,12 @@ final class AdsRequestTests: XCTestCase { 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) - XCTAssertEqual(instance.contentTitle, title) + #expect(instance.contentTitle == title) } - func testSetContentURL() { + @Test func setContentURL() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -227,13 +218,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let contentURL = "https://www.google.com" - try? api.pigeonDelegate.setContentURL( + 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -244,13 +235,13 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let timeout = 3.0 - try? api.pigeonDelegate.setVastLoadTimeout( + 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAAdsRequest(registrar) @@ -261,9 +252,9 @@ final class AdsRequestTests: XCTestCase { userContext: nil) let seconds = 3.0 - try? api.pigeonDelegate.setLiveStreamPrefetchSeconds( + 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..7b5a06ddc802 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() 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) - XCTAssertEqual(value, instance.resourceValue) + #expect(value == instance.resourceValue) } - func testApiFramework() { + @Test + 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) - XCTAssertEqual(value, instance.apiFramework) + #expect(value == instance.apiFramework) } - func testWidth() { + @Test + 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) - XCTAssertEqual(value, Int64(instance.width)) + #expect(value == Int64(instance.width)) } - func testHeight() { + @Test + 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) - 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..3855a0fb4366 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionAdSlotProxyApiTests.swift @@ -4,55 +4,60 @@ 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() 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) - XCTAssertEqual(value, instance.view) + #expect(value == instance.view) } - func testSetDelegate() { + @Test + 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) - 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..8bc2a143f63a 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/CompanionDelegateProxyApiTests.swift @@ -4,37 +4,40 @@ 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMACompanionDelegate(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - XCTAssertNotNil(instance) + let instance = try #require(try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api)) } - 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..91c366f12d44 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ContentPlayheadTests.swift @@ -4,29 +4,28 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -final class ContentPlayheadTests: XCTestCase { - func testPigeonDefaultConstructor() { +struct ContentPlayheadTests { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMAContentPlayhead(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api) - - XCTAssertNotNil(instance) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api)) } - func testSetCurrentTime() { + @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) - 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..f5233bf6a174 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/FriendlyObstructionTests.swift @@ -4,63 +4,62 @@ 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() throws { 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) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api, view: UIView(), purpose: .mediaControls, detailedReason: "myString")) } - 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() 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) - XCTAssertEqual(value, instance.view) + #expect(value == instance.view) } - func testPurpose() { + @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) - XCTAssertEqual(value, FriendlyObstructionPurpose.closeAd) + #expect(value == FriendlyObstructionPurpose.closeAd) } - func testDetailedReason() { + @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) - 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..9beafd97b572 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/SettingsTests.swift @@ -4,157 +4,156 @@ import Flutter import GoogleInteractiveMediaAds -import XCTest +import Testing @testable import interactive_media_ads -class SettingsTests: XCTestCase { - func testPigeonDefaultConstructor() { +struct SettingsTests { + @Test func pigeonDefaultConstructor() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiIMASettings(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) - XCTAssertNotNil(instance) + let instance = try api.pigeonDelegate.pigeonDefaultConstructor(pigeonApi: api) } - func testSetPPID() { + @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) - XCTAssertEqual(instance.ppid, ppid) + #expect(instance.ppid == ppid) } - func testSetLanguage() { + @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) - XCTAssertEqual(instance.language, language) + #expect(instance.language == language) } - func testSetMaxRedirects() { + @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)) - XCTAssertEqual(instance.maxRedirects, UInt(max)) + #expect(instance.maxRedirects == UInt(max)) } - func testSetFeatureFlags() { + @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) - XCTAssertEqual(instance.featureFlags, flags) + #expect(instance.featureFlags == flags) } - func testSetEnableBackgroundPlayback() { + @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) - XCTAssertEqual(instance.enableBackgroundPlayback, enabled) + #expect(instance.enableBackgroundPlayback == enabled) } - func testSetAutoPlayAdBreaks() { + @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) - XCTAssertEqual(instance.autoPlayAdBreaks, autoPlay) + #expect(instance.autoPlayAdBreaks == autoPlay) } - func testSetDisableNowPlayingInfo() { + @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) - XCTAssertEqual(instance.disableNowPlayingInfo, disable) + #expect(instance.disableNowPlayingInfo == disable) } - func testSetPlayerType() { + @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) - XCTAssertEqual(instance.playerType, type) + #expect(instance.playerType == type) } - func testSetPlayerVersion() { + @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) - XCTAssertEqual(instance.playerVersion, version) + #expect(instance.playerVersion == version) } - func testSetSessionID() { + @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) - XCTAssertEqual(instance.sessionID, sessionID) + #expect(instance.sessionID == sessionID) } - func testSetSameAppKeyEnabled() { + @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) - XCTAssertEqual(instance.sameAppKeyEnabled, enabled) + #expect(instance.sameAppKeyEnabled == enabled) } - func testSetEnableDebugMode() { + @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) - 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..058e251a8704 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() 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) - XCTAssertEqual(value, instance.adIDValue) + #expect(value == instance.adIDValue) } - func testAdIDRegistry() { + @Test + 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) - 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..e088515f3c6c 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ViewControllerTests.swift @@ -3,38 +3,36 @@ // 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIViewController(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api) - - XCTAssertNotNil(instance) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api)) } - func testView() { + @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) - - XCTAssertNotNil(view) + let view = try #require(try api.pigeonDelegate.view(pigeonApi: api, pigeonInstance: instance)) } - 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..78371754ee4a 100644 --- a/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift +++ b/packages/interactive_media_ads/example/ios/RunnerTests/ViewTests.swift @@ -3,18 +3,18 @@ // 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() throws { let registrar = TestProxyApiRegistrar() let api = registrar.apiDelegate.pigeonApiUIView(registrar) - let instance = try? api.pigeonDelegate.pigeonDefaultConstructor( - pigeonApi: api) - - XCTAssertNotNil(instance) + let instance = try #require( + try api.pigeonDelegate.pigeonDefaultConstructor( + pigeonApi: api)) } }