Skip to content

Commit ce99e11

Browse files
committed
update test code to match updatd seisFile version in main
1 parent c647570 commit ce99e11

File tree

1 file changed

+30
-17
lines changed

1 file changed

+30
-17
lines changed

src/test/java/edu/iris/wss/endpoints/RecordMetaDataTest.java

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919

2020
package edu.iris.wss.endpoints;
2121

22-
import edu.iris.wss.endpoints.RecordMetaData;
22+
2323
import edu.iris.wss.framework.Util;
2424
import edu.sc.seis.seisFile.mseed.Btime;
2525
import java.text.SimpleDateFormat;
26+
import java.time.Instant;
2627
import java.util.Calendar;
27-
import java.util.Date;
28-
import java.util.TimeZone;
2928
import org.apache.log4j.Logger;
3029
import org.junit.After;
3130
import org.junit.AfterClass;
@@ -61,6 +60,19 @@ public void setUp() {
6160
public void tearDown() {
6261
}
6362

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+
6476
/**
6577
* Test of getSize method, checks for null on new class.
6678
*/
@@ -114,15 +126,15 @@ public void testGetStartAndEndAreNull() {
114126
@Test
115127
public void testGetStartAndEnd() {
116128
RecordMetaData instance = new RecordMetaData();
117-
Btime expStart = new Btime(new Date());
129+
Btime expStart = new Btime(Instant.now());
118130
instance.setStart(expStart);
119131
Btime result = instance.getStart();
120132
assertEquals(expStart, result);
121133

122134
// check end is default null
123135
assertEquals(instance.getEnd(), null);
124136

125-
Btime expEnd = new Btime(new Date());
137+
Btime expEnd = new Btime(Instant.now());
126138
instance.setEnd(expEnd);
127139
Btime endResult = instance.getEnd();
128140
assertEquals(expEnd, endResult);
@@ -148,7 +160,7 @@ public void testSetIfEarlier() throws Exception {
148160
start.set(Calendar.SECOND, 50);
149161
start.set(Calendar.MILLISECOND, 999);
150162

151-
instance.setIfEarlier(new Btime(start.getTime()));
163+
instance.setIfEarlier(new Btime(Instant.ofEpochMilli(start.getTimeInMillis())));
152164

153165
// expected string base on constraints of substring in method
154166
String startExpected = "2011,036,17:24:50.999";
@@ -157,27 +169,28 @@ public void testSetIfEarlier() throws Exception {
157169
// thread safe
158170
SimpleDateFormat fmt = new SimpleDateFormat(RecordMetaData.SeisFileDataFormat);
159171
fmt.setTimeZone(Util.UTZ_TZ);
160-
String startResult = fmt.format(instance.getStart().convertToCalendar().getTime());
172+
String startResult = fmt.format(btimeToCalendar(instance.getStart()).getTime());
161173
// using the same formatter, I should get the same string from date
162174
// less the microsecond part
175+
163176
assertTrue(startResult.equals(startExpected));
164177

165178
// an earlier time should result in a change to start
166179
startExpected = "2011,036,17:24:49.123";
167180
start.set(Calendar.SECOND, 49);
168181
start.set(Calendar.MILLISECOND, 123);
169182

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());
172185
assertTrue(startResult.equals(startExpected));
173186

174187
// a later time should result in no change
175188
String startPrevious = startResult;
176189
//startExpected = "2011,036,17:24:51.123";
177190
start.set(Calendar.SECOND, 51);
178191
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());
181194

182195
logger.info("*** startPrevious: " + startPrevious);
183196
logger.info("*** later start: " + start);
@@ -203,31 +216,31 @@ public void testSetIfLater() throws Exception {
203216
end.set(Calendar.SECOND, 50);
204217
end.set(Calendar.MILLISECOND, 999);
205218

206-
instance.setIfLater(new Btime(end.getTime()));
219+
instance.setIfLater(new Btime(Instant.ofEpochMilli(end.getTimeInMillis())));
207220

208221
String endExpected = "2011,036,17:24:50.999";
209222
// creating format everytime because SimpleDataFormat is not
210223
// thread safe
211224
SimpleDateFormat fmt = new SimpleDateFormat(RecordMetaData.SeisFileDataFormat);
212225
fmt.setTimeZone(Util.UTZ_TZ);
213-
String endResult = fmt.format(instance.getEnd().convertToCalendar().getTime());
226+
String endResult = fmt.format(btimeToCalendar(instance.getEnd()).getTime());
214227
assertTrue(endResult.equals(endExpected));
215228

216229
// a later time should result in a change to end
217230
endExpected = "2011,036,17:24:51.123";
218231
end.set(Calendar.SECOND, 51);
219232
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());
222235
assertTrue(endResult.equals(endExpected));
223236

224237
// an earlier time should result in no change
225238
String endPrevious = endResult;
226239
//endExpected = "2011,036,17:24:49.123";
227240
end.set(Calendar.SECOND, 49);
228241
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());
231244

232245
logger.info("*** endPrevious: " + endPrevious);
233246
logger.info("*** earlier end: " + end);

0 commit comments

Comments
 (0)