Skip to content

Commit b729ceb

Browse files
ivan-magdaivan-magda
committed
Fix tests build
1 parent 0955101 commit b729ceb

File tree

3 files changed

+104
-130
lines changed

3 files changed

+104
-130
lines changed

‎StepicTests/Sources/Tests/Model/AttemptEntityTests.swift‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ class AttemptEntitySpec: QuickSpec {
3434
let attempt = makeAttempt(dataset: choiceDataset)
3535

3636
// When
37-
_ = AttemptEntity(
38-
attempt: attempt,
39-
managedObjectContext: testCoreDataStack.managedObjectContext
37+
_ = AttemptEntity.insert(
38+
into: testCoreDataStack.managedObjectContext,
39+
attempt: attempt
4040
)
4141
testCoreDataStack.saveContext()
4242

4343
// Then
44-
let request = AttemptEntity.fetchRequest
45-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
44+
let request = AttemptEntity.sortedFetchRequest
4645

4746
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
4847
expect(attempts.count) == 1
@@ -65,15 +64,14 @@ class AttemptEntitySpec: QuickSpec {
6564
let attempt = makeAttempt(dataset: fillBlanksDataset)
6665

6766
// When
68-
_ = AttemptEntity(
69-
attempt: attempt,
70-
managedObjectContext: testCoreDataStack.managedObjectContext
67+
_ = AttemptEntity.insert(
68+
into: testCoreDataStack.managedObjectContext,
69+
attempt: attempt
7170
)
7271
testCoreDataStack.saveContext()
7372

7473
// Then
75-
let request = AttemptEntity.fetchRequest
76-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
74+
let request = AttemptEntity.sortedFetchRequest
7775

7876
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
7977
expect(attempts.count) == 1
@@ -96,15 +94,14 @@ class AttemptEntitySpec: QuickSpec {
9694
let attempt = makeAttempt(dataset: freeAnswerDataset)
9795

9896
// When
99-
_ = AttemptEntity(
100-
attempt: attempt,
101-
managedObjectContext: testCoreDataStack.managedObjectContext
97+
_ = AttemptEntity.insert(
98+
into: testCoreDataStack.managedObjectContext,
99+
attempt: attempt
102100
)
103101
testCoreDataStack.saveContext()
104102

105103
// Then
106-
let request = AttemptEntity.fetchRequest
107-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
104+
let request = AttemptEntity.sortedFetchRequest
108105

109106
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
110107
expect(attempts.count) == 1
@@ -127,15 +124,14 @@ class AttemptEntitySpec: QuickSpec {
127124
let attempt = makeAttempt(dataset: matchingDataset)
128125

129126
// When
130-
_ = AttemptEntity(
131-
attempt: attempt,
132-
managedObjectContext: testCoreDataStack.managedObjectContext
127+
_ = AttemptEntity.insert(
128+
into: testCoreDataStack.managedObjectContext,
129+
attempt: attempt
133130
)
134131
testCoreDataStack.saveContext()
135132

136133
// Then
137-
let request = AttemptEntity.fetchRequest
138-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
134+
let request = AttemptEntity.sortedFetchRequest
139135

140136
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
141137
expect(attempts.count) == 1
@@ -158,15 +154,14 @@ class AttemptEntitySpec: QuickSpec {
158154
let attempt = makeAttempt(dataset: sortingDataset)
159155

160156
// When
161-
_ = AttemptEntity(
162-
attempt: attempt,
163-
managedObjectContext: testCoreDataStack.managedObjectContext
157+
_ = AttemptEntity.insert(
158+
into: testCoreDataStack.managedObjectContext,
159+
attempt: attempt
164160
)
165161
testCoreDataStack.saveContext()
166162

167163
// Then
168-
let request = AttemptEntity.fetchRequest
169-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
164+
let request = AttemptEntity.sortedFetchRequest
170165

171166
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
172167
expect(attempts.count) == 1
@@ -189,15 +184,14 @@ class AttemptEntitySpec: QuickSpec {
189184
let attempt = makeAttempt(dataset: stringDataset)
190185

191186
// When
192-
_ = AttemptEntity(
193-
attempt: attempt,
194-
managedObjectContext: testCoreDataStack.managedObjectContext
187+
_ = AttemptEntity.insert(
188+
into: testCoreDataStack.managedObjectContext,
189+
attempt: attempt
195190
)
196191
testCoreDataStack.saveContext()
197192

198193
// Then
199-
let request = AttemptEntity.fetchRequest
200-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
194+
let request = AttemptEntity.sortedFetchRequest
201195

202196
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
203197
expect(attempts.count) == 1
@@ -220,15 +214,14 @@ class AttemptEntitySpec: QuickSpec {
220214
let attempt = makeAttempt(dataset: tableDataset)
221215

222216
// When
223-
_ = AttemptEntity(
224-
attempt: attempt,
225-
managedObjectContext: testCoreDataStack.managedObjectContext
217+
_ = AttemptEntity.insert(
218+
into: testCoreDataStack.managedObjectContext,
219+
attempt: attempt
226220
)
227221
testCoreDataStack.saveContext()
228222

229223
// Then
230-
let request = AttemptEntity.fetchRequest
231-
request.sortDescriptors = AttemptEntity.defaultSortDescriptors
224+
let request = AttemptEntity.sortedFetchRequest
232225

233226
let attempts = try! testCoreDataStack.managedObjectContext.fetch(request)
234227
expect(attempts.count) == 1

‎StepicTests/Sources/Tests/Model/CatalogBlockEntityTests.swift‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ class CatalogBlockEntitySpec: QuickSpec {
2121
let catalogBlock = CatalogBlock(json: json)
2222

2323
// When
24-
_ = CatalogBlockEntity(
25-
catalogBlock: catalogBlock,
26-
managedObjectContext: testCoreDataStack.managedObjectContext
24+
_ = CatalogBlockEntity.insert(
25+
into: testCoreDataStack.managedObjectContext,
26+
catalogBlock: catalogBlock
2727
)
2828
testCoreDataStack.saveContext()
2929

3030
// Then
31-
let request = CatalogBlockEntity.fetchRequest
32-
request.sortDescriptors = CatalogBlockEntity.defaultSortDescriptors
31+
let request = CatalogBlockEntity.sortedFetchRequest
3332

3433
let catalogBlocks = try! testCoreDataStack.managedObjectContext.fetch(request)
3534
expect(catalogBlocks.count) == 1
@@ -54,15 +53,14 @@ class CatalogBlockEntitySpec: QuickSpec {
5453
let catalogBlock = CatalogBlock(json: json)
5554

5655
// When
57-
_ = CatalogBlockEntity(
58-
catalogBlock: catalogBlock,
59-
managedObjectContext: testCoreDataStack.managedObjectContext
56+
_ = CatalogBlockEntity.insert(
57+
into: testCoreDataStack.managedObjectContext,
58+
catalogBlock: catalogBlock
6059
)
6160
testCoreDataStack.saveContext()
6261

6362
// Then
64-
let request = CatalogBlockEntity.fetchRequest
65-
request.sortDescriptors = CatalogBlockEntity.defaultSortDescriptors
63+
let request = CatalogBlockEntity.sortedFetchRequest
6664

6765
let catalogBlocks = try! testCoreDataStack.managedObjectContext.fetch(request)
6866
expect(catalogBlocks.count) == 1
@@ -87,15 +85,14 @@ class CatalogBlockEntitySpec: QuickSpec {
8785
let catalogBlock = CatalogBlock(json: json)
8886

8987
// When
90-
_ = CatalogBlockEntity(
91-
catalogBlock: catalogBlock,
92-
managedObjectContext: testCoreDataStack.managedObjectContext
88+
_ = CatalogBlockEntity.insert(
89+
into: testCoreDataStack.managedObjectContext,
90+
catalogBlock: catalogBlock
9391
)
9492
testCoreDataStack.saveContext()
9593

9694
// Then
97-
let request = CatalogBlockEntity.fetchRequest
98-
request.sortDescriptors = CatalogBlockEntity.defaultSortDescriptors
95+
let request = CatalogBlockEntity.sortedFetchRequest
9996

10097
let catalogBlocks = try! testCoreDataStack.managedObjectContext.fetch(request)
10198
expect(catalogBlocks.count) == 1
@@ -120,15 +117,14 @@ class CatalogBlockEntitySpec: QuickSpec {
120117
let catalogBlock = CatalogBlock(json: json)
121118

122119
// When
123-
_ = CatalogBlockEntity(
124-
catalogBlock: catalogBlock,
125-
managedObjectContext: testCoreDataStack.managedObjectContext
120+
_ = CatalogBlockEntity.insert(
121+
into: testCoreDataStack.managedObjectContext,
122+
catalogBlock: catalogBlock
126123
)
127124
testCoreDataStack.saveContext()
128125

129126
// Then
130-
let request = CatalogBlockEntity.fetchRequest
131-
request.sortDescriptors = CatalogBlockEntity.defaultSortDescriptors
127+
let request = CatalogBlockEntity.sortedFetchRequest
132128

133129
let catalogBlocks = try! testCoreDataStack.managedObjectContext.fetch(request)
134130
expect(catalogBlocks.count) == 1
@@ -152,15 +148,14 @@ class CatalogBlockEntitySpec: QuickSpec {
152148
let catalogBlock = CatalogBlock(json: json)
153149

154150
// When
155-
_ = CatalogBlockEntity(
156-
catalogBlock: catalogBlock,
157-
managedObjectContext: testCoreDataStack.managedObjectContext
151+
_ = CatalogBlockEntity.insert(
152+
into: testCoreDataStack.managedObjectContext,
153+
catalogBlock: catalogBlock
158154
)
159155
testCoreDataStack.saveContext()
160156

161157
// Then
162-
let request = CatalogBlockEntity.fetchRequest
163-
request.sortDescriptors = CatalogBlockEntity.defaultSortDescriptors
158+
let request = CatalogBlockEntity.sortedFetchRequest
164159

165160
let catalogBlocks = try! testCoreDataStack.managedObjectContext.fetch(request)
166161
expect(catalogBlocks.count) == 1

0 commit comments

Comments
 (0)