Skip to content

Commit 17fd181

Browse files
M0rtyMerrfreak4pc
M0rtyMerr
authored and
freak4pc
committed
Remove dublicated test errors
1 parent 608136e commit 17fd181

10 files changed

+39
-74
lines changed

‎Tests/RxSwift/MergeWithTests.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import XCTest
1010
import RxSwift
1111
import RxTest
1212

13-
enum MergeWithError: Error {
14-
case error
15-
}
1613

1714
class MergeWithTests: XCTestCase {
1815
fileprivate func runAndObserve<T>(_ sequence: Observable<T>) -> TestableObserver<T> {
@@ -67,11 +64,11 @@ class MergeWithTests: XCTestCase {
6764

6865
func testMergeWith_Error() {
6966
let numberStream = Observable.from([1, 2, 3, 4])
70-
let errorStream = Observable<Int>.error(MergeWithError.error)
67+
let errorStream = Observable<Int>.error(testError)
7168

7269
let observer = runAndObserve(numberStream.merge(with: errorStream))
7370

74-
let expected = Recorded<Event<Int>>.events([.error(0, MergeWithError.error)])
71+
let expected = Recorded<Event<Int>>.events([.error(0, testError)])
7572

7673
XCTAssertEqual(observer.events, expected)
7774
}

‎Tests/RxSwift/Observable+OfTypeTests.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@ import RxTest
1414
#if os(Linux)
1515
import Glibc
1616
#endif
17-
class ObservableOfTypeTest: XCTestCase {
18-
enum TestError: Error {
19-
case dummyError
20-
}
21-
let testError = TestError.dummyError
22-
}
2317

24-
extension ObservableOfTypeTest {
18+
class ObservableOfTypeTest {
2519
func test_ofTypeComplete() {
2620
let scheduler = TestScheduler(initialClock: 0)
2721

‎Tests/RxSwift/WeakTarget.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import Foundation
1010
import RxSwift
1111

12-
enum WeakTargetError: Error {
13-
case error
14-
}
1512
enum RxEvent {
1613
case next, error, completed, disposed
1714
init<T>(event: Event<T>) {

‎Tests/RxSwift/WeakTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class WeakTests: XCTestCase {
4444
self.source.onNext(0)
4545
self.target = nil
4646
self.source.onNext(0)
47-
self.source.onError(WeakTargetError.error)
47+
self.source.onError(testError)
4848
self.target?.dispose()
4949

5050
let expected: [RxEvent: Int] = [.next: 2, .error: 0, .completed: 0, .disposed: 0]
@@ -68,7 +68,7 @@ class WeakTests: XCTestCase {
6868
func testSubscribeError() {
6969
self.target?.useSubscribeError()
7070

71-
self.source.onError(WeakTargetError.error)
71+
self.source.onError(testError)
7272
self.target = nil
7373

7474
// Errors only emit once
@@ -104,7 +104,7 @@ class WeakTests: XCTestCase {
104104
func testSubscribeOn_Error() {
105105
self.target?.useSubscribeMulti()
106106

107-
self.source.onError(WeakTargetError.error)
107+
self.source.onError(testError)
108108
self.target = nil
109109

110110
// Errors only emit once

‎Tests/RxSwift/ZipWithTest.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ struct Pair<F: Equatable, S: Equatable> {
1515
let second: S
1616
}
1717

18-
enum ZipWithTestError: Error {
19-
case error
20-
}
21-
2218
extension Pair: Equatable {
2319
}
2420

@@ -65,15 +61,15 @@ class ZipWithTest: XCTestCase {
6561
func testZipWith_SourceError_ZipCompletesWithError() {
6662
let scheduler = TestScheduler(initialClock: 0)
6763
let source1 = Observable.just(1)
68-
let source2 = Observable<Int>.error(ZipWithTestError.error)
64+
let source2 = Observable<Int>.error(testError)
6965

7066
let res = scheduler.start {
7167
source1.zip(with: source2) {
7268
Pair(first: $0, second: $1)
7369
}
7470
}
7571

76-
let expected: [Recorded<Event<Pair<Int, Int>>>] = [.error(200, ZipWithTestError.error)]
72+
let expected: [Recorded<Event<Pair<Int, Int>>>] = [.error(200, testError)]
7773
XCTAssertEqual(res.events, expected)
7874
}
7975

‎Tests/RxSwift/andTests.swift

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import XCTest
1010
import RxSwift
1111
import RxTest
1212

13-
private enum AndTestsError: Error {
14-
case anyError
15-
}
1613

1714
class AndTests: XCTestCase {
1815
fileprivate func runAndObserve(_ sequence: Maybe<Bool>) -> TestableObserver<Bool> {
@@ -95,10 +92,10 @@ class AndTests: XCTestCase {
9592
}
9693

9794
func testSingle_onlyError() {
98-
let source = Observable<Bool>.error(AndTestsError.anyError)
95+
let source = Observable<Bool>.error(testError)
9996
let observer = runAndObserve(source.and())
10097
let correct: [Recorded<Event<Bool>>] = [
101-
.error(0, AndTestsError.anyError)
98+
.error(0, testError)
10299
]
103100
XCTAssertEqual(observer.events, correct)
104101
}
@@ -109,7 +106,7 @@ class AndTests: XCTestCase {
109106
.next(100, true),
110107
.next(110, false),
111108
.next(120, true),
112-
.error(130, AndTestsError.anyError),
109+
.error(130, testError),
113110
.completed(300)
114111
])
115112

@@ -130,7 +127,7 @@ class AndTests: XCTestCase {
130127
.next(100, true),
131128
.next(110, true),
132129
.next(120, true),
133-
.error(130, AndTestsError.anyError),
130+
.error(130, testError),
134131
.completed(300)
135132
])
136133

@@ -139,7 +136,7 @@ class AndTests: XCTestCase {
139136
scheduler.start()
140137

141138
let correct: [Recorded<Event<Bool>>] = [
142-
.error(130, AndTestsError.anyError)
139+
.error(130, testError)
143140
]
144141
XCTAssertEqual(observer.events, correct)
145142
}
@@ -283,7 +280,7 @@ class AndTests: XCTestCase {
283280
])
284281
let source3 = scheduler.createColdObservable([
285282
.next(75, true),
286-
.error(100, AndTestsError.anyError)
283+
.error(100, testError)
287284
])
288285

289286
let observer = scheduler.createObserver(Bool.self)
@@ -294,7 +291,7 @@ class AndTests: XCTestCase {
294291
scheduler.start()
295292

296293
let correct: [Recorded<Event<Bool>>] = [
297-
.error(100, AndTestsError.anyError)
294+
.error(100, testError)
298295
]
299296
XCTAssertEqual(observer.events, correct)
300297
}

‎Tests/RxSwift/fromAsyncTests.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class FromAsyncTests: XCTestCase {
7676

7777
func testSingleResultEqualityErrorCase() {
7878
// given
79-
let expectedEvents: [Recorded<Event<String>>] = [.error(0, TestError())]
79+
let expectedEvents: [Recorded<Event<String>>] = [.error(0, testError)]
8080
// when
8181
_ = Single<String>
8282
.fromAsync(serviceThrowingError)
@@ -87,10 +87,6 @@ class FromAsyncTests: XCTestCase {
8787
XCTAssertEqual(observer.events, expectedEvents)
8888
}
8989

90-
// MARK: - Private utils
91-
private struct TestError: Error {
92-
}
93-
9490
private func service(arg1: String, arg2: Int, completionHandler: (String) -> Void) {
9591
completionHandler("Result")
9692
}
@@ -104,7 +100,7 @@ class FromAsyncTests: XCTestCase {
104100
}
105101

106102
private func serviceThrowingError(completionHandler: (String?, TestError?) -> Void) {
107-
completionHandler(nil, TestError())
103+
completionHandler(nil, testError)
108104
}
109105

110106
private func serviceWithOptionalResult(completionHandler: (String??, TestError?) -> Void) {

‎Tests/RxSwift/nwiseTests.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ class NwiseTests: XCTestCase {
7272
subject.onNext(2)
7373
subject.onNext(3)
7474
subject.onNext(4)
75-
subject.onError(DummyError.expected)
75+
subject.onError(testError)
7676
scheduler.start()
7777

7878
let correct: [Recorded<Event<EquatableArray<Int>>>] = [
7979
.next(0, EquatableArray([1, 2, 3])),
8080
.next(0, EquatableArray([2, 3, 4])),
81-
.error(0, DummyError.expected)
81+
.error(0, testError)
8282
]
8383

8484
XCTAssertEqual(observer.events, correct)
@@ -148,24 +148,20 @@ class NwiseTests: XCTestCase {
148148
subject.onNext(2)
149149
subject.onNext(3)
150150
subject.onNext(4)
151-
subject.onError(DummyError.expected)
151+
subject.onError(testError)
152152
scheduler.start()
153153

154154
let correct = Recorded.events([
155155
.next(0, "1 2"),
156156
.next(0, "2 3"),
157157
.next(0, "3 4"),
158-
.error(0, DummyError.expected)
158+
.error(0, testError)
159159
])
160160

161161
XCTAssertEqual(observer.events, correct)
162162
}
163163
}
164164

165-
private enum DummyError: Error {
166-
case expected
167-
}
168-
169165
private struct EquatableArray<Element: Equatable>: Equatable {
170166
let elements: [Element]
171167
init(_ elements: [Element]) {

‎Tests/RxSwift/repeatWithBehaviorTests.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ import RxSwift
1111
import RxSwiftExt
1212
import RxTest
1313

14-
private enum RepeatTestErrors: Error {
15-
case fatalError
16-
}
17-
1814
class RepeatWithBehaviorTests: XCTestCase {
1915
var sampleValues: TestableObservable<Int>!
2016
var sampleValuesWithError: TestableObservable<Int>!
@@ -33,7 +29,7 @@ class RepeatWithBehaviorTests: XCTestCase {
3329

3430
sampleValuesWithError = scheduler.createColdObservable([
3531
.next(210, 1),
36-
.error(220, RepeatTestErrors.fatalError)
32+
.error(220, testError)
3733
])
3834
}
3935

@@ -65,7 +61,7 @@ class RepeatWithBehaviorTests: XCTestCase {
6561

6662
let erroredCorrectValues: [Recorded<Event<Int>>] = [
6763
.next(210, 1),
68-
.error(220, RepeatTestErrors.fatalError)
64+
.error(220, testError)
6965
]
7066

7167
// MARK: - Immediate repeats

0 commit comments

Comments
 (0)