get rid of memory leaking in UIKit unit tests

zhoupan · Dec 3, 2015 · 7fa016f · 7fa016f
1 parent ebf146c
commit 7fa016f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/RxSwift/Subjects/Variable.swift b/RxSwift/Subjects/Variable.swift
@@ -62,6 +62,7 @@ public class Variable<Element> : ObservableType {
  - parameter observer: Observer to subscribe to variable values.
  - returns: Disposable object that can be used to unsubscribe the observer from the variable.
  */
+ @warn_unused_result(message="http://git.io/rxs.ud")
  public func subscribe<O: ObserverType where O.E == E>(observer: O) -> Disposable {
  return _subject.subscribe(observer)
  }

diff --git a/RxTests/RxCocoaTests/Control+RxTests+UIKit.swift b/RxTests/RxCocoaTests/Control+RxTests+UIKit.swift
@@ -15,7 +15,8 @@ extension ControlTests {
  func testSubscribeEnabledToTrue() {
  let subject = UIControl()
  let enabledSequence = Variable<Bool>(false)
- enabledSequence.subscribe(subject.rx_enabled)
+ let disposable = enabledSequence.subscribe(subject.rx_enabled)
+ defer { disposable.dispose() }
 
  enabledSequence.value = true
  XCTAssert(subject.enabled == true, "Expected enabled set to true")
@@ -24,7 +25,8 @@ extension ControlTests {
  func testSubscribeEnabledToFalse() {
  let subject = UIControl()
  let enabledSequence = Variable<Bool>(true)
- enabledSequence.subscribe(subject.rx_enabled)
+ let disposable = enabledSequence.subscribe(subject.rx_enabled)
+ defer { disposable.dispose() }
 
  enabledSequence.value = false
  XCTAssert(subject.enabled == false, "Expected enabled set to false")
@@ -163,8 +165,8 @@ extension ControlTests {
  func testLabel_NextElementsSetsValue() {
  let subject = UILabel()
  let attributedTextSequence = Variable<NSAttributedString?>(nil)
-
- attributedTextSequence.subscribe(subject.rx_attributedText)
+ let disposable = attributedTextSequence.subscribe(subject.rx_attributedText)
+ defer { disposable.dispose() }
 
  attributedTextSequence.value = NSAttributedString(string: "Hello!")
  XCTAssert(subject.attributedText == attributedTextSequence.value, "Expected attributedText to have been set")
@@ -323,7 +325,8 @@ extension ControlTests {
  let subject = UIActivityIndicatorView()
  let boolSequence = Variable<Bool>(false)
 
- boolSequence.subscribe(subject.rx_animating)
+ let disposable = boolSequence.subscribe(subject.rx_animating)
+ defer { disposable.dispose() }
 
  boolSequence.value = true
  XCTAssertTrue(subject.isAnimating(), "Expected animation to be started")