Skip to content

Port, PortMessage: Rename sendBeforeDate(...) to send(before: Date...) #2690

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 1 commit into from
Mar 4, 2020
Merged

Port, PortMessage: Rename sendBeforeDate(...) to send(before: Date...) #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Sources/Foundation/Port.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ open class Port : NSObject, NSCopying {
return 0
}

open func sendBeforeDate(_ limitDate: Date, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
open func send(before limitDate: Date, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
NSRequiresConcreteImplementation()
}

open func sendBeforeDate(_ limitDate: Date, msgid msgID: Int, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
return sendBeforeDate(limitDate, components: components, from: receivePort, reserved: headerSpaceReserved)
open func send(before limitDate: Date, msgid msgID: Int, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
return send(before: limitDate, components: components, from: receivePort, reserved: headerSpaceReserved)
}
}

Expand Down Expand Up @@ -946,11 +946,11 @@ open class SocketPort : Port {
}
}

open override func sendBeforeDate(_ limitDate: Date, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
sendBeforeDate(limitDate, msgid: 0, components: components, from: receivePort, reserved: headerSpaceReserved)
open override func send(before limitDate: Date, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
send(before: limitDate, msgid: 0, components: components, from: receivePort, reserved: headerSpaceReserved)
}

open override func sendBeforeDate(_ limitDate: Date, msgid msgID: Int, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
open override func send(before limitDate: Date, msgid msgID: Int, components: NSMutableArray?, from receivePort: Port?, reserved headerSpaceReserved: Int) -> Bool {
guard let sender = sendingSocket(for: self, before: limitDate.timeIntervalSinceReferenceDate),
let signature = core.signature.darwinCompatibleDataRepresentation else {
return false
Expand Down
4 changes: 2 additions & 2 deletions Sources/Foundation/PortMessage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ open class PortMessage : NSObject, NSCopying {
open private(set) var receivePort: Port?
open private(set) var sendPort: Port?

open func sendBeforeDate(_ date: Date) -> Bool {
return sendPort?.sendBeforeDate(date, msgid: Int(msgid), components: NSMutableArray(array: components ?? []), from: receivePort, reserved: 0) ?? false
open func send(before date: Date) -> Bool {
return sendPort?.send(before: date, msgid: Int(msgid), components: NSMutableArray(array: components ?? []), from: receivePort, reserved: 0) ?? false
}

public func copy(with zone: NSZone?) -> Any {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Foundation/Tests/TestSocketPort.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class TestSocketPort : XCTestCase {
remote.remove(from: .main, forMode: .default)
}

let sent = remote.sendBeforeDate(Date(timeIntervalSinceNow: 5), components: NSMutableArray(array: [data]), from: nil, reserved: 0)
let sent = remote.send(before: Date(timeIntervalSinceNow: 5), components: NSMutableArray(array: [data]), from: nil, reserved: 0)
XCTAssertTrue(sent)

waitForExpectations(timeout: 5.5)
Expand Down