Adds missing trimOutput parameter to SharedSequence.debug.

kzaher · kzaher · commit fe10e966d3bb · 2017-04-30T01:05:29.000+02:00
diff --git a/RxCocoa/Traits/SharedSequence/SharedSequence+Operators.swift b/RxCocoa/Traits/SharedSequence/SharedSequence+Operators.swift
@@ -133,9 +133,9 @@ extension SharedSequenceConvertibleType {
     - parameter identifier: Identifier that is printed together with event description to standard output.
     - returns: An observable sequence whose events are printed to standard output.
     */
-    public func debug(_ identifier: String? = nil, file: String = #file, line: UInt = #line, function: String = #function) -> SharedSequence<SharingStrategy, E> {
+    public func debug(_ identifier: String? = nil, trimOutput: Bool = false, file: String = #file, line: UInt = #line, function: String = #function) -> SharedSequence<SharingStrategy, E> {
         let source = self.asObservable()
-            .debug(identifier, file: file, line: line, function: function)
+            .debug(identifier, trimOutput: trimOutput, file: file, line: line, function: function)
         return SharedSequence(source)
     }
 }
diff --git a/Sources/AllTestz/main.swift b/Sources/AllTestz/main.swift
@@ -544,6 +544,7 @@ final class DriverTest_ : DriverTest, RxTestCase {
     ("testAsDriver_mergeSync", DriverTest.testAsDriver_mergeSync),
     ("testAsDriver_merge", DriverTest.testAsDriver_merge),
     ("testAsDriver_merge2", DriverTest.testAsDriver_merge2),
+    ("testAsDriver_debug", DriverTest.testAsDriver_debug),
     ("testAsDriver_debounce", DriverTest.testAsDriver_debounce),
     ("testAsDriver_throttle", DriverTest.testAsDriver_throttle),
     ("testAsDriver_throttle2", DriverTest.testAsDriver_throttle2),
diff --git a/Tests/RxCocoaTests/Driver+Test.swift b/Tests/RxCocoaTests/Driver+Test.swift
@@ -779,6 +779,25 @@ extension DriverTest {
     }
 }
 
+// MARK: debug
+extension DriverTest {
+    func testAsDriver_debug() {
+        let hotObservable = BackgroundThreadPrimitiveHotObservable<Int>()
+        let driver = hotObservable.asDriver(onErrorJustReturn: -1).debug("a", trimOutput: false)
+
+        let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
+            XCTAssertTrue(hotObservable.subscriptions == [SubscribedToHotObservable])
+
+            hotObservable.on(.next(1))
+            hotObservable.on(.error(testError))
+
+            XCTAssertTrue(hotObservable.subscriptions == [UnsunscribedFromHotObservable])
+        }
+
+        XCTAssertEqual(results, [1, -1])
+    }
+}
+
 // MARK: debounce
 extension DriverTest {
     func testAsDriver_debounce() {
diff --git a/Tests/RxSwiftTests/PrimitiveSequenceTest.swift b/Tests/RxSwiftTests/PrimitiveSequenceTest.swift
@@ -1093,7 +1093,7 @@ extension PrimitiveSequenceTest {
 extension PrimitiveSequenceTest {
     func testDebug_producesSingleElement() {
         let singleResult: Single<Int> = Single.just(1)
-            .debug()
+            .debug("a", trimOutput: false)
 
         let result = try! singleResult
             .toBlocking().first()!

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,9 @@ extension SharedSequenceConvertibleType {`
`133`	`133`	`- parameter identifier: Identifier that is printed together with event description to standard output.`
`134`	`134`	`- returns: An observable sequence whose events are printed to standard output.`
`135`	`135`	`*/`
`136`		`- public func debug(_ identifier: String? = nil, file: String = #file, line: UInt = #line, function: String = #function) -> SharedSequence<SharingStrategy, E> {`
	`136`	`+ public func debug(_ identifier: String? = nil, trimOutput: Bool = false, file: String = #file, line: UInt = #line, function: String = #function) -> SharedSequence<SharingStrategy, E> {`
`137`	`137`	`let source = self.asObservable()`
`138`		`- .debug(identifier, file: file, line: line, function: function)`
	`138`	`+ .debug(identifier, trimOutput: trimOutput, file: file, line: line, function: function)`
`139`	`139`	`return SharedSequence(source)`
`140`	`140`	`}`
`141`	`141`	`}`