/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1828

Added by Matt Jones over 21 years ago

Updated more tests on session reuse. Made the http calls set the sessionid
explicitly rather than relying on cookies being passed around statically.
Still need to modify HttpMessage to get rid of the static cookie.

      */
     public class MetacatClientTest extends TestCase
+    {
         private String metacatUrl =
              "http://dev.nceas.ucsb.edu/tao/servlet/metacat";
             //"http://knb.ecoinformatics.org/knb/servlet/metacat";
         private String metacatUrl = "@systemidserver@@servlet-path@";
         private String wrongMetacatUrl=
                         "http://somepalce.somewhere.com/some/servlet/metacat";
         private String username = "@mcuser@";
-...
         private String testfile = "test/jones.204.22.xml";
         private String queryFile = "test/query.xml";
         private String testdocument = "";
         private Metacat m;
         /**
-...
+            }
             try {
                 System.err.println("Test Metacat: " + metacatUrl);
                 m = MetacatFactory.createMetacatConnection(metacatUrl);
             } catch (MetacatInaccessibleException mie) {
                 System.err.println("Metacat is: " + metacatUrl);
-...
             suite.addTest(new MetacatClientTest("delete"));
             suite.addTest(new MetacatClientTest("inaccessibleMetacat"));
             suite.addTest(new MetacatClientTest("reuseSession"));
             suite.addTest(new MetacatClientTest("reuseInvalidSession"));
             return suite;
+        }
-...
         public void query()
+        {
             try {
                 m.login(username,password);
                 FileReader fr = new FileReader(queryFile);
                 Reader r = m.query(fr);
                 System.err.println("Starting query...");
                 String result = IOUtil.getAsString(r, true);
                 System.err.println("Query result:\n" + result);
                 assertTrue(result.indexOf(newdocid+".1")!=-1);
             } catch (MetacatAuthException mae) {
                 fail("Authorization failed:\n" + mae.getMessage());
             } catch (MetacatInaccessibleException mie) {
                 fail("Metacat Inaccessible:\n" + mie.getMessage());
             } catch (Exception e) {
-...
                 Metacat mtemp = MetacatFactory.createMetacatConnection(metacatUrl);
                 String response = mtemp.login(username, password);
                 oldSessionId = mtemp.getSessionId();
                 System.err.println("SessionId (mtemp): " + oldSessionId);
             } catch (MetacatAuthException mae) {
                 fail("Authorization failed:\n" + mae.getMessage());
             } catch (MetacatInaccessibleException mie) {
-...
                     System.err.println("Metacat is: " + metacatUrl);
                     fail("Metacat connection failed." + mie.getMessage());
+                }
                 System.err.println("SessionId (m2): " + m2.getSessionId());
                 m2.setSessionId(oldSessionId);
                 System.err.println("SessionId (m2 after set): " + m2.getSessionId());
                 String response = m2.insert(identifier,
                         new StringReader(testdocument), null);
                 System.err.println("Reuse Insert response: " + response);
-...
+        }
         /**
          * Try to perform an action that requires a session to be valid without
          * having logged in first by setting the sessionId from a previous
          * session.  Then insert a document.
          */
         public void reuseInvalidSession()
+        {
             String oldSessionId = "foobar";
             try {
                 String identifier = generateDocid() + ".1";
                 Metacat m2 = null;
                 try {
                     m2 = MetacatFactory.createMetacatConnection(metacatUrl);
                 } catch (MetacatInaccessibleException mie) {
                     System.err.println("Metacat is: " + metacatUrl);
                     fail("Metacat connection failed." + mie.getMessage());
+                }
                 System.err.println("SessionId (m2): " + m2.getSessionId());
                 m2.setSessionId(oldSessionId);
                 System.err.println("SessionId (m2 after set): " + m2.getSessionId());
                 String response = m2.insert(identifier,
                         new StringReader(testdocument), null);
                 System.err.println("Reuse Insert response: " + response);
                 assertTrue(response.indexOf("<success>") == -1);
             } catch (MetacatInaccessibleException mie) {
                 fail("Metacat Inaccessible:\n" + mie.getMessage());
             } catch (InsufficientKarmaException ike) {
                 fail("Insufficient karma:\n" + ike.getMessage());
             } catch (MetacatException me) {
                 fail("Metacat Error:\n" + me.getMessage());
             } catch (Exception e) {
                 fail("General exception:\n" + e.getMessage());
+            }
+        }
         /**
          * Create a hopefully unique docid for testing insert and update. Does
          * not include the 'revision' part of the id.
+         *

src/edu/ucsb/nceas/metacat/client/MetacatClient.java
90	90	}
91	91
92	92	if (response.indexOf("<login>") == -1) {
93		HttpMessage.setCookie(null);
	93	setSessionId("");
94	94	throw new MetacatAuthException(response);
95	95	} else {
96	96	int start = response.indexOf("<sessionId>") + 11;
97	97	int end = response.indexOf("</sessionId>");
98	98	if ((start != -1) && (end != -1)) {
99		sessionId = response.substring(start,end);
	99	setSessionId(response.substring(start,end));
100	100	}
101	101	}
102	102	return response;
...	...
126	126	if (response.indexOf("<logout>") == -1) {
127	127	throw new MetacatException(response);
128	128	}
129		this.sessionId = null;
	129	setSessionId("");
130	130	return response;
131	131	}
132	132
...	...
410	410	public void setSessionId(String sessionId)
411	411	{
412	412	this.sessionId = sessionId;
413		HttpMessage.setCookie("JSESSIONID="+this.sessionId);
414	413	}
415	414
416	415	/************************************************************************
...	...
428	427	InputStream returnStream = null;
429	428	URL url = new URL(metacatUrl);
430	429	HttpMessage msg = new HttpMessage(url);
	430	msg.setCookie("JSESSIONID="+this.sessionId);
431	431	returnStream = msg.sendPostData(prop);
432	432	return returnStream;
433	433	}

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1828

Added by Matt Jones over 21 years ago