File tree Expand file tree Collapse file tree 2 files changed +12
-30
lines changed Expand file tree Collapse file tree 2 files changed +12
-30
lines changed Original file line number Diff line number Diff line change @@ -137,11 +137,6 @@ func (p Period) DivisibleBy(smaller Period) (bool, error) {
137
137
return true , nil // Years/months always contain days
138
138
}
139
139
140
- // Days are conceptually divisible by hours/minutes/seconds
141
- if p .isDayLike () && smaller .isTimeLike () {
142
- return true , nil // Days always contain hours/minutes/seconds
143
- }
144
-
145
140
var err error
146
141
per := smaller
147
142
for i := 1 ; i < MAX_SAFE_ITERATION_COUNT ; i ++ {
@@ -180,19 +175,6 @@ func (p Period) isDay() bool {
180
175
p .Period .Hours () == 0 && p .Period .Minutes () == 0 && p .Period .Seconds () == 0
181
176
}
182
177
183
- // isDayLike returns true if the period contains only days (potentially more than 1)
184
- func (p Period ) isDayLike () bool {
185
- return p .Period .Days () > 0 &&
186
- p .Period .Years () == 0 && p .Period .Months () == 0 && p .Period .Weeks () == 0 &&
187
- p .Period .Hours () == 0 && p .Period .Minutes () == 0 && p .Period .Seconds () == 0
188
- }
189
-
190
- // isTimeLike returns true if the period contains only hours, minutes, and/or seconds
191
- func (p Period ) isTimeLike () bool {
192
- return (p .Period .Hours () != 0 || p .Period .Minutes () != 0 || p .Period .Seconds () != 0 ) &&
193
- p .Period .Years () == 0 && p .Period .Months () == 0 && p .Period .Weeks () == 0 && p .Period .Days () == 0
194
- }
195
-
196
178
func Between (start time.Time , end time.Time ) Period {
197
179
per := period .Between (start , end )
198
180
return Period {per }
Original file line number Diff line number Diff line change @@ -179,45 +179,45 @@ func TestDivisibleBy(t *testing.T) {
179
179
hasError : false ,
180
180
},
181
181
{
182
- name : "1 day divisible by 1 hour" ,
182
+ name : "1 day not divisible by 1 hour (different units) " ,
183
183
larger : "P1D" ,
184
184
smaller : "PT1H" ,
185
- expected : true ,
185
+ expected : false ,
186
186
hasError : false ,
187
187
},
188
188
{
189
- name : "1 day divisible by 2 hours" ,
189
+ name : "1 day not divisible by 2 hours (different units) " ,
190
190
larger : "P1D" ,
191
191
smaller : "PT2H" ,
192
- expected : true ,
192
+ expected : false ,
193
193
hasError : false ,
194
194
},
195
195
{
196
- name : "1 day divisible by 4 hours" ,
196
+ name : "1 day not divisible by 4 hours (different units) " ,
197
197
larger : "P1D" ,
198
198
smaller : "PT4H" ,
199
- expected : true ,
199
+ expected : false ,
200
200
hasError : false ,
201
201
},
202
202
{
203
- name : "1 day divisible by 6 hours" ,
203
+ name : "1 day not divisible by 6 hours (different units) " ,
204
204
larger : "P1D" ,
205
205
smaller : "PT6H" ,
206
- expected : true ,
206
+ expected : false ,
207
207
hasError : false ,
208
208
},
209
209
{
210
- name : "1 day divisible by 8 hours" ,
210
+ name : "1 day not divisible by 8 hours (different units) " ,
211
211
larger : "P1D" ,
212
212
smaller : "PT8H" ,
213
- expected : true ,
213
+ expected : false ,
214
214
hasError : false ,
215
215
},
216
216
{
217
- name : "1 day divisible by 12 hours" ,
217
+ name : "1 day not divisible by 12 hours (different units) " ,
218
218
larger : "P1D" ,
219
219
smaller : "PT12H" ,
220
- expected : true ,
220
+ expected : false ,
221
221
hasError : false ,
222
222
},
223
223
{
You can’t perform that action at this time.
0 commit comments