Skip to content

Commit

Permalink
Apply swiftlint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
woin2ee committed Sep 27, 2023
1 parent 012817e commit 87643ed
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 55 deletions.
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ let package = Package(
.library(
name: "RxUtility-Dynamic",
type: .dynamic,
targets: ["RxUtility"]),
targets: ["RxUtility"])
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.6.0"),
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.6.0")
],
targets: [
.target(
name: "RxUtility",
dependencies: [
.product(name: "RxSwift", package: "RxSwift"),
.product(name: "RxCocoa", package: "RxSwift"),
.product(name: "RxCocoa", package: "RxSwift")
]
),
.testTarget(
Expand All @@ -29,6 +29,6 @@ let package = Package(
.product(name: "RxTest", package: "RxSwift"),
.product(name: "RxBlocking", package: "RxSwift")
]
),
)
]
)
4 changes: 2 additions & 2 deletions Sources/RxUtility/Error.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

enum RxUtilityError: Error {

case nilValue(objectType: Any.Type)

}
54 changes: 27 additions & 27 deletions Sources/RxUtility/RxUtility.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,109 +9,109 @@ import RxSwift
import RxCocoa

extension ObservableConvertibleType {

public func asDriverOnErrorJustComplete() -> Driver<Element> {
return self.asDriver(onErrorDriveWith: .empty())
}

public func asSignalOnErrorJustComplete() -> Signal<Element> {
return self.asSignal(onErrorSignalWith: .empty())
}

}

extension ObservableConvertibleType where Element == Void {

public func asDriverOnErrorJustNext() -> Driver<Element> {
return self.asDriver(onErrorJustReturn: ())
}

public func asSignalOnErrorJustNext() -> Signal<Element> {
return self.asSignal(onErrorJustReturn: ())
}

}

extension ObservableType {

public func mapToVoid() -> Observable<Void> {
return self.map { _ in }
}

public func mapToAny() -> Observable<Any> {
return self.map { $0 as Any }
}

public func doOnNext(_ block: ((Element) throws -> Void)?) -> Observable<Element> {
return self.do(onNext: block)
}

public func doOnCompleted(_ block: (() throws -> Void)?) -> Observable<Element> {
return self.do(onCompleted: block)
}

public func unwrapOrThrow<Result>() -> Observable<Result> where Element == Result? {
return self.map { try RxUtility.unwrapOrThrow($0) }
}

}

extension SharedSequenceConvertibleType {

public func mapToVoid() -> SharedSequence<SharingStrategy, Void> {
return self.map { _ in }
}

public func mapToAny() -> SharedSequence<SharingStrategy, Any> {
return self.map { $0 as Any }
}

public func doOnNext(_ block: ((Element) -> Void)?) -> SharedSequence<SharingStrategy, Element> {
return self.do(onNext: block)
}

public func doOnCompleted(_ block: (() -> Void)?) -> SharedSequence<SharingStrategy, Element> {
return self.do(onCompleted: block)
}

public func startWith(_ block: () -> Element) -> SharedSequence<SharingStrategy, Element> {
return startWith(block())
}

}

extension PrimitiveSequenceType where Trait == SingleTrait {

public func mapToVoid() -> PrimitiveSequence<Trait, Void> {
return self.map { _ in }
}

public func mapToAny() -> PrimitiveSequence<Trait, Any> {
return self.map { $0 as Any }
}

public func doOnSuccess(_ block: ((Element) throws -> Void)?) -> PrimitiveSequence<Trait, Element> {
return self.do(onSuccess: block)
}

public func unwrapOrThrow<Result>() -> PrimitiveSequence<Trait, Result> where Element == Result? {
return self.map { try RxUtility.unwrapOrThrow($0) }
}

}

extension PrimitiveSequenceType where Trait == MaybeTrait {

public func mapToVoid() -> PrimitiveSequence<Trait, Void> {
return self.map { _ in }
}

}

extension PrimitiveSequenceType where Trait == CompletableTrait, Element == Never {

public func andThenJustNext() -> Single<Void> {
return self.andThen(.just(()))
}

}
32 changes: 16 additions & 16 deletions Tests/RxUtilityTests/RxUtilityTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ import RxTest
import XCTest

final class RxUtilityTests: XCTestCase {

var disposeBag: DisposeBag!

var testScheduler: TestScheduler!

let errorEmitTime = 300

override func setUpWithError() throws {
try super.setUpWithError()
disposeBag = .init()
testScheduler = .init(initialClock: 0)
}

override func tearDownWithError() throws {
try super.tearDownWithError()
disposeBag = nil
testScheduler = nil
}

func test_asDriverOnErrorJustComplete() {
// Arrange
let errorTrigger: TestableObservable<Int> = testScheduler.createHotObservable([.error(errorEmitTime, TestingError.testingError)])
Expand All @@ -34,7 +34,7 @@ final class RxUtilityTests: XCTestCase {
// Assert
XCTAssertEqual(result.events, [Recorded.completed(errorEmitTime, Int.self)])
}

func test_asSignalOnErrorJustComplete() {
// Arrange
let errorTrigger: TestableObservable<Int> = testScheduler.createHotObservable([.error(errorEmitTime, TestingError.testingError)])
Expand All @@ -45,7 +45,7 @@ final class RxUtilityTests: XCTestCase {
// Assert
XCTAssertEqual(result.events, [Recorded.completed(errorEmitTime, Int.self)])
}

func test_asDriverOnErrorJustNext() {
// Arrange
let errorTrigger: TestableObservable<Void> = testScheduler.createHotObservable([.error(errorEmitTime, TestingError.testingError)])
Expand All @@ -56,7 +56,7 @@ final class RxUtilityTests: XCTestCase {
// Assert
XCTAssertContainsRecordedElement(result.events, Recorded.next(errorEmitTime, ()))
}

func test_asSignalOnErrorJustNext() {
// Arrange
let errorTrigger: TestableObservable<Void> = testScheduler.createHotObservable([.error(errorEmitTime, TestingError.testingError)])
Expand All @@ -67,33 +67,33 @@ final class RxUtilityTests: XCTestCase {
// Assert
XCTAssertContainsRecordedElement(result.events, Recorded.next(errorEmitTime, ()))
}

func test_mapToAnyAtSingle() throws {
// Arrange
let singleSequence: Single<Int> = .just(3)

// Act
let anyElement = try singleSequence
.mapToAny()
.toBlocking()
.single()

// Assert
XCTAssertEqual(anyElement as? Int, 3)
}

func test_mapToAnyAtObservableType() throws {
// Arrange
let observableSequence: Observable<Int> = .just(3)

// Act
let anyElement = try observableSequence
.mapToAny()
.toBlocking()
.single()

// Assert
XCTAssertEqual(anyElement as? Int, 3)
}

}
4 changes: 2 additions & 2 deletions Tests/RxUtilityTests/TestingError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

enum TestingError: Error {

case testingError

}
8 changes: 4 additions & 4 deletions Tests/RxUtilityTests/XCTest+Rx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func XCTAssertRecordedElements(_ stream: [Recorded<Event<Void>>], _ elements: [V
#endif
return
}

let equatableStream = stream.map { event in
switch event.value {
case .next:
Expand All @@ -29,7 +29,7 @@ func XCTAssertRecordedElements(_ stream: [Recorded<Event<Void>>], _ elements: [V
}
}
let equatableElements = elements.map { true }

XCTAssertRecordedElements(equatableStream, equatableElements, file: file, line: line)
}

Expand Down Expand Up @@ -57,13 +57,13 @@ func XCTAssertContainsRecordedElement(_ stream: [Recorded<Event<Void>>], _ eleme
}
}()
)

#if os(Linux)
XCTAssert(equatableStream.contains(equatableElement))
#else
XCTAssert(equatableStream.contains(equatableElement), file: file, line: line)
#endif

if !equatableStream.contains(equatableElement) {
print("In stream :")
print(stream)
Expand Down

0 comments on commit 87643ed

Please sign in to comment.