/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 6004

Added by Chris Jones almost 14 years ago

Added a new test method testDeleteDocumentByGUID() to ensure MetacatHandler can delete based on GUID, but fall back to docid if the GUID isn't present. Modified CrudServiceTest and made some private methods public to leverage the D1 REST calls in that library (i.e. create() a doc with a GUID).

     	/**
     	 * create(AuthToken token, Identifier guid, InputStream object, SystemMetadata sysmeta)
          *   throws InvalidToken, ServiceFailure, NotAuthorized, IdentifierNotUnique, UnsupportedType,
          *       InsufficientResources, InvalidSystemMetadata, NotImplemented
+         *
          * public InputStream get(AuthToken token, Identifier guid)
          *       throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
          *       NotImplemented
        *   throws InvalidToken, ServiceFailure, NotAuthorized, IdentifierNotUnique, UnsupportedType,
        *       InsufficientResources, InvalidSystemMetadata, NotImplemented
+       *
        * public InputStream get(AuthToken token, Identifier guid)
        *       throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
        *       NotImplemented
     	 */
     	public void testCreateAndGet()
+    	{
-...
                 fail("Error in testCreate: " + e.getMessage());
+            }
+    	}
     	/**
     	 * getInstance()
     	 */
-...
             return IOUtils.toString(gotDocStream);
+    	}
     	private String getTestDoc()
     	public String getTestDoc()
+    	{
     	    return getTestDoc(null);
+    	}
-...
     	/**
     	 * return a test document.  objectFormat should come from MCTestCase
     	 */
     	private String getTestDoc(String objectFormat)
     	public String getTestDoc(String objectFormat)
+    	{
     	    if(objectFormat == null)
+    	    {
-...
     	 * authenticate and return a token
     	 * use the test.mcUser and test.mcPassword username/password combo
     	 */
     	private AuthToken getToken()
     	public AuthToken getToken()
     	  throws Exception
+    	{
             String username = PropertyService.getProperty("test.mcUser");
-...
     	/**
     	 * authenticate and return a token using the given credentials
     	 */
     	private AuthToken getToken(String username, String password)
     	public AuthToken getToken(String username, String password)
     	  throws Exception
+    	{
     	    CrudService cs = CrudService.getInstance();
-...
     	/**
     	 * create a doc using CrudService.create() and return its id
     	 */
     	private Identifier createDoc(AuthToken token, String testDoc) throws Exception
     	public Identifier createDoc(AuthToken token, String testDoc) throws Exception
+    	{
     	    return createDoc(token, testDoc, ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
+    	}
-...
     	/**
     	 * create a doc using CrudService.create() and return its id
     	 */
     	private Identifier createDoc(AuthToken token, String testDoc, ObjectFormat format) throws Exception
     	public Identifier createDoc(AuthToken token, String testDoc, ObjectFormat format) throws Exception
+    	{
     	    Identifier id;
             CrudService cs = CrudService.getInstance();
-...
                  .append(HEXES.charAt((b & 0x0F)));
+            }
             return hex.toString();
+        }
+      }
+    }

     package edu.ucsb.nceas.metacattest;
     import edu.ucsb.nceas.MCTestCase;
     import edu.ucsb.nceas.metacat.dataone.CrudServiceTest;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.utilities.HttpMessage;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     import junit.framework.Test;
     import junit.framework.TestSuite;
-...
     import java.net.*;
     import java.util.*;
     import org.dataone.service.types.AuthToken;
     import org.dataone.service.types.Identifier;
     /**
      * A JUnit test for testing Step class processing
      */
-...
     		suite.addTest(new MetaCatServletTest("testInsertXMLDocument", serial));
     		suite.addTest(new MetaCatServletTest("testReadXMLDocumentXMLFormat", serial));
     		suite.addTest(new MetaCatServletTest("testUpdateXMLDocument", serial));
     		suite.addTest(new MetaCatServletTest("testReadXMLDocumentHTMLFormat", serial));
     		suite.addTest(new MetaCatServletTest("testReadXMLDocumentZipFormat", serial));
     		suite.addTest(new MetaCatServletTest("testDeleteXMLDocument", serial));
     		// test delete using GUID
     		number = Math.random() * 100000;
     		serial = Integer.toString(((new Double(number)).intValue()));
     		suite.addTest(new MetaCatServletTest("testDeleteDocumentByGUID", serial));
     		// insert invalid xml document
     		number = Math.random() * 100000;
-...
     		suite
     				.addTest(new MetaCatServletTest("testInsertNonWellFormedXMLDocument",
     						serial));
     		suite.addTest(new MetaCatServletTest("testLogOut"));
     		return suite;
-...
     	public void testNCEASLogin() {
     		debug("\nRunning: testNCEASLogin test");
     		String user = "uid=john,o=NCEAS,dc=ecoinformatics,dc=org";
     		String passwd = "123456";
     		String passwd = "12345678";
     		assertTrue(logIn(user, passwd));
     		// assertTrue( withProtocol.getProtocol().equals("http"));
+    	}
-...
+    	}
       /**
        * Test to delete a document by GUID (not docid).  This exercises
        * MetacatServlet.handleDeleteAction()'s handling of GUIDs.
        */
       public void testDeleteDocumentByGUID() {
         debug("\nRunning: testDeleteDocumentByGUID test");
         CrudServiceTest crudServiceTest = new CrudServiceTest("testDeleteDocumentByGUID");
         String guid = "";
         String user = "uid=john,o=NCEAS,dc=ecoinformatics,dc=org";
     		String passwd = "123456";
     		AuthToken token = null;
     		String result = "";
         // create a document via the CRUD service to get a GUID
         try {
           token = crudServiceTest.getToken(user, passwd);
           String testDocument = crudServiceTest.getTestDoc();
           Identifier identifier = crudServiceTest.createDoc(token, testDocument);
           guid = identifier.getValue();
         } catch (Exception e) {
           fail("Could not create test document to delete: " + e.getMessage());
+        }
         // delete the document via the Metacat servlet with the GUID
         try {
           Properties props = new Properties();
           props.put("action", "delete");
           props.put("docid", guid);
           props.put("sessionid", token.getToken());
           debug("Trying to delete by GUID: " + guid);
           result = getMetacatString(props);
         } catch ( Exception e ) {
           fail("Couldn't delete GUID: " + guid);
+        }
         assertTrue(result.indexOf("<success>") > 0);
+      }
     	/**
     	 * Test logout action
     	 */

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 6004

Added by Chris Jones almost 14 years ago