/ - 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=/usr/local/tomcat/webapps/knb
4		#metacat.contextDir=/usr/share/tomcat5.5/webapps/knb
	3	metacat.contextDir=/var/lib/tomcat/webapps/knb
	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("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("testChecksumError"));
     		suite.addTest(new CrudServiceTest("testPublicAccess"));
     		suite.addTest(new CrudServiceTest("testPublicAccess"));*/
     		return suite;
+    	}
-...
     	        //create docs at different times
     	        Date d1 = new Date();
     	        Identifier id1 = createDoc(token, getTestDoc(), of1);
     	        makeDocPublic(token, id1, true);
                 SystemMetadata sm1 = getSystemMetadata(token, id1);
                 Date d2 = new Date();
                 Identifier id2 = createDoc(token, getTestDoc(), of2);
                 makeDocPublic(token, id2, true);
                 SystemMetadata sm2 = getSystemMetadata(token, id2);
                 Date d3 = new Date();
                 Identifier id3 = createDoc(token, getTestDoc(), of1);
                 makeDocPublic(token, id3, true);
                 SystemMetadata sm3 = getSystemMetadata(token, id3);
                 Date d4 = new Date();
                 Identifier id4 = createDoc(token, getTestDoc(), of2);
                 makeDocPublic(token, id4, true);
                 SystemMetadata sm4 = getSystemMetadata(token, id4);
                 Date d5 = new Date();
                 Identifier id5 = createDoc(token, getTestDoc(), of1);
                 makeDocPublic(token, id5, true);
                 SystemMetadata sm5 = getSystemMetadata(token, id5);
                 Date d6 = new Date();
-...
                 assertTrue(idInObjectList(id3, list6));
                 assertTrue(idInObjectList(id5, list6));
                 //should return all
                 token = new AuthToken("public");
                 ObjectList list7 = cs.listObjects(token, d1, d6, null);
                 System.out.println("list7 size: " + list7.sizeObjectInfoList());
                 assertTrue(list7.sizeObjectInfoList() == 5);
+    	    }
     	    catch(Exception e)
+    	    {
-...
     	        //run create
     	        Identifier id = createDoc(token, getTestDoc());
     	        //make these docs public for debugging purposes.
     	        makeDocPublic(id, true);
     	        makeDocPublic(token, id, true);
                 //compare the docs
                 String gotDoc = getDoc(token, id);
                 assertTrue(gotDoc.trim().equals(getTestDoc().trim()));
-...
     	 *  make a document public in metacat by inserting an access document
     	 * @param id
     	 */
     	private void makeDocPublic(Identifier id, boolean systemMetadataToo)
     	private void makeDocPublic(AuthToken token, Identifier id, boolean systemMetadataToo)
     	  throws Exception
+    	{
     	    CrudService cs = CrudService.getInstance();
     	    IdentifierManager im = IdentifierManager.getInstance();
     	    cs.setAccess(getToken(), id, "public", "read", "allow", "allowFirst");
     	    cs.setAccess(token, id, "public", "read", "allow", "allowFirst");
     	    if(systemMetadataToo)
+    	    {
     	        String smidS = im.getSystemMetadataId(id.getValue());
     	        Identifier smid = new Identifier();
     	        smid.setValue(smidS);
     	        cs.setAccess(getToken(), smid, "public", "read", "allow", "allowFirst");
     	        cs.setAccess(token, smid, "public", "read", "allow", "allowFirst");
+    	    }
+    	}

                 boolean validSession = false;
                 SessionService ss = SessionService.getInstance();
                 System.out.println("sessionData: " + sessionData);
                 System.out.println("username: " + sessionData.getUserName());
                 System.out.println("sessionid: " + sessionData.getId());
                 //validate the session
                 if(ss.isSessionRegistered(sessionData.getId()))
                 if(ss.isSessionRegistered(sessionData.getId()) &&
                    !(sessionData.getUserName().equals("public") || sessionData.getId().equals("0")))
+                {
                     validSession = true;
+                }
-...
+                        }
+                    }
                     //make the crud call
                     System.out.println("making cs.listObjects call: token: " +
                             token + " startTime: " + startTime +
                     /*System.out.println("token: " + token + " startTime: " + startTime +
                             " endtime: " + endTime + " objectFormat: " +
                             objectFormat + " replicaStatus: " + replicaStatus +
                             " start: " + start + " count: " + count);
                     */
                     ObjectList ol = cs.listObjects(token, startTime, endTime,
                             objectFormat, replicaStatus, start, count);
                     //ol = cs.listObjects(token, null, null, null, false, 0, 1000);
                     ol = cs.listObjects(token, null, null, null, false, 0, 1000);
                     StringReader sr = new StringReader(ol.toString());
                     out = response.getOutputStream();

Project

General

Profile

Metacat

Revision 5410

Added by berkley about 14 years ago