Skip to content

[pigeon] Run swift-format on ungenerated example app Swift files #5934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 19, 2024
Merged

[pigeon] Run swift-format on ungenerated example app Swift files #5934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eafc7f9
[pigeon] Run swift-format on example app Swift files
jmagman Jan 19, 2024
a0536e9
Revert CHANGELOG
jmagman Jan 19, 2024
a31df18
Fix README snippets
jmagman Jan 19, 2024
b700ad2
Missed a snippet
jmagman Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/pigeon/example/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ private class PigeonApiImplementation: ExampleHostApi {
}

func add(_ a: Int64, to b: Int64) throws -> Int64 {
if (a < 0 || b < 0) {
throw FlutterError(code: "code", message: "message", details: "details");
if a < 0 || b < 0 {
throw FlutterError(code: "code", message: "message", details: "details")
}
return a + b
}

func sendMessage(message: MessageData, completion: @escaping (Result<Bool, Error>) -> Void) {
if (message.code == Code.one) {
if message.code == Code.one {
completion(.failure(FlutterError(code: "code", message: "message", details: "details")))
return
}
Expand Down Expand Up @@ -237,7 +237,9 @@ private class PigeonFlutterApi {
flutterAPI = MessageFlutterApi(binaryMessenger: binaryMessenger)
}

func callFlutterMethod(aString aStringArg: String?, completion: @escaping (Result<String, Error>) -> Void) {
func callFlutterMethod(
aString aStringArg: String?, completion: @escaping (Result<String, Error>) -> Void
) {
flutterAPI.flutterMethod(aString: aStringArg) {
completion(.success($0))
}
Expand Down
10 changes: 6 additions & 4 deletions packages/pigeon/example/app/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ private class PigeonApiImplementation: ExampleHostApi {
}

func add(_ a: Int64, to b: Int64) throws -> Int64 {
if (a < 0 || b < 0) {
throw FlutterError(code: "code", message: "message", details: "details");
if a < 0 || b < 0 {
throw FlutterError(code: "code", message: "message", details: "details")
}
Comment on lines +18 to 20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the changed line of code from the README

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thank you!

return a + b
}

func sendMessage(message: MessageData, completion: @escaping (Result<Bool, Error>) -> Void) {
if (message.code == Code.one) {
if message.code == Code.one {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This too actually

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

completion(.failure(FlutterError(code: "code", message: "message", details: "details")))
return
}
Expand All @@ -39,7 +39,9 @@ private class PigeonFlutterApi {
flutterAPI = MessageFlutterApi(binaryMessenger: binaryMessenger)
}

func callFlutterMethod(aString aStringArg: String?, completion: @escaping (Result<String, Error>) -> Void) {
func callFlutterMethod(
aString aStringArg: String?, completion: @escaping (Result<String, Error>) -> Void
) {
flutterAPI.flutterMethod(aString: aStringArg) {
completion(.success($0))
}
Expand Down
2 changes: 1 addition & 1 deletion ...platform_tests/alternate_language_test_plugin/example/macos/RunnerTests/RunnerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import FlutterMacOS
import Cocoa
import FlutterMacOS
import XCTest

@testable import alternate_language_test_plugin
Expand Down
2 changes: 1 addition & 1 deletion packages/pigeon/platform_tests/test_plugin/example/ios/Runner/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import UIKit
import Flutter
import UIKit

@UIApplicationMain
@objc class AppDelegate: FlutterAppDelegate {
Expand Down
83 changes: 42 additions & 41 deletions packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AllDatatypesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import Flutter
import XCTest

@testable import test_plugin

class AllDatatypesTests: XCTestCase {
Expand All @@ -17,25 +18,25 @@ class AllDatatypesTests: XCTestCase {

api.echoNullable(everything) { result in
switch result {
case .success(let res) :
XCTAssertNotNil(res)
XCTAssertNil(res!.aNullableBool)
XCTAssertNil(res!.aNullableInt)
XCTAssertNil(res!.aNullableDouble)
XCTAssertNil(res!.aNullableString)
XCTAssertNil(res!.aNullableByteArray)
XCTAssertNil(res!.aNullable4ByteArray)
XCTAssertNil(res!.aNullable8ByteArray)
XCTAssertNil(res!.aNullableFloatArray)
XCTAssertNil(res!.aNullableList)
XCTAssertNil(res!.aNullableMap)
XCTAssertNil(res!.nullableNestedList)
XCTAssertNil(res!.nullableMapWithAnnotations)
XCTAssertNil(res!.nullableMapWithObject)
expectation.fulfill()
case .failure(_) :
return
case .success(let res):
XCTAssertNotNil(res)
XCTAssertNil(res!.aNullableBool)
XCTAssertNil(res!.aNullableInt)
XCTAssertNil(res!.aNullableDouble)
XCTAssertNil(res!.aNullableString)
XCTAssertNil(res!.aNullableByteArray)
XCTAssertNil(res!.aNullable4ByteArray)
XCTAssertNil(res!.aNullable8ByteArray)
XCTAssertNil(res!.aNullableFloatArray)
XCTAssertNil(res!.aNullableList)
XCTAssertNil(res!.aNullableMap)
XCTAssertNil(res!.nullableNestedList)
XCTAssertNil(res!.nullableMapWithAnnotations)
XCTAssertNil(res!.nullableMapWithObject)
expectation.fulfill()
case .failure(_):
return

}
}

Expand All @@ -55,36 +56,36 @@ class AllDatatypesTests: XCTestCase {
aNullableMap: ["hello": 1234],
nullableNestedList: [[true, false], [true]],
nullableMapWithAnnotations: ["hello": "world"],
nullableMapWithObject: ["hello": 1234, "goodbye" : "world"],
nullableMapWithObject: ["hello": 1234, "goodbye": "world"],
aNullableString: "123"
)

let binaryMessenger = EchoBinaryMessenger(codec: FlutterIntegrationCoreApiCodec.shared)
let api = FlutterIntegrationCoreApi(binaryMessenger: binaryMessenger)

let expectation = XCTestExpectation(description: "callback")

api.echoNullable(everything) { result in
switch result {
case .success(let res) :
XCTAssertNotNil(res)
XCTAssertEqual(res!.aNullableBool, everything.aNullableBool)
XCTAssertEqual(res!.aNullableInt, everything.aNullableInt)
XCTAssertEqual(res!.aNullableDouble, everything.aNullableDouble)
XCTAssertEqual(res!.aNullableString, everything.aNullableString)
XCTAssertEqual(res!.aNullableByteArray, everything.aNullableByteArray)
XCTAssertEqual(res!.aNullable4ByteArray, everything.aNullable4ByteArray)
XCTAssertEqual(res!.aNullable8ByteArray, everything.aNullable8ByteArray)
XCTAssertEqual(res!.aNullableFloatArray, everything.aNullableFloatArray)
XCTAssert(equalsList(res!.aNullableList, everything.aNullableList))
XCTAssert(equalsDictionary(res!.aNullableMap, everything.aNullableMap))
XCTAssertEqual(res!.nullableNestedList, everything.nullableNestedList)
XCTAssertEqual(res!.nullableMapWithAnnotations, everything.nullableMapWithAnnotations)
XCTAssert(equalsDictionary(res!.nullableMapWithObject, everything.nullableMapWithObject))
expectation.fulfill()
return
case .failure(_) :
return
switch result {
case .success(let res):
XCTAssertNotNil(res)
XCTAssertEqual(res!.aNullableBool, everything.aNullableBool)
XCTAssertEqual(res!.aNullableInt, everything.aNullableInt)
XCTAssertEqual(res!.aNullableDouble, everything.aNullableDouble)
XCTAssertEqual(res!.aNullableString, everything.aNullableString)
XCTAssertEqual(res!.aNullableByteArray, everything.aNullableByteArray)
XCTAssertEqual(res!.aNullable4ByteArray, everything.aNullable4ByteArray)
XCTAssertEqual(res!.aNullable8ByteArray, everything.aNullable8ByteArray)
XCTAssertEqual(res!.aNullableFloatArray, everything.aNullableFloatArray)
XCTAssert(equalsList(res!.aNullableList, everything.aNullableList))
XCTAssert(equalsDictionary(res!.aNullableMap, everything.aNullableMap))
XCTAssertEqual(res!.nullableNestedList, everything.nullableNestedList)
XCTAssertEqual(res!.nullableMapWithAnnotations, everything.nullableMapWithAnnotations)
XCTAssert(equalsDictionary(res!.nullableMapWithObject, everything.nullableMapWithObject))
expectation.fulfill()
return
case .failure(_):
return
}
}
wait(for: [expectation], timeout: 1.0)
Expand Down
23 changes: 13 additions & 10 deletions packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/AsyncHandlersTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// found in the LICENSE file.
import Flutter
import XCTest

@testable import test_plugin

class MockHostSmallApi: HostSmallApi {
Expand All @@ -27,20 +28,21 @@ class AsyncHandlersTest: XCTestCase {

let expectation = XCTestExpectation(description: "callback")
flutterApi.echo(value) { result in
switch result {
case .success(let res) :
XCTAssertEqual(res, value)
expectation.fulfill()
case .failure(_) :
return
switch result {
case .success(let res):
XCTAssertEqual(res, value)
expectation.fulfill()
case .failure(_):
return
}

}
wait(for: [expectation], timeout: 1.0)
}

func testAsyncFlutter2HostVoidVoid() throws {
let binaryMessenger = MockBinaryMessenger<String>(codec: FlutterStandardMessageCodec.sharedInstance())
let binaryMessenger = MockBinaryMessenger<String>(
codec: FlutterStandardMessageCodec.sharedInstance())
let mockHostSmallApi = MockHostSmallApi()
HostSmallApiSetup.setUp(binaryMessenger: binaryMessenger, api: mockHostSmallApi)
let channelName = "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid"
Expand All @@ -49,14 +51,15 @@ class AsyncHandlersTest: XCTestCase {
let expectation = XCTestExpectation(description: "voidvoid callback")
binaryMessenger.handlers[channelName]?(nil) { data in
let outputList = binaryMessenger.codec.decode(data) as? [Any]
XCTAssertEqual(outputList?.first as! NSNull, NSNull())
XCTAssertEqual(outputList?.first as! NSNull, NSNull())
expectation.fulfill()
}
wait(for: [expectation], timeout: 1.0)
}

func testAsyncFlutter2Host() throws {
let binaryMessenger = MockBinaryMessenger<String>(codec: FlutterStandardMessageCodec.sharedInstance())
let binaryMessenger = MockBinaryMessenger<String>(
codec: FlutterStandardMessageCodec.sharedInstance())
let mockHostSmallApi = MockHostSmallApi()
let value = "Test"
mockHostSmallApi.output = value
Expand All @@ -69,7 +72,7 @@ class AsyncHandlersTest: XCTestCase {
let expectation = XCTestExpectation(description: "echo callback")
binaryMessenger.handlers[channelName]?(inputEncoded) { data in
let outputList = binaryMessenger.codec.decode(data) as? [Any]
let output = outputList?.first as? String
let output = outputList?.first as? String
XCTAssertEqual(output, value)
expectation.fulfill()
}
Expand Down
23 changes: 12 additions & 11 deletions packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/EchoBinaryMessenger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import Foundation
import Flutter
import Foundation

class EchoBinaryMessenger: NSObject, FlutterBinaryMessenger {
let codec: FlutterMessageCodec
private(set) var count = 0
var defaultReturn: Any?

init(codec: FlutterMessageCodec) {
self.codec = codec
super.init()
}

func send(onChannel channel: String, message: Data?) {
// Method not implemented because this messenger is just for echoing
}

func send(
onChannel channel: String,
message: Data?,
binaryReply callback: FlutterBinaryReply? = nil
) {
guard let callback = callback else { return }

guard
let args = self.codec.decode(message) as? [Any?],
let firstArg = args.first,
Expand All @@ -34,20 +34,21 @@ class EchoBinaryMessenger: NSObject, FlutterBinaryMessenger {
callback(self.defaultReturn.flatMap { self.codec.encode([$0]) })
return
}

callback(self.codec.encode([castedFirstArg]))
}

func setMessageHandlerOnChannel(
_ channel: String, binaryMessageHandler handler:
FlutterBinaryMessageHandler? = nil
_ channel: String,
binaryMessageHandler handler:
FlutterBinaryMessageHandler? = nil
) -> FlutterBinaryMessengerConnection {
self.count += 1
return FlutterBinaryMessengerConnection(self.count)
}

func cleanUpConnection(_ connection: FlutterBinaryMessengerConnection) {
// Method not implemented because this messenger is just for echoing
// Method not implemented because this messenger is just for echoing
}

private func nilOrValue<T>(_ value: Any?) -> T? {
Expand Down
13 changes: 7 additions & 6 deletions packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/EnumTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// found in the LICENSE file.

import XCTest

@testable import test_plugin

class MockEnumApi2Host: EnumApi2Host {
Expand Down Expand Up @@ -32,7 +33,7 @@ class EnumTests: XCTestCase {
binaryMessenger.handlers[channelName]?(inputEncoded) { data in
let outputMap = binaryMessenger.codec.decode(data) as? [Any]
XCTAssertNotNil(outputMap)

let output = outputMap?.first as? DataWithEnum
XCTAssertEqual(output, input)
XCTAssertTrue(outputMap?.count == 1)
Expand All @@ -49,11 +50,11 @@ class EnumTests: XCTestCase {
let expectation = XCTestExpectation(description: "callback")
api.echo(data: data) { result in
switch result {
case .success(let res) :
XCTAssertEqual(res.state, res.state)
expectation.fulfill()
case .failure(_) :
return
case .success(let res):
XCTAssertEqual(res.state, res.state)
expectation.fulfill()
case .failure(_):
return
}
}
wait(for: [expectation], timeout: 1.0)
Expand Down
Loading