/ - Diff - Metacat - Ecoinformatics Redmine

     		suite.addTest(new CrudServiceTest("testAccessControl"));
     		suite.addTest(new CrudServiceTest("testGenerateMissingSystemMetadata"));
     		suite.addTest(new CrudServiceTest("testGetLogRecords"));
     		suite.addTest(new CrudServiceTest("testChecksumError"));
     		return suite;
+    	}
     	/**
     	 * test for an error where the checksum algorithm gets appended onto the checksum.
     	 */
     	public void testChecksumError()
+    	{
     	    printTestHeader("testChecksumError");
     	    try
+    	    {
     	        Date d1 = new Date();
     	        CrudService cs = CrudService.getInstance();
     	        AuthToken token = getToken();
     	        ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
     	        //create docs at different times
     	        Identifier id = new Identifier();
     	        String docid = generateDocumentId();
     	        id.setValue(docid);
     	        //create the system metadata then run the create method
     	        String testDoc = getTestDoc();
     	        StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
     	        SystemMetadata sm = createSystemMetadata(id, testDoc, of1);
     	        assertFalse(sm.getChecksum().getValue().startsWith("MD5"));
     	        //create the doc
     	        Identifier idC = cs.create(token, id, sbis, sm);
     	        assertTrue(idC.getValue().equals(id.getValue()));
     	        SystemMetadata smC = getSystemMetadata(token, idC);
     	        assertFalse(smC.getChecksum().getValue().startsWith("MD5"));
     	        Date d2 = new Date();
     	        ObjectList ol = cs.listObjects(token, d1, d2, of1);
     	        assertTrue(ol.sizeObjectInfoList() == 1);
     	        ObjectInfo oi = ol.getObjectInfo(0);
     	        //this will fail if the error state exists.
     	        assertFalse(oi.getChecksum().getValue().startsWith("MD5"));
+    	    }
     	    catch(Exception e)
+    	    {
     	        fail("Unexpected exception: " + e.getMessage());
+    	    }
+    	}
     	/**
     	 * test CrudService.getLogRecords
     	 */
     	public void testGetLogRecords()
-...
                 ObjectList list = cs.listObjects(token, null, null, null);
                 //System.out.println("list size: " + list.sizeObjectInfoList());
                 //should return sm1 and sm2
                 ObjectList list1 = cs.listObjects(token, d1, d3, null);
                 assertTrue(list1.sizeObjectInfoList() == 2);
                 assertTrue(idInObjectList(id1, list1));
                 assertTrue(idInObjectList(id2, list1));
                 ObjectInfo info = list1.getObjectInfo(0);
                 //should only return sm1
                 ObjectList list2 = cs.listObjects(token, d1, d3, of1);
                 assertTrue(list2.sizeObjectInfoList() == 1);

                             objectFormat, replicaStatus, start, count);
                     ol = cs.listObjects(token, null, null, null, false, 0, 1000);
                     //StringReader sr = new StringReader(ol.toString());
                     StringReader sr = new StringReader(ol.toString());
                     System.out.println("ol: " + sr.toString());
                     //IOUtils.copy(sr, response.getOutputStream());
                     out = response.getOutputStream();

     	                	   //try merging the data
     	                	   ReturnFieldValue existingRFV =
     	                		   getArrayValue(parentidList, parentId);
     	                	   if (existingRFV != null) {
     	                	   if (existingRFV != null && !existingRFV.getFieldType().equals("ATTRIBUTE")) {
     	                		   fielddata = existingRFV.getFieldValue() + fielddata;
+    	                	   }
+                    	   }
                     	   //System.out.println("fieldname: " + fieldname + " fielddata: " + fielddata);
                            value.append("<param name=\"");
                            value.append(fieldname);
                            value.append("\">");
-...
             Vector tempVector = null;
             for (int count = 0; count < parentidList.size(); count++) {
             for (int count = 0; count < parentidList.size(); count++)
+            {
                 tempVector = (Vector) parentidList.get(count);
                 if (key.compareTo((String) tempVector.get(0)) == 0) { return (ReturnFieldValue) tempVector
                         .get(1); }
                 if (key.compareTo((String) tempVector.get(0)) == 0)
+                {
                     return (ReturnFieldValue) tempVector.get(1);
+                }
+            }
             return null;
+        }

             for(int i=0; i<l.size(); i++)
             { //for each id, add a system metadata doc
                 String localId = l.get(i);
                 System.out.println("Creating SystemMetadata for localId " + localId);
                 //System.out.println("Creating SystemMetadata for localId " + localId);
                 //get the document
                 try
+                {
-...
               params.put("returndoctype", new String[] {"http://dataone.org/service/types/SystemMetadata/0.1"});
               params.put("qformat", new String[] {"xml"});
               params.put("returnfield", new String[] {"size", "originMemberNode",
                       "identifier", "objectFormat", "dateSysMetadataModified", "checksum", "@algorithm"});
                       "identifier", "objectFormat", "dateSysMetadataModified", "checksum", "checksum/@algorithm"});
               params.put("anyfield", new String[] {"%"});
               MetacatResultSet rs = handler.query(metacatUrl, params, sessionData.getUserName(),
-...
                   ChecksumAlgorithm ca = ChecksumAlgorithm.convert(csalg);
                   cs.setAlgorithm(ca);
                   info.setChecksum(cs);
                   //System.out.println("info.checksum: " + info.getChecksum().getValue());
                   info.setDateSysMetadataModified(dateSysMetadataModified);
                   Identifier id = new Identifier();
                   id.setValue(d.getField("identifier"));

Project

General

Profile

Metacat

Revision 5387

Added by berkley over 14 years ago