litesoft
Subversion Repository Public Repository

litesoft

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions 893 vs 895 for /trunk/Java/core/Anywhere/tests/org/litesoft/core/simpletypes/temporal/TimestampHTest.java

Diff revisions: vs.
  @@ -5,7 +5,7 @@
5 5
6 6 import org.litesoft.core.typeutils.*;
7 7
8 - public class TimestampHTest extends TestCase
8 + public class TimestampHTest extends AbstractTemporalTestSupport<TimestampH>
9 9 {
10 10 public static TestSuite suite()
11 11 {
  @@ -110,28 +110,6 @@
110 110 chk( pYear, pMonth, pDay, pHour, TimestampH.fromYMDH( pTimestampToParse ) );
111 111 }
112 112
113 - // public void test_ContructorsAndToString()
114 - // throws Exception
115 - // {
116 - // chk( 2004, 2, 29, "29 Feb 2004" ); // Leap Day
117 - // chk( 2000, 2, 29, "29 Feb 2000" ); // exception-exception Leap Day
118 - // chk( 1957, 1, 4, "04 Jan 1957" );
119 - // chk( 1957, 1, 4, "01/04/57" );
120 - // chk( 1957, 1, 4, "init 1957/1/4 fini" );
121 - // chk( 1957, 1, 4, "4Jan" );
122 - // chk( 1957, 1, 4, "4Jan57" );
123 - // chk( 1957, 1, 4, "4Jan57" );
124 - // chk( 1957, 1, 4, "4 January 1957" );
125 - // chk( 1957, 1, 4, "January 4, 1957" );
126 - // chk( 1957, 1, 4, "(1/4/1957) January 4" );
127 - // chk( 1957, 1, 4, "(1/4/1957) 04Jan" );
128 - // }
129 - //
130 - // private void chk( int pYear, int pMonth, int pDay, String pToString )
131 - // {
132 - // chk( new TimestampH( pYear, pMonth, pDay, x, x ), pToString, pYear, pMonth, pDay );
133 - // }
134 -
135 113 private void chk( int pYear, int pMonth, int pDay, int pHour, TimestampH pTimestamp )
136 114 {
137 115 String zExpectedStringFormY = Integers.zeroPadIt( 4, pYear );
  @@ -159,250 +137,158 @@
159 137 assertEquals( pTimestamp, sd2 );
160 138 }
161 139
162 - // public void test_addYears()
163 - // {
164 - // chk_addYears( "1957/01/04", 51, "2008/01/04" );
165 - // chk_addYears( "2000/01/15", -1, "1999/01/15" );
166 - // chk_addYears( "2000/02/29", 1, "2001/02/28" );
167 - // chk_addYears( "2000/02/29", 0, "2000/02/29" );
168 - // chk_addYears( "2000/02/29", -1, "1999/02/28" );
169 - // }
170 - //
171 - // private void chk_addYears( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
172 - // {
173 - // TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
174 - // TimestampH nd = od.addYears( pAdjustBy );
175 - // assertEquals( pExpectedYMDH, nd.toYMDH() );
176 - // if ( pAdjustBy == 0 )
177 - // {
178 - // assertTrue( od == nd );
179 - // assertTrue( 0 == od.compareTo( nd ) );
180 - // assertTrue( od.afterOrEqual( nd ) );
181 - // assertTrue( od.beforeOrEqual( nd ) );
182 - // }
183 - // else if ( pAdjustBy > 0 )
184 - // {
185 - // assertTrue( 0 > od.compareTo( nd ) );
186 - // assertFalse( od.afterOrEqual( nd ) );
187 - // assertTrue( od.beforeOrEqual( nd ) );
188 - // }
189 - // else // pAdjustBy < 0
190 - // {
191 - // assertTrue( 0 < od.compareTo( nd ) );
192 - // assertTrue( od.afterOrEqual( nd ) );
193 - // assertFalse( od.beforeOrEqual( nd ) );
194 - // }
195 - // }
196 - //
197 - // public void test_minusYears()
198 - // {
199 - // chk_minusYears( "2008/01/04", 51, "1957/01/04" );
200 - // chk_minusYears( "2000/01/15", -1, "2001/01/15" );
201 - // chk_minusYears( "2000/02/29", 1, "1999/02/28" );
202 - // chk_minusYears( "2000/02/29", 0, "2000/02/29" );
203 - // chk_minusYears( "2000/02/29", -1, "2001/02/28" );
204 - // }
205 - //
206 - // private void chk_minusYears( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
207 - // {
208 - // TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
209 - // TimestampH nd = od.minusYears( pAdjustBy );
210 - // assertEquals( pExpectedYMDH, nd.toYMDH() );
211 - // if ( pAdjustBy == 0 )
212 - // {
213 - // assertTrue( od == nd );
214 - // assertTrue( 0 == od.compareTo( nd ) );
215 - // assertTrue( od.afterOrEqual( nd ) );
216 - // assertTrue( od.beforeOrEqual( nd ) );
217 - // }
218 - // else if ( pAdjustBy < 0 )
219 - // {
220 - // assertTrue( 0 > od.compareTo( nd ) );
221 - // assertFalse( od.afterOrEqual( nd ) );
222 - // assertTrue( od.beforeOrEqual( nd ) );
223 - // }
224 - // else // pAdjustBy > 0
225 - // {
226 - // assertTrue( 0 < od.compareTo( nd ) );
227 - // assertTrue( od.afterOrEqual( nd ) );
228 - // assertFalse( od.beforeOrEqual( nd ) );
229 - // }
230 - // }
231 - //
232 - // public void test_addMonths()
233 - // {
234 - // chk_addMonths( "1957/01/04", 2, "1957/03/04" );
235 - // chk_addMonths( "2000/01/15", -1, "1999/12/15" );
236 - // chk_addMonths( "2000/02/29", 12, "2001/02/28" );
237 - // chk_addMonths( "2000/02/29", 0, "2000/02/29" );
238 - // chk_addMonths( "2000/02/29", -12, "1999/02/28" );
239 - // }
240 - //
241 - // private void chk_addMonths( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
242 - // {
243 - // TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
244 - // TimestampH nd = od.addMonths( pAdjustBy );
245 - // assertEquals( pExpectedYMDH, nd.toYMDH() );
246 - // if ( pAdjustBy == 0 )
247 - // {
248 - // assertTrue( od == nd );
249 - // assertTrue( 0 == od.compareTo( nd ) );
250 - // assertTrue( od.afterOrEqual( nd ) );
251 - // assertTrue( od.beforeOrEqual( nd ) );
252 - // }
253 - // else if ( pAdjustBy > 0 )
254 - // {
255 - // assertTrue( 0 > od.compareTo( nd ) );
256 - // assertFalse( od.afterOrEqual( nd ) );
257 - // assertTrue( od.beforeOrEqual( nd ) );
258 - // }
259 - // else // pAdjustBy < 0
260 - // {
261 - // assertTrue( 0 < od.compareTo( nd ) );
262 - // assertTrue( od.afterOrEqual( nd ) );
263 - // assertFalse( od.beforeOrEqual( nd ) );
264 - // }
265 - // }
266 - //
267 - // public void test_minusMonths()
268 - // {
269 - // chk_minusMonths( "1957/03/04", 2, "1957/01/04" );
270 - // chk_minusMonths( "1999/12/15", -1, "2000/01/15" );
271 - // chk_minusMonths( "2000/02/29", 12, "1999/02/28" );
272 - // chk_minusMonths( "2000/02/29", 0, "2000/02/29" );
273 - // chk_minusMonths( "2000/02/29", -12, "2001/02/28" );
274 - // }
275 - //
276 - // private void chk_minusMonths( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
277 - // {
278 - // TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
279 - // TimestampH nd = od.minusMonths( pAdjustBy );
280 - // assertEquals( pExpectedYMDH, nd.toYMDH() );
281 - // if ( pAdjustBy == 0 )
282 - // {
283 - // assertTrue( od == nd );
284 - // assertTrue( 0 == od.compareTo( nd ) );
285 - // assertTrue( od.afterOrEqual( nd ) );
286 - // assertTrue( od.beforeOrEqual( nd ) );
287 - // }
288 - // else if ( pAdjustBy < 0 )
289 - // {
290 - // assertTrue( 0 > od.compareTo( nd ) );
291 - // assertFalse( od.afterOrEqual( nd ) );
292 - // assertTrue( od.beforeOrEqual( nd ) );
293 - // }
294 - // else // pAdjustBy > 0
295 - // {
296 - // assertTrue( 0 < od.compareTo( nd ) );
297 - // assertTrue( od.afterOrEqual( nd ) );
298 - // assertFalse( od.beforeOrEqual( nd ) );
299 - // }
300 - // }
301 - //
302 - // public void test_addDays_daysTill()
303 - // {
304 - // chk_addDays( "1957/01/04", 0, "1957/01/04" );
305 - // chk_addDays( "1957/01/04", 2, "1957/01/06" );
306 - // chk_addDays( "2000/01/15", -1, "2000/01/14" );
307 - // chk_addDays( "2000/02/29", 12, "2000/03/12" );
308 - // chk_addDays( "2000/02/29", 32, "2000/04/01" );
309 - // chk_addDays( "2000/02/29", -60, "1999/12/31" );
310 - // chk_addDays( "1857/01/04", 365, "1858/01/04" );
311 - // chk_addDays( "1857/01/04", 3 * 365, "1860/01/04" );
312 - // chk_addDays( "1857/01/04", 4 * 365 + 1, "1861/01/04" );
313 - // chk_addDays( "1857/01/04", 20 * 365 + 5, "1877/01/04" );
314 - // chk_addDays( "1857/01/04", 40 * 365 + 10, "1897/01/04" );
315 - // chk_addDays( "1857/01/04", 44 * 365 + 10, "1901/01/04" );
316 - // chk_addDays( "1857/01/04", 60 * 365 + 14, "1917/01/04" );
317 - // chk_addDays( "1857/01/04", 80 * 365 + 19, "1937/01/04" );
318 - // chk_addDays( "1857/01/04", 100 * 365 + 24, "1957/01/04" );
319 - // }
320 - //
321 - // private void chk_addDays( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
322 - // {
323 - // TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
324 - // TimestampH nd = od.addDays( pAdjustBy );
325 - // assertEquals( pExpectedYMDH, nd.toYMDH() );
326 - // assertEquals( pAdjustBy, od.daysTill( nd ) );
327 - // if ( pAdjustBy == 0 )
328 - // {
329 - // assertTrue( od == nd );
330 - // assertTrue( 0 == od.compareTo( nd ) );
331 - // assertTrue( od.afterOrEqual( nd ) );
332 - // assertTrue( od.beforeOrEqual( nd ) );
333 - // }
334 - // else if ( pAdjustBy > 0 )
335 - // {
336 - // assertTrue( 0 > od.compareTo( nd ) );
337 - // assertFalse( od.afterOrEqual( nd ) );
338 - // assertTrue( od.beforeOrEqual( nd ) );
339 - // }
340 - // else // pAdjustBy < 0
341 - // {
342 - // assertTrue( 0 < od.compareTo( nd ) );
343 - // assertTrue( od.afterOrEqual( nd ) );
344 - // assertFalse( od.beforeOrEqual( nd ) );
345 - // }
346 - // }
347 - //
348 - // public void test_minusDays_daysTill()
349 - // {
350 - // chk_minusDays( "1957/01/04", 0, "1957/01/04" );
351 - // chk_minusDays( "1957/01/06", 2, "1957/01/04" );
352 - // chk_minusDays( "2000/01/14", -1, "2000/01/15" );
353 - // chk_minusDays( "2000/03/12", 12, "2000/02/29" );
354 - // chk_minusDays( "2000/04/01", 32, "2000/02/29" );
355 - // chk_minusDays( "1999/12/31", -60, "2000/02/29" );
356 - // chk_minusDays( "1957/01/04", 100 * 365 + 24, "1857/01/04" );
357 - // }
358 - //
359 - // private void chk_minusDays( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
360 - // {
361 - // TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
362 - // TimestampH nd = od.minusDays( pAdjustBy );
363 - // assertEquals( pExpectedYMDH, nd.toYMDH() );
364 - // assertEquals( -pAdjustBy, od.daysTill( nd ) );
365 - // if ( pAdjustBy == 0 )
366 - // {
367 - // assertTrue( od == nd );
368 - // assertTrue( 0 == od.compareTo( nd ) );
369 - // assertTrue( od.afterOrEqual( nd ) );
370 - // assertTrue( od.beforeOrEqual( nd ) );
371 - // }
372 - // else if ( pAdjustBy < 0 )
373 - // {
374 - // assertTrue( 0 > od.compareTo( nd ) );
375 - // assertFalse( od.afterOrEqual( nd ) );
376 - // assertTrue( od.beforeOrEqual( nd ) );
377 - // }
378 - // else // pAdjustBy > 0
379 - // {
380 - // assertTrue( 0 < od.compareTo( nd ) );
381 - // assertTrue( od.afterOrEqual( nd ) );
382 - // assertFalse( od.beforeOrEqual( nd ) );
383 - // }
384 - // }
385 - //
386 - // public void test_after_before_null()
387 - // {
388 - // TimestampH sd = new TimestampH( 2000, 1, 1 );
389 - // try
390 - // {
391 - // sd.afterOrEqual( null );
392 - // fail( "Did Not fail on '" + sd + "': afterOrEqual( null )" );
393 - // }
394 - // catch ( IllegalArgumentException expected )
395 - // {
396 - // // expected
397 - // }
398 - // try
399 - // {
400 - // sd.beforeOrEqual( null );
401 - // fail( "Did Not fail on '" + sd + "': beforeOrEqual( null )" );
402 - // }
403 - // catch ( IllegalArgumentException expected )
404 - // {
405 - // // expected
406 - // }
407 - // }
140 + public void test_addYears()
141 + {
142 + chk_addYears( "1957/01/04 0", 51, "2008/01/04 00" );
143 + chk_addYears( "2000/01/15 1", -1, "1999/01/15 01" );
144 + chk_addYears( "2000/02/29 2", 1, "2001/02/28 02" );
145 + chk_addYears( "2000/02/29 12", 0, "2000/02/29 12" );
146 + chk_addYears( "2000/02/29 23", -1, "1999/02/28 23" );
147 + }
148 +
149 + private void chk_addYears( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
150 + {
151 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
152 + TimestampH nd = od.addYears( pAdjustBy );
153 + assertEquals( pExpectedYMDH, nd.toYMDH() );
154 + compareCheck( add( pAdjustBy ), od, nd );
155 + }
156 +
157 + public void test_minusYears()
158 + {
159 + chk_minusYears( "2008/01/04 0", 51, "1957/01/04 00" );
160 + chk_minusYears( "2000/01/15 1", -1, "2001/01/15 01" );
161 + chk_minusYears( "2000/02/29 2", 1, "1999/02/28 02" );
162 + chk_minusYears( "2000/02/29 12", 0, "2000/02/29 12" );
163 + chk_minusYears( "2000/02/29 23", -1, "2001/02/28 23" );
164 + }
165 +
166 + private void chk_minusYears( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
167 + {
168 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
169 + TimestampH nd = od.minusYears( pAdjustBy );
170 + assertEquals( pExpectedYMDH, nd.toYMDH() );
171 + compareCheck( minus( pAdjustBy ), od, nd );
172 + }
173 +
174 + public void test_addMonths()
175 + {
176 + chk_addMonths( "1957/01/04 0", 2, "1957/03/04 00" );
177 + chk_addMonths( "2000/01/15 1", -1, "1999/12/15 01" );
178 + chk_addMonths( "2000/02/29 3", 12, "2001/02/28 03" );
179 + chk_addMonths( "2000/02/29 12", 0, "2000/02/29 12" );
180 + chk_addMonths( "2000/02/29 23", -12, "1999/02/28 23" );
181 + }
182 +
183 + private void chk_addMonths( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
184 + {
185 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
186 + TimestampH nd = od.addMonths( pAdjustBy );
187 + assertEquals( pExpectedYMDH, nd.toYMDH() );
188 + compareCheck( add( pAdjustBy ), od, nd );
189 + }
190 +
191 + public void test_minusMonths()
192 + {
193 + chk_minusMonths( "1957/03/04 0", 2, "1957/01/04 00" );
194 + chk_minusMonths( "1999/12/15 1", -1, "2000/01/15 01" );
195 + chk_minusMonths( "2000/02/29 2", 12, "1999/02/28 02" );
196 + chk_minusMonths( "2000/02/29 12", 0, "2000/02/29 12" );
197 + chk_minusMonths( "2000/02/29 23", -12, "2001/02/28 23" );
198 + }
199 +
200 + private void chk_minusMonths( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
201 + {
202 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
203 + TimestampH nd = od.minusMonths( pAdjustBy );
204 + assertEquals( pExpectedYMDH, nd.toYMDH() );
205 + compareCheck( minus( pAdjustBy ), od, nd );
206 + }
207 +
208 + public void test_addDays()
209 + {
210 + chk_addDays( "1957/01/04 0", 0, "1957/01/04 00" );
211 + chk_addDays( "1957/01/04 1", 2, "1957/01/06 01" );
212 + chk_addDays( "2000/01/15 2", -1, "2000/01/14 02" );
213 + chk_addDays( "2000/02/29 3", 12, "2000/03/12 03" );
214 + chk_addDays( "2000/02/29 4", 32, "2000/04/01 04" );
215 + chk_addDays( "2000/02/29 5", -60, "1999/12/31 05" );
216 + chk_addDays( "1857/01/04 6", 365, "1858/01/04 06" );
217 + chk_addDays( "1857/01/04 7", 3 * 365, "1860/01/04 07" );
218 + chk_addDays( "1857/01/04 9", 4 * 365 + 1, "1861/01/04 09" );
219 + chk_addDays( "1857/01/04 11", 20 * 365 + 5, "1877/01/04 11" );
220 + chk_addDays( "1857/01/04 12", 40 * 365 + 10, "1897/01/04 12" );
221 + chk_addDays( "1857/01/04 13", 44 * 365 + 10, "1901/01/04 13" );
222 + chk_addDays( "1857/01/04 16", 60 * 365 + 14, "1917/01/04 16" );
223 + chk_addDays( "1857/01/04 19", 80 * 365 + 19, "1937/01/04 19" );
224 + chk_addDays( "1857/01/04 23", 100 * 365 + 24, "1957/01/04 23" );
225 + }
226 +
227 + private void chk_addDays( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
228 + {
229 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
230 + TimestampH nd = od.addDays( pAdjustBy );
231 + assertEquals( pExpectedYMDH, nd.toYMDH() );
232 + compareCheck( add( pAdjustBy ), od, nd );
233 + }
234 +
235 + public void test_minusDays()
236 + {
237 + chk_minusDays( "1957/01/04 0", 0, "1957/01/04 00" );
238 + chk_minusDays( "1957/01/06 1", 2, "1957/01/04 01" );
239 + chk_minusDays( "2000/01/14 2", -1, "2000/01/15 02" );
240 + chk_minusDays( "2000/03/12 6", 12, "2000/02/29 06" );
241 + chk_minusDays( "2000/04/01 12", 32, "2000/02/29 12" );
242 + chk_minusDays( "1999/12/31 17", -60, "2000/02/29 17" );
243 + chk_minusDays( "1957/01/04 23", 100 * 365 + 24, "1857/01/04 23" );
244 + }
245 +
246 + private void chk_minusDays( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
247 + {
248 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
249 + TimestampH nd = od.minusDays( pAdjustBy );
250 + assertEquals( pExpectedYMDH, nd.toYMDH() );
251 + compareCheck( minus( pAdjustBy ), od, nd );
252 + }
253 +
254 + public void test_addHours()
255 + {
256 + chk_addHours( "1957/01/04 0", 0, "1957/01/04 00" );
257 + chk_addHours( "1957/01/04 1", 2, "1957/01/04 03" );
258 + chk_addHours( "2000/01/15 2", -1, "2000/01/15 01" );
259 + chk_addHours( "2000/02/29 3", 12, "2000/02/29 15" );
260 + chk_addHours( "2000/02/29 4", 32, "2000/03/01 12" );
261 + chk_addHours( "2000/02/29 5", -29, "2000/02/28 00" );
262 + }
263 +
264 + private void chk_addHours( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
265 + {
266 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
267 + TimestampH nd = od.addHours( pAdjustBy );
268 + assertEquals( pExpectedYMDH, nd.toYMDH() );
269 + compareCheck( add( pAdjustBy ), od, nd );
270 + }
271 +
272 + public void test_minusHours()
273 + {
274 + chk_minusHours( "1957/01/04 0", 0, "1957/01/04 00" );
275 + chk_minusHours( "1957/01/06 1", 2, "1957/01/05 23" );
276 + chk_minusHours( "2000/01/14 2", -1, "2000/01/14 03" );
277 + chk_minusHours( "2000/03/12 6", 12, "2000/03/11 18" );
278 + chk_minusHours( "2000/04/01 12", 32, "2000/03/31 04" );
279 + chk_minusHours( "1999/12/31 17", -56, "2000/01/03 01" );
280 + }
281 +
282 + private void chk_minusHours( String pTimestampYMDH, int pAdjustBy, String pExpectedYMDH )
283 + {
284 + TimestampH od = TimestampH.fromYMDH( pTimestampYMDH );
285 + TimestampH nd = od.minusHours( pAdjustBy );
286 + assertEquals( pExpectedYMDH, nd.toYMDH() );
287 + compareCheck( minus( pAdjustBy ), od, nd );
288 + }
289 +
290 + public void test_after_before_null()
291 + {
292 + chkAfterBeforeNull( TimestampH.fromWallTime( 2000, 1, 1, 0 ) );
293 + }
408 294 }

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Anywhere/tests/org/litesoft/core/simpletypes/temporal/TimestampHTest.java

Need assistance?   Get in touch, or head to our documentation site.