[Playerstage-commit] SF.net SVN: playerstage:[7454] code/websim/test/uritest.cc

[gerkey]

Revision: 7454
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7454&view=rev
Author:   gerkey
Date:     2009-03-10 18:50:16 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Restructured, added prints to test program

Modified Paths:
--------------
    code/websim/test/uritest.cc

Modified: code/websim/test/uritest.cc
===================================================================
--- code/websim/test/uritest.cc 2009-03-10 18:40:35 UTC (rev 7453)
+++ code/websim/test/uritest.cc 2009-03-10 18:50:16 UTC (rev 7454)
@@ -16,6 +16,7 @@
 bool g_failure;
 struct timeval t0;
 std::string g_response;
+evhttp_connection* g_http_con;
 
 void Mark() { gettimeofday(&t0, NULL); }
 double
@@ -53,30 +54,38 @@
     g_failure = true;
 }
 
-TEST(URITest, createGetSetGet)
+void
+MakeRequest(std::string uri, double dt)
 {
-  struct evhttp_connection* http_con;  
   struct evhttp_request* er;
-  ASSERT_TRUE((http_con = evhttp_connection_new(g_host, g_port)));
+  printf("Requesting: %s\n", uri.c_str());
+  ASSERT_TRUE((er = evhttp_request_new(RequestCallback, NULL)));
+  ASSERT_FALSE(evhttp_make_request(g_http_con, er, EVHTTP_REQ_GET, 
+                                   uri.c_str()));
+  Loop(dt);
+  if(g_success)
+    printf("Success; response: %s\n", g_response.c_str());
+  else if(g_failure)
+    printf("Failure; response: %s\n", g_response.c_str());
+  else
+    printf("Timeout\n");
+}
 
-  ASSERT_TRUE((er = evhttp_request_new(RequestCallback, NULL)));
-  ASSERT_FALSE(evhttp_make_request(http_con, er, EVHTTP_REQ_GET, 
-                                   
"/sim/factory/create?name=foo&type=pioneer2dx"));
-  Loop(5.0);
+TEST(URITest, createGetSetGet)
+{
+  ASSERT_TRUE((g_http_con = evhttp_connection_new(g_host, g_port)));
+
+  MakeRequest("/sim/factory/create?name=foo&type=pioneer2dx", 5.0);
   if(!g_success)
     FAIL();
 
-  ASSERT_TRUE((er = evhttp_request_new(RequestCallback, NULL)));
-  ASSERT_FALSE(evhttp_make_request(http_con, er, EVHTTP_REQ_GET, 
"/foo/pva/get"));
-  Loop(5.0);
+  MakeRequest("/foo/pva/get", 5.0);
   if(!g_success)
-    FAIL();
+    ADD_FAILURE();
 
-  ASSERT_TRUE((er = evhttp_request_new(RequestCallback, NULL)));
-  ASSERT_FALSE(evhttp_make_request(http_con, er, EVHTTP_REQ_GET, 
"/foo/pva/set?pz=2.0"));
-  Loop(5.0);
+  MakeRequest("/foo/pva/set?pz=2.0", 5.0);
   if(!g_success)
-    FAIL();
+    ADD_FAILURE();
 }
 
 int main(int argc, char **argv)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit