Project

General

Profile

« Previous | Next » 

Revision f1a25720

Added by Katja Luther over 6 years ago

  • ID f1a25720755daa96e8838a617a660dfced7b9f31
  • Parent 23e50194

first implementation for change from joda time to java8 time

View differences:

cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/OaiPmhViewTest.java
1 1
package eu.etaxonomy.cdm.remote.view;
2 2

  
3 3
import java.net.URI;
4
import java.time.ZoneId;
5
import java.time.ZonedDateTime;
4 6
import java.util.ArrayList;
5 7
import java.util.HashMap;
6 8
import java.util.HashSet;
......
12 14
import org.custommonkey.xmlunit.XMLUnit;
13 15
import org.dozer.Mapper;
14 16
import org.hibernate.envers.RevisionType;
15
import org.joda.time.DateTime;
16 17
import org.joda.time.format.ISODateTimeFormat;
17 18
import org.junit.Before;
18 19
import org.junit.Ignore;
......
150 151

  
151 152
        Taxon taxon = Taxon.NewInstance((TaxonName)null, null);
152 153
        taxon.setTitleCache("TitleCache", true);
153
        taxon.setCreated(new DateTime());
154
        taxon.setCreated(ZonedDateTime.now());
154 155
        taxon.setLsid(new LSID("urn:lsid:example.org:taxonconcepts:1"));
155 156

  
156 157
        AuditEventRecord<Taxon> auditEventRecord = new AuditEventRecordImpl<Taxon>(new Object[] {taxon, new AuditEvent(),RevisionType.ADD});
......
172 173

  
173 174
        Taxon taxon = Taxon.NewInstance(null, null);
174 175
        taxon.setTitleCache("TitleCache", true);
175
        taxon.setCreated(new DateTime());
176
        taxon.setCreated(ZonedDateTime.now());
176 177
        taxon.setLsid(new LSID("urn:lsid:example.org:taxonconcepts:1"));
177 178

  
178 179
        AuditEventRecord<Taxon> auditEventRecord = new AuditEventRecordImpl<Taxon>(new Object[] {taxon, new AuditEvent(),RevisionType.ADD});
......
222 223

  
223 224
        model.put("metadataPrefix", MetadataPrefix.OAI_DC);
224 225

  
225
        DateTime from = new DateTime(1990,2,1,12,0,0, 0);
226
        DateTime until = new DateTime();
226
        ZonedDateTime from = ZonedDateTime.of(1990,2,1,12,0,0, 0, ZoneId.systemDefault());
227
        ZonedDateTime until = ZonedDateTime.of(1990,2,1,12,0,0, 0, ZoneId.systemDefault());
227 228
        model.put("from",from);
228 229
        model.put("until", until);
229 230

  
......
231 232
        for(int i = 0; i < 10; i++) {
232 233
            TaxonBase taxon = Taxon.NewInstance(null, null);
233 234
            taxon.setTitleCache("TitleCache", true);
234
            taxon.setCreated(new DateTime());
235
            taxon.setCreated(ZonedDateTime.now());
235 236
            taxon.setLsid(new LSID("urn:lsid:example.org:taxonconcepts:"+i));
236 237
            if((i % 3) == 0 ) {
237 238
                AuditEventRecord<TaxonBase> auditEventRecord = new AuditEventRecordImpl<TaxonBase>(new Object[] {taxon, new AuditEvent(),RevisionType.DEL});
......
259 260

  
260 261
        model.put("metadataPrefix", MetadataPrefix.OAI_DC);
261 262

  
262
        DateTime from = new DateTime(1990,2,1,12,0,0, 0);
263
        DateTime until = new DateTime();
263
        ZonedDateTime from = ZonedDateTime.of(1990,2,1,12,0,0, 0, ZoneId.systemDefault());
264
        ZonedDateTime until = ZonedDateTime.of(1990,2,1,12,0,0, 0, ZoneId.systemDefault());
264 265
        model.put("from",from);
265 266
        model.put("until", until);
266 267

  
......
268 269
        for(int i = 0; i < 10; i++) {
269 270
            TaxonBase taxon = Taxon.NewInstance(null, null);
270 271
            taxon.setTitleCache("TitleCache", true);
271
            taxon.setCreated(new DateTime());
272
            taxon.setCreated(ZonedDateTime.now());
272 273
            taxon.setLsid(new LSID("urn:lsid:example.org:taxonconcepts:"+i));
273 274
            if((i % 3) == 0 ) {
274 275
                AuditEventRecord<TaxonBase> auditEventRecord = new AuditEventRecordImpl<TaxonBase>(new Object[] {taxon, new AuditEvent(),RevisionType.DEL});

Also available in: Unified diff