/ - Diff - Metacat - Ecoinformatics Redmine

test/test.properties
1	1	# Set this to the location of the metacat application context
2	2	# directory. The tests will use this to find metacat.properties
3		metacat.contextDir=/Users/berkley/tools/tomcat/webapps/knb
	3	metacat.contextDir=/var/lib/tomcat/webapps/knb
4	4	#metacat.contextDir=/usr/share/tomcat5.5/webapps/knb

     	public static Test suite()
+    	{
     		TestSuite suite = new TestSuite();
     		suite.addTest(new CrudServiceTest("initialize"));
     		/*suite.addTest(new CrudServiceTest("initialize"));
     		suite.addTest(new CrudServiceTest("testSingletonAccessor"));
     		suite.addTest(new CrudServiceTest("testCreateAndGet"));
     		suite.addTest(new CrudServiceTest("testGetSystemMetadata"));
     		suite.addTest(new CrudServiceTest("testUpdate"));
     		suite.addTest(new CrudServiceTest("testListObjects"));
     		suite.addTest(new CrudServiceTest("testAccessControl"));
     		suite.addTest(new CrudServiceTest("testAccessControl"));*/
     		suite.addTest(new CrudServiceTest("testGenerateMissingSystemMetadata"));
     		suite.addTest(new CrudServiceTest("testGetLogRecords"));
     		/*suite.addTest(new CrudServiceTest("testGetLogRecords"));
     		suite.addTest(new CrudServiceTest("testChecksumError"));
     		suite.addTest(new CrudServiceTest("testPublicAccess"));
     		suite.addTest(new CrudServiceTest("testFailedCreate"));
     		suite.addTest(new CrudServiceTest("testChecksum"));
     		suite.addTest(new CrudServiceTest("testDescribe"));
     		suite.addTest(new CrudServiceTest("testDelete"));
     		suite.addTest(new CrudServiceTest("testSemiColonsInIdentifiers"));
     		suite.addTest(new CrudServiceTest("testSemiColonsInIdentifiers"));*/
     		return suite;
+    	}
-...
     	    try
+    	    {
     	        CrudService cs = CrudService.getInstance();
     	        AuthToken token = getToken();
     	        AuthToken token = getToken("uid=dataone_cn_metacat,o=DATAONE,dc=ecoinformatics,dc=org", "umtmm4tcn");
     	        //create a document with no system metadata
     	        String testDoc = getTestDoc();
     	        Identifier id = new Identifier();
-...
     	/**
     	 * authenticate and return a token
     	 * use the test.mcUser and test.mcPassword username/password combo
     	 */
     	private AuthToken getToken()
     	  throws Exception
+    	{
             String username = PropertyService.getProperty("test.mcUser");
             String password = PropertyService.getProperty("test.mcPassword");
             return getToken(username, password);
+    	}
     	/**
     	 * authenticate and return a token using the given credentials
     	 */
     	private AuthToken getToken(String username, String password)
     	  throws Exception
+    	{
     	    CrudService cs = CrudService.getInstance();
             //login and get a sessionid
             MetacatRestClient restClient = new MetacatRestClient(cs.getContextUrl());
             String username = PropertyService.getProperty("test.mcUser");
             String password = PropertyService.getProperty("test.mcPassword");
             String response = restClient.login(username, password);
             String sessionid = restClient.getSessionId();
             SessionService sessionService = SessionService.getInstance();

     import com.gc.iotools.stream.is.InputStreamFromOutputStream;
     import edu.ucsb.nceas.metacat.AccessionNumber;
     import edu.ucsb.nceas.metacat.AccessionNumberException;
     import edu.ucsb.nceas.metacat.MetacatResultSet;
     import edu.ucsb.nceas.metacat.MetacatResultSet.Document;
-...
                     SystemMetadata sm = createSystemMetadata(localId, token);
                     //insert the systemmetadata object
                     SessionData sessionData = getSessionData(token);
                     insertSystemMetadata(sm, sessionData);
                     String smlocalid = insertSystemMetadata(sm, sessionData);
                     System.out.println("setting access on SM doc with localid " + smlocalid);
                     handler.setAccess(metacatUrl, sessionData.getUserName(), smlocalid,
                             "public", "4", "allow", "allowFirst");
                     String username = "public";
                     if(sessionData != null)
+                    {
-...
+                }
                 catch(Exception e)
+                {
                     //e.printStackTrace();
                     e.printStackTrace();
                     System.out.println("Exception generating missing system metadata: " + e.getMessage());
                     logMetacat.error("Could not generate missing system metadata: " + e.getMessage());
+                }
-...
             //get the document text
             int rev = im.getLatestRevForLocalId(localId);
             Identifier identifier = new Identifier();
             identifier.setValue(im.getGUID(localId, rev));
             try
+            {
                 identifier.setValue(im.getGUID(localId, rev));
+            }
             catch(McdbDocNotFoundException mcdbe)
             { //we're creating a new SM doc for a doc that is not in the identifier table
               //so we need to add it to
                 System.out.println("No guid in the identifier table.  adding it for " + localId);
                 im.createMapping(localId, localId);
                 System.out.println("mapping created for " + localId);
                 AccessionNumber accNum = new AccessionNumber(localId, "NONE");
                 identifier.setValue(im.getGUID(accNum.getDocid(), rev));
+            }
             System.out.println("creating system metadata for guid " + identifier.getValue());
             InputStream is = this.get(token, identifier);
             SystemMetadata sm = new SystemMetadata();
-...
             return sm;
+        }
+    }

         public Hashtable<String, Object> getDocumentInfo(String localId)
             throws McdbDocNotFoundException
+        {
             try
+            {
                 AccessionNumber acc = new AccessionNumber(localId, "NONE");
                 localId = acc.getDocid();
+            }
             catch(Exception e)
+            {
                 //do nothing. just try the localId as it is
+            }
             Hashtable<String, Object> h = new Hashtable<String, Object>();
             String sql = "select docname, doctype, user_owner, user_updated, " +
                 "server_location, rev, date_created, date_updated from " +
-...
+                {
                     stmt.close();
                     DBConnectionPool.returnDBConnection(dbConn, serialNumber);
                     throw new McdbDocNotFoundException("Could not find document " + localId);
                     throw new McdbDocNotFoundException("2Could not find document " + localId);
+                }
                 String sql2 = "select principal_name, permission, perm_type, perm_order from xml_access " +
-...
         public int getLatestRevForLocalId(String localId)
             throws McdbDocNotFoundException
+        {
             try
+            {
                 AccessionNumber acc = new AccessionNumber(localId, "NONE");
                 localId = acc.getDocid();
+            }
             catch(Exception e)
+            {
                 //do nothing. just try the localId as it is
+            }
             int rev = 0;
             String sql = "select rev from xml_documents where docid like '" + localId + "'";
             DBConnection dbConn = null;
-...
+                {
                     stmt.close();
                     DBConnectionPool.returnDBConnection(dbConn, serialNumber);
                     throw new McdbDocNotFoundException("Could not find document " + localId);
                     throw new McdbDocNotFoundException("While trying to get the latest rev, could not find document " + localId);
+                }
+            }
             catch (SQLException e)
-...
             //String sql = "select docid from xml_documents where docid not " +
             //    "in (select docid from identifier where guid in (select guid from systemmetadata)) " +
             //    "and doctype not like '" + DATAONE_SM_DOCTYPE + "'";
             String sql = "select docid from xml_documents where docid not in " +
             String sql = "select docid, rev from xml_documents where docid not in " +
                 "(select docid from systemmetadata) and (docid not in " +
                 "(select docid from identifier where guid in (select guid from systemmetadata)))";
             DBConnection dbConn = null;
-...
                 while (rs.next())
+                {
                     String localid = rs.getString(1);
                     String rev = rs.getString(2);
                     localid += "." + rev;
                     System.out.println("id to add SM for: " + localid);
                     ids.add(localid);
+                }
-...
         public String getGUID(String docid, int rev)
           throws McdbDocNotFoundException
+        {
             System.out.println("getting guid for " + docid);
             String query = "select guid from identifier where docid = ? and rev = ?";
             String guid = null;
             boolean found = false;
-...
+            }
+        }
+    }

Project

General

Profile

Metacat

Revision 5798

Added by berkley over 13 years ago