Project

General

Profile

« Previous | Next » 

Revision 8810

Added by ben leinfelder almost 10 years ago

add support for v2 DataONE API.

View differences:

MNodeServiceTest.java
51 51 
import junit.framework.TestSuite;
52 52 

  		




  53
  53
  
    
import org.apache.commons.io.IOUtils;


  		




  54
  
  
    
import org.dataone.client.ObjectFormatCache;


  		




  
  54
  
    
import org.dataone.client.v2.formats.ObjectFormatCache;


  		




  55
  55
  
    
import org.dataone.configuration.Settings;


  		




  56
  56
  
    
import org.dataone.ore.ResourceMapFactory;


  		




  57
  57
  
    
import org.dataone.service.util.TypeMarshaller;


  		




  ......




  72
  72
  
    
import org.dataone.service.types.v1.DescribeResponse;


  		




  73
  73
  
    
import org.dataone.service.types.v1.Event;


  		




  74
  74
  
    
import org.dataone.service.types.v1.Identifier;


  		




  75
  
  
    
import org.dataone.service.types.v1.Log;


  		




  76
  
  
    
import org.dataone.service.types.v1.MonitorList;


  		




  77
  
  
    
import org.dataone.service.types.v1.Node;


  		




  
  75
  
    
import org.dataone.service.types.v2.Log;


  		




  
  76
  
    
import org.dataone.service.types.v2.Node;


  		




  78
  77
  
    
import org.dataone.service.types.v1.NodeReference;


  		




  79
  78
  
    
import org.dataone.service.types.v1.ObjectFormatIdentifier;


  		




  80
  79
  
    
import org.dataone.service.types.v1.ObjectList;


  		




  ......




  83
  82
  
    
import org.dataone.service.types.v1.Session;


  		




  84
  83
  
    
import org.dataone.service.types.v1.Subject;


  		




  85
  84
  
    
import org.dataone.service.types.v1.SubjectInfo;


  		




  86
  
  
    
import org.dataone.service.types.v1.SystemMetadata;


  		




  
  85
  
    
import org.dataone.service.types.v2.SystemMetadata;


  		




  87
  86
  
    
import org.dspace.foresite.ResourceMap;


  		




  88
  87
  
    
import org.jibx.runtime.JiBXException;


  		




  89
  88
  
    
import org.junit.After;


  		




  ......




  693
  692
  
    
        // now check that we have at least one


  		




  694
  693
  
    
        ObjectList objectList = 


  		




  695
  694
  
    
          MNodeService.getInstance(request).listObjects(session, startTime, endTime, 


  		




  696
  
  
    
              objectFormatId, replicaStatus, start, count);


  		




  
  695
  
    
              objectFormatId, null, replicaStatus, start, count);


  		




  697
  696
  
    
        assertNotNull(objectList);


  		




  698
  697
  
    
        assertTrue(objectList.getCount() == count);


  		




  699
  698
  
    
        assertTrue(objectList.getStart() == 0);


  		




  ......




  731
  730
  
    
    


  		




  732
  731
  
    
  }


  		




  733
  732
  
    

  		




  734
  
  
    
  public void testGetOperationStatistics() {


  		




  735
  
  
    
      printTestHeader("testGetOperationStatistics");


  		




  736
  
  
    
    try {


  		




  737
  
  
    
      Session session = getCNSession();


  		




  738
  
  
    
      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


  		




  739
  
  
    
        Date startTime = sdf.parse("2010-01-01");


  		




  740
  
  
    
        Date endTime = new Date();


  		




  741
  
  
    
      MonitorList monitorList = 


  		




  742
  
  
    
        MNodeService.getInstance(request).getOperationStatistics(


  		




  743
  
  
    
            session, 


  		




  744
  
  
    
            startTime, 


  		




  745
  
  
    
            endTime, 


  		




  746
  
  
    
            session.getSubject(), 


  		




  747
  
  
    
            Event.CREATE, 


  		




  748
  
  
    
            null //formatId


  		




  749
  
  
    
            );


  		




  750
  
  
    
      


  		




  751
  
  
    
      assertNotNull(monitorList);


  		




  752
  
  
    
      // TODO: should probably test other parts of the information


  		




  753
  
  
    
    } catch (Exception e) {


  		




  754
  
  
    
      e.printStackTrace();


  		




  755
  
  
    
      fail("Probably not yet implemented: " + e.getMessage());


  		




  756
  
  
    
    }


  		




  757
  
  
    
  }


  		




  758
  
  
    

  		




  759
  733
  
    
  public void testPing() {


  		




  760
  734
  
    

  		




  761
  735
  
    
    try {


  		




  ......




  850
  824
  
    
	    int count = 1;


  		




  851
  825
  
    
    


  		




  852
  826
  
    
      log = MNodeService.getInstance(request).getLogRecords(session, fromDate, toDate, 


  		




  853
  
  
    
        event, null, start, count);


  		




  
  827
  
    
        event.xmlValue(), null, start, count);


  		




  854
  828
  
    
      


  		




  855
  829
  
    
      assertNotNull(log);      


  		




  856
  830
  
    
      assertTrue(log.getCount() == count);


  		




  ......




  1157
  1131
  
    
			InputStream object = new ByteArrayInputStream("test".getBytes("UTF-8"));


  		




  1158
  1132
  
    
			SystemMetadata sysmeta = createSystemMetadata(guid, session.getSubject(), object);


  		




  1159
  1133
  
    
			Identifier pid = MNodeService.getInstance(request).create(session, guid, object, sysmeta);


  		




  1160
  
  
    
			InputStream bagStream = MNodeService.getInstance(request).getPackage(session, pid);


  		




  
  1134
  
    
			InputStream bagStream = MNodeService.getInstance(request).getPackage(session, null, pid);


  		




  1161
  1135
  
    
			File bagFile = File.createTempFile("bagit.", ".zip");


  		




  1162
  1136
  
    
			IOUtils.copy(bagStream, new FileOutputStream(bagFile));


  		




  1163
  1137
  
    
			BagFactory bagFactory = new BagFactory();


  		




  ......




  1234
  1208
  
    
			Identifier pid = MNodeService.getInstance(request).create(session, resourceMapId, object, sysmeta);


  		




  1235
  1209
  
    
			


  		




  1236
  1210
  
    
			// get the package we uploaded


  		




  1237
  
  
    
			InputStream bagStream = MNodeService.getInstance(request).getPackage(session, pid);


  		




  
  1211
  
    
			InputStream bagStream = MNodeService.getInstance(request).getPackage(session, null, pid);


  		




  1238
  1212
  
    
			File bagFile = File.createTempFile("bagit.", ".zip");


  		




  1239
  1213
  
    
			IOUtils.copy(bagStream, new FileOutputStream(bagFile));


  		




  1240
  1214
  
    
			BagFactory bagFactory = new BagFactory();


  		












Also available in:  Unified diff