diff options
author | Kyle Ambroff <ambroff@lindenlab.com> | 2008-06-21 07:39:52 +0000 |
---|---|---|
committer | Kyle Ambroff <ambroff@lindenlab.com> | 2008-06-21 07:39:52 +0000 |
commit | dc3f5ff87cfa085998bf69db6dedad45440419d3 (patch) | |
tree | e6c54376390a110e0e91ea0139ce6bb54925ffae /indra/test/lliohttpserver_tut.cpp | |
parent | af080d1c62f1a2cdc17c3870427f07ad0cf9534f (diff) |
svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586
* QAR-687 - Test build with libs on S3
* QAR-637 Test dynamic sound throttle
* QAR-586 Test new http features branch
Diffstat (limited to 'indra/test/lliohttpserver_tut.cpp')
-rw-r--r-- | indra/test/lliohttpserver_tut.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp index 5401d1a8ae..e5607cdad7 100644 --- a/indra/test/lliohttpserver_tut.cpp +++ b/indra/test/lliohttpserver_tut.cpp @@ -327,6 +327,23 @@ namespace tut ensure_starts_with("large echo status", result, "HTTP/1.0 200 OK\r\n"); } + template<> template<> + void HTTPServiceTestObject::test<8>() + { + // test the OPTIONS http method -- the default implementation + // should return the X-Documentation-URL + std::ostringstream http_request; + http_request << "OPTIONS / HTTP/1.0\r\nHost: localhost\r\n\r\n"; + bool timeout = false; + std::string result = makeRequest("/", http_request.str(), timeout); + ensure_starts_with("OPTIONS verb ok", result, "HTTP/1.0 200 OK\r\n"); + ensure_contains( + "Doc url header exists", + result, + "X-Documentation-URL: http://localhost"); + } + + /* TO DO: test generation of not found and method not allowed errors */ |