Skip to content

Commit ee40236

Browse files
freak4pcfreak4pc
committed
RxSwiftExt 5.0.0: RxCocoa Tests
1 parent f96a608 commit ee40236

File tree

4 files changed

+90
-89
lines changed

4 files changed

+90
-89
lines changed

‎Tests/RxCocoa/DistinctTests+RxCocoa.swift

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ class DistinctCocoaTests: XCTestCase {
2626

2727
scheduler.start()
2828

29-
let correct = [
30-
next(0, DummyHashable(id: 1, name: "SomeName")),
31-
completed(0)
32-
]
29+
let correct = Recorded.events([
30+
.next(0, DummyHashable(id: 1, name: "SomeName")),
31+
.completed(0)
32+
])
3333

3434
XCTAssertEqual(observer.events, correct)
3535
}
@@ -50,11 +50,11 @@ class DistinctCocoaTests: XCTestCase {
5050

5151
scheduler.start()
5252

53-
let correct = [
54-
next(0, DummyHashable(id: 1, name: "SomeName")),
55-
next(0, DummyHashable(id: 2, name: "SomeName2")),
56-
completed(0)
57-
]
53+
let correct = Recorded.events([
54+
.next(0, DummyHashable(id: 1, name: "SomeName")),
55+
.next(0, DummyHashable(id: 2, name: "SomeName2")),
56+
.completed(0)
57+
])
5858

5959
XCTAssertEqual(observer.events, correct)
6060
}
@@ -73,7 +73,7 @@ class DistinctCocoaTests: XCTestCase {
7373
scheduler.start()
7474

7575
let correct: [Recorded<Event<DummyHashable>>] = [
76-
completed(0)
76+
.completed(0)
7777
]
7878

7979
XCTAssertEqual(observer.events, correct)
@@ -84,19 +84,19 @@ class DistinctCocoaTests: XCTestCase {
8484
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
8585

8686
SharingScheduler.mock(scheduler: scheduler) {
87-
let values = [DummyEquatable(id: 1, name: "SomeName")]
88-
let value = DummyEquatable(id: 0, name: "NoneName")
89-
let observer = scheduler.createObserver(DummyEquatable.self)
87+
let values = [DummyHashable(id: 1, name: "SomeName")]
88+
let value = DummyHashable(id: 0, name: "NoneName")
89+
let observer = scheduler.createObserver(DummyHashable.self)
9090

9191
_ = Observable.from(values).asDriver(onErrorJustReturn: value)
9292
.distinct().drive(observer)
9393

9494
scheduler.start()
9595

96-
let correct = [
97-
next(0, DummyEquatable(id: 1, name: "SomeName")),
98-
completed(0)
99-
]
96+
let correct = Recorded.events([
97+
.next(0, DummyHashable(id: 1, name: "SomeName")),
98+
.completed(0)
99+
])
100100

101101
XCTAssertEqual(observer.events, correct)
102102
}
@@ -106,22 +106,22 @@ class DistinctCocoaTests: XCTestCase {
106106
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
107107

108108
SharingScheduler.mock(scheduler: scheduler) {
109-
let values = [DummyEquatable(id: 1, name: "SomeName"),
110-
DummyEquatable(id: 2, name: "SomeName2"),
111-
DummyEquatable(id: 1, name: "SomeName")]
109+
let values = [DummyHashable(id: 1, name: "SomeName"),
110+
DummyHashable(id: 2, name: "SomeName2"),
111+
DummyHashable(id: 1, name: "SomeName")]
112112

113-
let errored = DummyEquatable(id: 0, name: "NoneName")
114-
let observer = scheduler.createObserver(DummyEquatable.self)
113+
let errored = DummyHashable(id: 0, name: "NoneName")
114+
let observer = scheduler.createObserver(DummyHashable.self)
115115

116116
_ = Observable.from(values).asDriver(onErrorJustReturn: errored).distinct().drive(observer)
117117

118118
scheduler.start()
119119

120-
let correct = [
121-
next(0, DummyEquatable(id: 1, name: "SomeName")),
122-
next(0, DummyEquatable(id: 2, name: "SomeName2")),
123-
completed(0)
124-
]
120+
let correct = Recorded.events([
121+
.next(0, DummyHashable(id: 1, name: "SomeName")),
122+
.next(0, DummyHashable(id: 2, name: "SomeName2")),
123+
.completed(0)
124+
])
125125

126126
XCTAssertEqual(observer.events, correct)
127127
}
@@ -131,15 +131,15 @@ class DistinctCocoaTests: XCTestCase {
131131
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
132132

133133
SharingScheduler.mock(scheduler: scheduler) {
134-
let errored = DummyEquatable(id: 0, name: "NoneName")
135-
let observer = scheduler.createObserver(DummyEquatable.self)
134+
let errored = DummyHashable(id: 0, name: "NoneName")
135+
let observer = scheduler.createObserver(DummyHashable.self)
136136

137-
_ = Observable<DummyEquatable>.empty().asDriver(onErrorJustReturn: errored).distinct().drive(observer)
137+
_ = Observable<DummyHashable>.empty().asDriver(onErrorJustReturn: errored).distinct().drive(observer)
138138

139139
scheduler.start()
140140

141-
let correct: [Recorded<Event<DummyEquatable>>] = [
142-
completed(0)
141+
let correct: [Recorded<Event<DummyHashable>>] = [
142+
.completed(0)
143143
]
144144

145145
XCTAssertEqual(observer.events, correct)
@@ -150,12 +150,12 @@ class DistinctCocoaTests: XCTestCase {
150150
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
151151

152152
SharingScheduler.mock(scheduler: scheduler) {
153-
let values = [DummyEquatable(id: 1, name: "SomeName1"),
154-
DummyEquatable(id: 2, name: "SomeName2"),
155-
DummyEquatable(id: 3, name: "SomeName1")]
153+
let values = [DummyHashable(id: 1, name: "SomeName1"),
154+
DummyHashable(id: 2, name: "SomeName2"),
155+
DummyHashable(id: 3, name: "SomeName1")]
156156

157-
let errored = DummyEquatable(id: 0, name: "SomeName0")
158-
let observer = scheduler.createObserver(DummyEquatable.self)
157+
let errored = DummyHashable(id: 0, name: "SomeName0")
158+
let observer = scheduler.createObserver(DummyHashable.self)
159159

160160
_ = Observable.from(values).asDriver(onErrorJustReturn: errored)
161161
.distinct {
@@ -164,10 +164,10 @@ class DistinctCocoaTests: XCTestCase {
164164

165165
scheduler.start()
166166

167-
let correct = [
168-
next(0, DummyEquatable(id: 1, name: "SomeName1")),
169-
completed(0)
170-
]
167+
let correct = Recorded.events([
168+
.next(0, DummyHashable(id: 1, name: "SomeName1")),
169+
.completed(0)
170+
])
171171

172172
XCTAssertEqual(observer.events, correct)
173173
}
@@ -177,12 +177,12 @@ class DistinctCocoaTests: XCTestCase {
177177
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
178178

179179
SharingScheduler.mock(scheduler: scheduler) {
180-
let values = [DummyEquatable(id: 1, name: "SomeName1"),
181-
DummyEquatable(id: 2, name: "SomeName2"),
182-
DummyEquatable(id: 3, name: "SomeName3")]
180+
let values = [DummyHashable(id: 1, name: "SomeName1"),
181+
DummyHashable(id: 2, name: "SomeName2"),
182+
DummyHashable(id: 3, name: "SomeName3")]
183183

184-
let errored = DummyEquatable(id: 0, name: "SomeName0")
185-
let observer = scheduler.createObserver(DummyEquatable.self)
184+
let errored = DummyHashable(id: 0, name: "SomeName0")
185+
let observer = scheduler.createObserver(DummyHashable.self)
186186

187187
_ = Observable.from(values).asDriver(onErrorJustReturn: errored)
188188
.distinct {
@@ -191,12 +191,12 @@ class DistinctCocoaTests: XCTestCase {
191191

192192
scheduler.start()
193193

194-
let correct = [
195-
next(0, DummyEquatable(id: 1, name: "SomeName1")),
196-
next(0, DummyEquatable(id: 2, name: "SomeName2")),
197-
next(0, DummyEquatable(id: 3, name: "SomeName3")),
198-
completed(0)
199-
]
194+
let correct = Recorded.events([
195+
.next(0, DummyHashable(id: 1, name: "SomeName1")),
196+
.next(0, DummyHashable(id: 2, name: "SomeName2")),
197+
.next(0, DummyHashable(id: 3, name: "SomeName3")),
198+
.completed(0)
199+
])
200200

201201
XCTAssertEqual(observer.events, correct)
202202
}
@@ -206,19 +206,19 @@ class DistinctCocoaTests: XCTestCase {
206206
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
207207

208208
SharingScheduler.mock(scheduler: scheduler) {
209-
let errored = DummyEquatable(id: 0, name: "NoneName")
210-
let observer = scheduler.createObserver(DummyEquatable.self)
209+
let errored = DummyHashable(id: 0, name: "NoneName")
210+
let observer = scheduler.createObserver(DummyHashable.self)
211211

212-
_ = Observable<DummyEquatable>.empty().asDriver(onErrorJustReturn: errored)
212+
_ = Observable<DummyHashable>.empty().asDriver(onErrorJustReturn: errored)
213213
.distinct {
214214
$0.id < 0
215215
}
216216
.drive(observer)
217217

218218
scheduler.start()
219219

220-
let correct: [Recorded<Event<DummyEquatable>>] = [
221-
completed(0)
220+
let correct: [Recorded<Event<DummyHashable>>] = [
221+
.completed(0)
222222
]
223223

224224
XCTAssertEqual(observer.events, correct)
@@ -229,12 +229,12 @@ class DistinctCocoaTests: XCTestCase {
229229
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
230230

231231
SharingScheduler.mock(scheduler: scheduler) {
232-
let values = [DummyEquatable(id: 1, name: "SomeName1"),
233-
DummyEquatable(id: 2, name: "SomeName2"),
234-
DummyEquatable(id: 3, name: "SomeName3")]
232+
let values = [DummyHashable(id: 1, name: "SomeName1"),
233+
DummyHashable(id: 2, name: "SomeName2"),
234+
DummyHashable(id: 3, name: "SomeName3")]
235235

236-
let errored = DummyEquatable(id: 0, name: "NoneName")
237-
let observer = scheduler.createObserver(DummyEquatable.self)
236+
let errored = DummyHashable(id: 0, name: "NoneName")
237+
let observer = scheduler.createObserver(DummyHashable.self)
238238

239239
_ = Observable.from(values).asDriver(onErrorJustReturn: errored)
240240
.distinct {
@@ -243,10 +243,10 @@ class DistinctCocoaTests: XCTestCase {
243243

244244
scheduler.start()
245245

246-
let correct = [
247-
next(0, DummyEquatable(id: 1, name: "SomeName1")),
248-
completed(0)
249-
]
246+
let correct = Recorded.events([
247+
.next(0, DummyHashable(id: 1, name: "SomeName1")),
248+
.completed(0)
249+
])
250250

251251
XCTAssertEqual(observer.events, correct)
252252
}
@@ -256,12 +256,12 @@ class DistinctCocoaTests: XCTestCase {
256256
let scheduler = TestScheduler(initialClock: 0, simulateProcessingDelay: false)
257257

258258
SharingScheduler.mock(scheduler: scheduler) {
259-
let values = [DummyEquatable(id: 1, name: "SomeName1"),
260-
DummyEquatable(id: 2, name: "SomeName2"),
261-
DummyEquatable(id: 3, name: "SomeName3")]
259+
let values = [DummyHashable(id: 1, name: "SomeName1"),
260+
DummyHashable(id: 2, name: "SomeName2"),
261+
DummyHashable(id: 3, name: "SomeName3")]
262262

263-
let errored = DummyEquatable(id: 0, name: "NoneName")
264-
let observer = scheduler.createObserver(DummyEquatable.self)
263+
let errored = DummyHashable(id: 0, name: "NoneName")
264+
let observer = scheduler.createObserver(DummyHashable.self)
265265

266266
_ = Observable.from(values).asDriver(onErrorJustReturn: errored)
267267
.distinct {
@@ -270,11 +270,11 @@ class DistinctCocoaTests: XCTestCase {
270270

271271
scheduler.start()
272272

273-
let correct = [
274-
next(0, DummyEquatable(id: 1, name: "SomeName1")),
275-
next(0, DummyEquatable(id: 2, name: "SomeName2")),
276-
completed(0)
277-
]
273+
let correct = Recorded.events([
274+
.next(0, DummyHashable(id: 1, name: "SomeName1")),
275+
.next(0, DummyHashable(id: 2, name: "SomeName2")),
276+
.completed(0)
277+
])
278278

279279
XCTAssertEqual(observer.events, correct)
280280
}

‎Tests/RxCocoa/MapToTests+RxCocoa.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ class MapToCocoaTests: XCTestCase {
4040

4141
func testReplaceWithResultValues() {
4242
// test elements values and type
43-
let correctValues = [
44-
next(0, "candy"),
45-
next(0, "candy"),
46-
next(0, "candy"),
47-
completed(0)
48-
]
43+
let correctValues = Recorded.events([
44+
.next(0, "candy"),
45+
.next(0, "candy"),
46+
.next(0, "candy"),
47+
.completed(0)
48+
])
49+
4950
XCTAssertEqual(observer.events, correctValues)
5051
}
5152
}

‎Tests/RxCocoa/NotTests+RxCocoa.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class NotCocoaTests: XCTestCase {
2525

2626
scheduler.start()
2727

28-
let correct = [
29-
next(0, false),
30-
next(0, true),
31-
next(0, false),
32-
completed(0)
33-
]
28+
let correct = Recorded.events([
29+
.next(0, false),
30+
.next(0, true),
31+
.next(0, false),
32+
.completed(0)
33+
])
3434

3535
XCTAssertEqual(observer.events, correct)
3636
}

‎Tests/RxCocoa/PartitionTests+RxCocoa.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RxSwiftExt
44
//
55
// Created by Shai Mishali on 24/11/2018.
6-
// Copyright © 2018 RxSwiftCommunity. All rights reserved.
6+
// Copyright © 2018 RxSwift Community. All rights reserved.
77
//
88

99
import Foundation

0 commit comments

Comments
 (0)