19
19
20
20
package edu .iris .wss .endpoints ;
21
21
22
- import edu . iris . wss . endpoints . RecordMetaData ;
22
+
23
23
import edu .iris .wss .framework .Util ;
24
24
import edu .sc .seis .seisFile .mseed .Btime ;
25
25
import java .text .SimpleDateFormat ;
26
+ import java .time .Instant ;
26
27
import java .util .Calendar ;
27
- import java .util .Date ;
28
- import java .util .TimeZone ;
29
28
import org .apache .log4j .Logger ;
30
29
import org .junit .After ;
31
30
import org .junit .AfterClass ;
@@ -61,6 +60,19 @@ public void setUp() {
61
60
public void tearDown () {
62
61
}
63
62
63
+ public Calendar btimeToCalendar (Btime btime ) {
64
+ Calendar cal = Calendar .getInstance ();
65
+
66
+ cal .set (Calendar .YEAR , btime .getYear ());
67
+ cal .set (Calendar .DAY_OF_YEAR , btime .getDayOfYear ());
68
+ cal .set (Calendar .HOUR_OF_DAY , btime .getHour ());
69
+ cal .set (Calendar .MINUTE , btime .getMin ());
70
+ cal .set (Calendar .SECOND , btime .getSec ());
71
+ cal .set (Calendar .MILLISECOND , btime .getTenthMilli () / 10 );
72
+
73
+ return cal ;
74
+ }
75
+
64
76
/**
65
77
* Test of getSize method, checks for null on new class.
66
78
*/
@@ -114,15 +126,15 @@ public void testGetStartAndEndAreNull() {
114
126
@ Test
115
127
public void testGetStartAndEnd () {
116
128
RecordMetaData instance = new RecordMetaData ();
117
- Btime expStart = new Btime (new Date ());
129
+ Btime expStart = new Btime (Instant . now ());
118
130
instance .setStart (expStart );
119
131
Btime result = instance .getStart ();
120
132
assertEquals (expStart , result );
121
133
122
134
// check end is default null
123
135
assertEquals (instance .getEnd (), null );
124
136
125
- Btime expEnd = new Btime (new Date ());
137
+ Btime expEnd = new Btime (Instant . now ());
126
138
instance .setEnd (expEnd );
127
139
Btime endResult = instance .getEnd ();
128
140
assertEquals (expEnd , endResult );
@@ -148,7 +160,7 @@ public void testSetIfEarlier() throws Exception {
148
160
start .set (Calendar .SECOND , 50 );
149
161
start .set (Calendar .MILLISECOND , 999 );
150
162
151
- instance .setIfEarlier (new Btime (start .getTime ( )));
163
+ instance .setIfEarlier (new Btime (Instant . ofEpochMilli ( start .getTimeInMillis () )));
152
164
153
165
// expected string base on constraints of substring in method
154
166
String startExpected = "2011,036,17:24:50.999" ;
@@ -157,27 +169,28 @@ public void testSetIfEarlier() throws Exception {
157
169
// thread safe
158
170
SimpleDateFormat fmt = new SimpleDateFormat (RecordMetaData .SeisFileDataFormat );
159
171
fmt .setTimeZone (Util .UTZ_TZ );
160
- String startResult = fmt .format (instance .getStart (). convertToCalendar ( ).getTime ());
172
+ String startResult = fmt .format (btimeToCalendar ( instance .getStart ()).getTime ());
161
173
// using the same formatter, I should get the same string from date
162
174
// less the microsecond part
175
+
163
176
assertTrue (startResult .equals (startExpected ));
164
177
165
178
// an earlier time should result in a change to start
166
179
startExpected = "2011,036,17:24:49.123" ;
167
180
start .set (Calendar .SECOND , 49 );
168
181
start .set (Calendar .MILLISECOND , 123 );
169
182
170
- instance .setIfEarlier (new Btime (start .getTime ( )));
171
- startResult = fmt .format (instance .getStart (). convertToCalendar ( ).getTime ());
183
+ instance .setIfEarlier (new Btime (Instant . ofEpochMilli ( start .getTimeInMillis () )));
184
+ startResult = fmt .format (btimeToCalendar ( instance .getStart ()).getTime ());
172
185
assertTrue (startResult .equals (startExpected ));
173
186
174
187
// a later time should result in no change
175
188
String startPrevious = startResult ;
176
189
//startExpected = "2011,036,17:24:51.123";
177
190
start .set (Calendar .SECOND , 51 );
178
191
start .set (Calendar .MILLISECOND , 123 );
179
- instance .setIfEarlier (new Btime (start .getTime ( )));
180
- startResult = fmt .format (instance .getStart (). convertToCalendar ( ).getTime ());
192
+ instance .setIfEarlier (new Btime (Instant . ofEpochMilli ( start .getTimeInMillis () )));
193
+ startResult = fmt .format (btimeToCalendar ( instance .getStart ()).getTime ());
181
194
182
195
logger .info ("*** startPrevious: " + startPrevious );
183
196
logger .info ("*** later start: " + start );
@@ -203,31 +216,31 @@ public void testSetIfLater() throws Exception {
203
216
end .set (Calendar .SECOND , 50 );
204
217
end .set (Calendar .MILLISECOND , 999 );
205
218
206
- instance .setIfLater (new Btime (end .getTime ( )));
219
+ instance .setIfLater (new Btime (Instant . ofEpochMilli ( end .getTimeInMillis () )));
207
220
208
221
String endExpected = "2011,036,17:24:50.999" ;
209
222
// creating format everytime because SimpleDataFormat is not
210
223
// thread safe
211
224
SimpleDateFormat fmt = new SimpleDateFormat (RecordMetaData .SeisFileDataFormat );
212
225
fmt .setTimeZone (Util .UTZ_TZ );
213
- String endResult = fmt .format (instance .getEnd (). convertToCalendar ( ).getTime ());
226
+ String endResult = fmt .format (btimeToCalendar ( instance .getEnd ()).getTime ());
214
227
assertTrue (endResult .equals (endExpected ));
215
228
216
229
// a later time should result in a change to end
217
230
endExpected = "2011,036,17:24:51.123" ;
218
231
end .set (Calendar .SECOND , 51 );
219
232
end .set (Calendar .MILLISECOND , 123 );
220
- instance .setIfLater (new Btime (end .getTime ( )));
221
- endResult = fmt .format (instance .getEnd (). convertToCalendar ( ).getTime ());
233
+ instance .setIfLater (new Btime (Instant . ofEpochMilli ( end .getTimeInMillis () )));
234
+ endResult = fmt .format (btimeToCalendar ( instance .getEnd ()).getTime ());
222
235
assertTrue (endResult .equals (endExpected ));
223
236
224
237
// an earlier time should result in no change
225
238
String endPrevious = endResult ;
226
239
//endExpected = "2011,036,17:24:49.123";
227
240
end .set (Calendar .SECOND , 49 );
228
241
end .set (Calendar .MILLISECOND , 123 );
229
- instance .setIfLater (new Btime (end .getTime ( )));
230
- endResult = fmt .format (instance .getEnd (). convertToCalendar ( ).getTime ());
242
+ instance .setIfLater (new Btime (Instant . ofEpochMilli ( end .getTimeInMillis () )));
243
+ endResult = fmt .format (btimeToCalendar ( instance .getEnd ()).getTime ());
231
244
232
245
logger .info ("*** endPrevious: " + endPrevious );
233
246
logger .info ("*** earlier end: " + end );
0 commit comments