Revision 8810
Added by ben leinfelder over 9 years ago
CNodeServiceTest.java | ||
---|---|---|
36 | 36 |
import junit.framework.TestSuite; |
37 | 37 |
|
38 | 38 |
import org.apache.commons.io.IOUtils; |
39 |
import org.dataone.client.D1Client; |
|
39 |
import org.dataone.client.v2.itk.D1Client;
|
|
40 | 40 |
import org.dataone.service.exceptions.BaseException; |
41 | 41 |
import org.dataone.service.exceptions.NotAuthorized; |
42 | 42 |
import org.dataone.service.exceptions.NotFound; |
... | ... | |
47 | 47 |
import org.dataone.service.types.v1.Checksum; |
48 | 48 |
import org.dataone.service.types.v1.Event; |
49 | 49 |
import org.dataone.service.types.v1.Identifier; |
50 |
import org.dataone.service.types.v1.Log;
|
|
51 |
import org.dataone.service.types.v1.Node;
|
|
52 |
import org.dataone.service.types.v1.NodeList;
|
|
50 |
import org.dataone.service.types.v2.Log;
|
|
51 |
import org.dataone.service.types.v2.Node;
|
|
52 |
import org.dataone.service.types.v2.NodeList;
|
|
53 | 53 |
import org.dataone.service.types.v1.NodeReference; |
54 | 54 |
import org.dataone.service.types.v1.NodeType; |
55 |
import org.dataone.service.types.v1.ObjectFormat;
|
|
55 |
import org.dataone.service.types.v2.ObjectFormat;
|
|
56 | 56 |
import org.dataone.service.types.v1.ObjectFormatIdentifier; |
57 |
import org.dataone.service.types.v1.ObjectFormatList;
|
|
57 |
import org.dataone.service.types.v2.ObjectFormatList;
|
|
58 | 58 |
import org.dataone.service.types.v1.ObjectList; |
59 | 59 |
import org.dataone.service.types.v1.Permission; |
60 | 60 |
import org.dataone.service.types.v1.Replica; |
... | ... | |
62 | 62 |
import org.dataone.service.types.v1.ReplicationStatus; |
63 | 63 |
import org.dataone.service.types.v1.Session; |
64 | 64 |
import org.dataone.service.types.v1.Subject; |
65 |
import org.dataone.service.types.v1.SystemMetadata;
|
|
65 |
import org.dataone.service.types.v2.SystemMetadata;
|
|
66 | 66 |
import org.dataone.service.util.Constants; |
67 | 67 |
|
68 | 68 |
/** |
... | ... | |
165 | 165 |
int count = 1; |
166 | 166 |
|
167 | 167 |
Log log = CNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, |
168 |
event, null, start, count); |
|
168 |
event.xmlValue(), null, start, count);
|
|
169 | 169 |
assertNotNull(log); |
170 | 170 |
assertTrue(log.getCount() == count); |
171 | 171 |
assertTrue(log.getStart() == start); |
Also available in: Unified diff
add support for v2 DataONE API.