Skip to content
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

Add before() and after() to RichDate #1538

Merged
merged 2 commits into from
Mar 23, 2016
Merged

Add before() and after() to RichDate #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9561948
Add failing test for RichDate.before()
megaserg Mar 22, 2016
615cc9e
Add before() and after() to RichDate
megaserg Mar 22, 2016
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
3 changes: 3 additions & 0 deletions scalding-date/src/main/scala/com/twitter/scalding/RichDate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ case class RichDate(val timestamp: Long) extends Ordered[RichDate] {
case _ => false
}

def before(that: RichDate): Boolean = compare(that) < 0
def after(that: RichDate): Boolean = compare(that) > 0

/**
* Use String.format to format the date, as opposed to toString, which uses SimpleDateFormat.
*/
Expand Down
7 changes: 7 additions & 0 deletions scalding-date/src/test/scala/com/twitter/scalding/DateTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package com.twitter.scalding

import org.scalatest.WordSpec
import java.util.Calendar
import java.util.TimeZone

class DateTest extends WordSpec {
implicit val tz = DateOps.PACIFIC
Expand Down Expand Up @@ -97,6 +98,12 @@ class DateTest extends WordSpec {
assert(rd1 >= rd1)
assert(rd2 >= rd2)
}
"be able to compare with before() and after() with TimeZone in context" in {
implicit val tz: TimeZone = TimeZone.getDefault
val rd1: RichDate = "2011-01-01"
val rd2: RichDate = "2012-01-01"
assert(rd1.before(rd2))
}
"implicitly convert from long" in {
// This kind of implicit is not safe (what does the long mean?)
implicit def longToDate(l: Long): RichDate = RichDate(l)
Expand Down