Skip to content

Commit d095396

Browse files
committed
♻️ Extract PlanCalendar.generate
1 parent 02d538c commit d095396

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

Sources/Model/Calendar.swift

+17
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ struct PlanCalendar: Codable, ReverseCodable {
77
let label: String
88
let color: String
99

10+
static func generate(
11+
type: EKCalendarType = EKCalendarType.calDAV,
12+
label: String = "Test",
13+
source: String = "Test",
14+
color: String = "#FFB3E4"
15+
) -> PlanCalendar {
16+
let id = UUID().uuidString
17+
18+
return PlanCalendar(
19+
id: id,
20+
type: type.description,
21+
source: source,
22+
label: label,
23+
color: color
24+
)
25+
}
26+
1027
static let Unknown = PlanCalendar(
1128
id: "unknown",
1229
type: "unknown",

Tests/CalendarFilterTest.swift

+15-32
Original file line numberDiff line numberDiff line change
@@ -4,57 +4,40 @@ import EventKit
44
import XCTest
55

66
final class CalendarFilterTests: XCTestCase {
7-
private func genCalendar(
8-
type: EKCalendarType = EKCalendarType.calDAV,
9-
source: String = "Test"
10-
) -> PlanCalendar {
11-
let id = "5E28ECB5-A07D-4FC8-82E4-5F37C38C786F"
12-
let label = "Test"
13-
let color = "#FFB3E4"
14-
15-
return PlanCalendar(
16-
id: id,
17-
type: type.description,
18-
source: source,
19-
label: label,
20-
color: color
21-
)
22-
}
23-
247
func testAlwaysAccept() {
25-
let calendar = genCalendar()
8+
let calendar = PlanCalendar.generate()
269
let expected = true
2710
let actual = CalendarFilter.accept(calendar)
2811

2912
XCTAssertEqual(actual, expected, "The calendar was not accepted")
3013
}
3114

3215
func testSelectCalendarsMatching() {
33-
let calendar = genCalendar()
16+
let calendar = PlanCalendar.generate()
3417
let expected = true
3518
let actual = CalendarFilter.select(uuids: [calendar.id])(calendar)
3619

3720
XCTAssertEqual(actual, expected, "The calendar was not accepted")
3821
}
3922

4023
func testSelectCalendarsEmptyArray() {
41-
let calendar = genCalendar()
24+
let calendar = PlanCalendar.generate()
4225
let expected = true
4326
let actual = CalendarFilter.select(uuids: [])(calendar)
4427

4528
XCTAssertEqual(actual, expected, "The calendar was not accepted")
4629
}
4730

4831
func testIgnoreCalendarsMatching() {
49-
let calendar = genCalendar()
32+
let calendar = PlanCalendar.generate()
5033
let expected = false
5134
let actual = CalendarFilter.ignore(uuids: [calendar.id])(calendar)
5235

5336
XCTAssertEqual(actual, expected, "The calendar was accepted")
5437
}
5538

5639
func testIgnoreCalendarsEmptyArray() {
57-
let calendar = genCalendar()
40+
let calendar = PlanCalendar.generate()
5841
let expected = true
5942
let actual = CalendarFilter.ignore(uuids: [])(calendar)
6043

@@ -63,15 +46,15 @@ final class CalendarFilterTests: XCTestCase {
6346

6447
func testIgnoreCalendarSourcesMatching() {
6548
let source = "Personal"
66-
let calendar = genCalendar(source: source)
49+
let calendar = PlanCalendar.generate(source: source)
6750
let expected = false
6851
let actual = CalendarFilter.ignoreSources(sources: [source])(calendar)
6952

7053
XCTAssertEqual(actual, expected, "The calendar was accepted")
7154
}
7255

7356
func testIgnoreCalendarSourcesEmptyArray() {
74-
let calendar = genCalendar()
57+
let calendar = PlanCalendar.generate()
7558
let expected = true
7659
let actual = CalendarFilter.ignoreSources(sources: [])(calendar)
7760

@@ -80,7 +63,7 @@ final class CalendarFilterTests: XCTestCase {
8063

8164
func testSelectCalendarSourcesMatching() {
8265
let source = "Personal"
83-
let calendar = genCalendar(source: source)
66+
let calendar = PlanCalendar.generate(source: source)
8467
let expected = true
8568
let actual = CalendarFilter.selectSources(sources: [source])(calendar)
8669

@@ -89,15 +72,15 @@ final class CalendarFilterTests: XCTestCase {
8972

9073
func testSelectCalendarSourcesNotMatching() {
9174
let source = "Personal"
92-
let calendar = genCalendar(source: source)
75+
let calendar = PlanCalendar.generate(source: source)
9376
let expected = false
9477
let actual = CalendarFilter.selectSources(sources: ["not-existing"])(calendar)
9578

9679
XCTAssertEqual(actual, expected, "The calendar was accepted")
9780
}
9881

9982
func testSelectCalendarSourcesEmptyArray() {
100-
let calendar = genCalendar()
83+
let calendar = PlanCalendar.generate()
10184
let expected = true
10285
let actual = CalendarFilter.selectSources(sources: [])(calendar)
10386

@@ -106,15 +89,15 @@ final class CalendarFilterTests: XCTestCase {
10689

10790
func testIgnoreCalendarTypesMatching() {
10891
let type = EKCalendarType.birthday
109-
let calendar = genCalendar(type: type)
92+
let calendar = PlanCalendar.generate(type: type)
11093
let expected = false
11194
let actual = CalendarFilter.ignoreTypes(types: [type])(calendar)
11295

11396
XCTAssertEqual(actual, expected, "The calendar was accepted")
11497
}
11598

11699
func testIgnoreCalendarTypesEmptyArray() {
117-
let calendar = genCalendar()
100+
let calendar = PlanCalendar.generate()
118101
let expected = true
119102
let actual = CalendarFilter.ignoreTypes(types: [])(calendar)
120103

@@ -123,7 +106,7 @@ final class CalendarFilterTests: XCTestCase {
123106

124107
func testSelectCalendarTypesMatching() {
125108
let type = EKCalendarType.birthday
126-
let calendar = genCalendar(type: type)
109+
let calendar = PlanCalendar.generate(type: type)
127110
let expected = true
128111
let actual = CalendarFilter.selectTypes(types: [type])(calendar)
129112

@@ -132,15 +115,15 @@ final class CalendarFilterTests: XCTestCase {
132115

133116
func testSelectCalendarTypesNotMatching() {
134117
let type = EKCalendarType.calDAV
135-
let calendar = genCalendar(type: type)
118+
let calendar = PlanCalendar.generate(type: type)
136119
let expected = false
137120
let actual = CalendarFilter.selectTypes(types: [EKCalendarType.birthday])(calendar)
138121

139122
XCTAssertEqual(actual, expected, "The calendar was accepted")
140123
}
141124

142125
func testSelectCalendarTypesEmptyArray() {
143-
let calendar = genCalendar()
126+
let calendar = PlanCalendar.generate()
144127
let expected = true
145128
let actual = CalendarFilter.selectTypes(types: [])(calendar)
146129

0 commit comments

Comments
 (0)