Skip to content

Fix DateValidatorType #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2018
Merged

Fix DateValidatorType #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49b8c55
Write a test that fails
cruisediary Aug 25, 2018
9b01ae7
Fix .shouldBeforeOrSameThen validator expect it should not be descending
cruisediary Aug 25, 2018
a6cefab
Add test case that same target date’s before or after validation shou…
cruisediary Aug 25, 2018
30e011b
Fix the tests failed
cruisediary Aug 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion Example/RxValidatorExample/RxValidatorExampleTests/DateValidateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class DateValidateTests: XCTestCase {
func testDateValidation() {

let targetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
let afterTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
let afterTargetDate = "2018-05-29T12:01+09:00".date(format: .iso8601Auto)!.absoluteDate
let beforeTargetDate = "2018-05-29T11:59+09:00".date(format: .iso8601Auto)!.absoluteDate
let sameTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate

Expand Down Expand Up @@ -49,6 +49,53 @@ class DateValidateTests: XCTestCase {
expect(resultDate).toEventually(equal(targetDate))
}

func testDateValidationShouldBeforeThenWithSameTargetDate() {
// given
let targetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
let sameTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
var resultDate: Date?
var resultError: RxValidatorResult = .valid
let underTest = DateValidationTarget(targetDate)

// when
underTest
.validate(.shouldBeforeThen(date: sameTargetDate))
.asObservable()
.subscribe(onNext: { (date) in
resultDate = date
}, onError: { (error) in
resultError = RxValidatorResult.determine(error: error)
}).disposed(by: disposeBag)

// then
// it should not before date
expect(resultError).toEventually(equal(RxValidatorResult.notBeforeDate))
expect(resultDate).toEventually(beNil())
}

func testDateValidationShouldAfterThenWithSameTargetDate() {
// given
let targetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
let sameTargetDate = "2018-05-29T12:00+09:00".date(format: .iso8601Auto)!.absoluteDate
var resultDate: Date?
var resultError: RxValidatorResult = .valid
let underTest = DateValidationTarget(targetDate)

// when
underTest
.validate(.shouldAfterThen(date: sameTargetDate))
.asObservable()
.subscribe(onNext: { (date) in
resultDate = date
}, onError: { (error) in
resultError = RxValidatorResult.determine(error: error)
}).disposed(by: disposeBag)

// then
// it should not after date
expect(resultError).toEventually(equal(RxValidatorResult.notAfterDate))
expect(resultDate).toEventually(beNil())
}

func testDateValidationWithAllday() {
let targetDate = "2018-05-29T12:00:00+09:00".date(format: .iso8601Auto)!.absoluteDate
Expand Down
8 changes: 4 additions & 4 deletions Sources/rules/Date/DateValidatorType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ public enum DateValidatorType {
}
case let .shouldBeforeThen(comparison):
let result = calendar.compare(value, to: comparison, toGranularity: granularity)
if result == .orderedDescending {
if result != .orderedAscending {
throw RxValidatorResult.notBeforeDate
}
case let .shouldBeforeOrSameThen(comparison):
let result = calendar.compare(value, to: comparison, toGranularity: granularity)
if result == .orderedAscending {
if result == .orderedDescending {
throw RxValidatorResult.notBeforeDate
}
case let .shouldAfterThen(comparison):
let result = calendar.compare(value, to: comparison, toGranularity: granularity)
if result == .orderedAscending {
if result != .orderedDescending {
throw RxValidatorResult.notAfterDate
}
case let .shouldAfterOrSameThen(comparison):
let result = calendar.compare(value, to: comparison, toGranularity: granularity)
if !(result != .orderedAscending) {
if result == .orderedAscending {
throw RxValidatorResult.notAfterDate
}
case let .shouldBeCloseDates(comparison, termOfDays):
Expand Down