| Revision | 105 (tree) |
|---|---|
| Time | 2015-09-28 21:13:43 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -47,6 +47,8 @@ | ||
| 47 | 47 | Assert.assertEquals(date, DateUtil.toAbsolute("翌々日")); |
| 48 | 48 | Assert.assertEquals(date, DateUtil.toAbsolute("明後日")); |
| 49 | 49 | Assert.assertEquals(date, DateUtil.toAbsolute("二日後")); |
| 50 | + Assert.assertEquals(date, DateUtil.toAbsolute("2日後")); | |
| 51 | + Assert.assertEquals(date, DateUtil.toAbsolute("2日後")); | |
| 50 | 52 | Assert.assertEquals(date, DateUtil.toAbsolute("再来日")); |
| 51 | 53 | } |
| 52 | 54 |
| @@ -60,11 +62,17 @@ | ||
| 60 | 62 | Assert.assertEquals(date, DateUtil.toAbsolute("昨日")); |
| 61 | 63 | Assert.assertEquals(date, DateUtil.toAbsolute("去日")); |
| 62 | 64 | Assert.assertEquals(date, DateUtil.toAbsolute("一日前")); |
| 65 | + Assert.assertEquals(date, DateUtil.toAbsolute("1日前")); | |
| 66 | + Assert.assertEquals(date, DateUtil.toAbsolute("1日前")); | |
| 63 | 67 | |
| 64 | 68 | cal.add(Calendar.DATE, -1); |
| 65 | 69 | date = new SimpleDateFormat("yyyyMMdd").format(cal.getTime()); |
| 66 | 70 | Assert.assertEquals(date, DateUtil.toAbsolute("二日前")); |
| 71 | + Assert.assertEquals(date, DateUtil.toAbsolute("2日前")); | |
| 72 | + Assert.assertEquals(date, DateUtil.toAbsolute("2日前")); | |
| 67 | 73 | Assert.assertEquals(date, DateUtil.toAbsolute("一昨日")); |
| 74 | + Assert.assertEquals(date, DateUtil.toAbsolute("1昨日")); | |
| 75 | + Assert.assertEquals(date, DateUtil.toAbsolute("1昨日")); | |
| 68 | 76 | Assert.assertEquals(date, DateUtil.toAbsolute("先々日")); |
| 69 | 77 | } |
| 70 | 78 |
| @@ -83,7 +91,9 @@ | ||
| 83 | 91 | |
| 84 | 92 | cal.add(Calendar.WEEK_OF_MONTH, -2); |
| 85 | 93 | date = new SimpleDateFormat("yyyyMMdd").format(cal.getTime()); |
| 94 | + Assert.assertEquals(date, DateUtil.toAbsolute("三週間前末")); | |
| 86 | 95 | Assert.assertEquals(date, DateUtil.toAbsolute("3週間前末")); |
| 96 | + Assert.assertEquals(date, DateUtil.toAbsolute("3週間前末")); | |
| 87 | 97 | } |
| 88 | 98 | |
| 89 | 99 | @Test |
| @@ -132,7 +142,9 @@ | ||
| 132 | 142 | |
| 133 | 143 | cal.add(Calendar.WEEK_OF_MONTH, -2); |
| 134 | 144 | date = new SimpleDateFormat("yyyyMMdd").format(cal.getTime()); |
| 145 | + Assert.assertEquals(date, DateUtil.toAbsolute("三週間前始")); | |
| 135 | 146 | Assert.assertEquals(date, DateUtil.toAbsolute("3週間前始")); |
| 147 | + Assert.assertEquals(date, DateUtil.toAbsolute("3週間前始")); | |
| 136 | 148 | } |
| 137 | 149 | |
| 138 | 150 | @Test |
| @@ -167,6 +179,8 @@ | ||
| 167 | 179 | Calendar cal = Calendar.getInstance(); |
| 168 | 180 | cal.add(Calendar.DATE, -3); |
| 169 | 181 | String date = new SimpleDateFormat("yyyyMMdd").format(cal.getTime()); |
| 182 | + Assert.assertEquals(date, DateUtil.toAbsolute("三日前")); | |
| 183 | + Assert.assertEquals(date, DateUtil.toAbsolute("3日前")); | |
| 170 | 184 | Assert.assertEquals(date, DateUtil.toAbsolute("3日前")); |
| 171 | 185 | } |
| 172 | 186 |