Deprecate RxTest global-scope functions (next, completed, error)

ReactiveX · Apr 8, 2019 · d07918c · d07918c
1 parent 09c7494
commit d07918c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/RxTest/Deprecated.swift b/RxTest/Deprecated.swift
@@ -32,10 +32,8 @@ extension TestScheduler {
      - parameter element: Next sequence element.
      - returns: Recorded event in time.
      */
+    @available(*, deprecated, renamed: "Recorded.next(_:_:)")
     public func next<T>(_ time: TestTime, _ element: T) -> Recorded<Event<T>> {
-        #if DEBUG
-            DeprecationWarner.warnIfNeeded(.globalTestFunctionNext)
-        #endif
         return Recorded.next(time, element)
     }
 
@@ -46,10 +44,8 @@ extension TestScheduler {
      - parameter type: Sequence elements type.
      - returns: Recorded event in time.
      */
+    @available(*, deprecated, renamed: "Recorded.completed(_:_:)")
     public func completed<T>(_ time: TestTime, _ type: T.Type = T.self) -> Recorded<Event<T>> {
-        #if DEBUG
-            DeprecationWarner.warnIfNeeded(.globalTestFunctionCompleted)
-        #endif
         return Recorded.completed(time, type)
     }
 
@@ -58,10 +54,8 @@ extension TestScheduler {
 
      - parameter time: Recorded virtual time the `.completed` event occurs.
      */
+    @available(*, deprecated, renamed: "Recorded.error(_:_:_:)")
     public func error<T>(_ time: TestTime, _ error: Swift.Error, _ type: T.Type = T.self) -> Recorded<Event<T>> {
-        #if DEBUG
-            DeprecationWarner.warnIfNeeded(.globalTestFunctionError)
-        #endif
         return Recorded.error(time, error, type)
     }
 //}
diff --git a/Tests/RxSwiftTests/MaybeTest.swift b/Tests/RxSwiftTests/MaybeTest.swift
@@ -607,8 +607,8 @@ extension MaybeTest {
         }
 
         XCTAssertEqual(res.events, [
-            next(200, 5),
-            completed(200)
+            .next(200, 5),
+            .completed(200)
             ])
     }
 
@@ -622,8 +622,8 @@ extension MaybeTest {
         }
 
         XCTAssertEqual(res.events, [
-            next(200, 10),
-            completed(200)
+            .next(200, 10),
+            .completed(200)
             ])
     }
 
@@ -637,8 +637,8 @@ extension MaybeTest {
         }
 
         XCTAssertEqual(res.events, [
-            next(200, 10),
-            completed(200)
+            .next(200, 10),
+            .completed(200)
             ])
     }
 }

diff --git a/Tests/RxSwiftTests/Observable+CombineLatestTests+arity.swift b/Tests/RxSwiftTests/Observable+CombineLatestTests+arity.swift
@@ -92,7 +92,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1)
             }
 
-            XCTAssertEqual(res.events, [completed(220)])
+            XCTAssertEqual(res.events, [.completed(220)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])
@@ -323,7 +323,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1, e2)
             }
 
-            XCTAssertEqual(res.events, [completed(230)])
+            XCTAssertEqual(res.events, [.completed(230)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])
@@ -591,7 +591,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1, e2, e3)
             }
 
-            XCTAssertEqual(res.events, [completed(240)])
+            XCTAssertEqual(res.events, [.completed(240)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])
@@ -896,7 +896,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1, e2, e3, e4)
             }
 
-            XCTAssertEqual(res.events, [completed(250)])
+            XCTAssertEqual(res.events, [.completed(250)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])
@@ -1238,7 +1238,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1, e2, e3, e4, e5)
             }
 
-            XCTAssertEqual(res.events, [completed(260)])
+            XCTAssertEqual(res.events, [.completed(260)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])
@@ -1617,7 +1617,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1, e2, e3, e4, e5, e6)
             }
 
-            XCTAssertEqual(res.events, [completed(270)])
+            XCTAssertEqual(res.events, [.completed(270)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])
@@ -2033,7 +2033,7 @@ extension ObservableCombineLatestTest {
                 factory(e0, e1, e2, e3, e4, e5, e6, e7)
             }
 
-            XCTAssertEqual(res.events, [completed(280)])
+            XCTAssertEqual(res.events, [.completed(280)])
 
 
             XCTAssertEqual(e0.subscriptions, [Subscription(200, 210)])