Case insensitive header cleanup. Also cleanup and additions to parse_test

tests/parse_test.cpp

@@ -1,18 +1,18 @@
 #include "server_http.hpp"
 #include "client_http.hpp"
 #include <iostream>
+#include <cassert>
 
 using namespace std;
 using namespace SimpleWeb;
 
 class ServerTest : public ServerBase<HTTP> {
 public:
-    ServerTest() : 
-            ServerBase<HTTP>::ServerBase(8080) {}
+    ServerTest() : ServerBase<HTTP>::ServerBase(8080) {}
             
     void accept() {}
     
-    bool parse_request_test() {
+    void parse_request_test() {
         HTTP socket(*io_service);
         std::shared_ptr<Request> request(new Request(socket));
         
@@ -20,28 +20,34 @@ public:
         stream << "GET /test/ HTTP/1.1\r\n";
         stream << "TestHeader: test\r\n";
         stream << "TestHeader2:test2\r\n";
+        stream << "TestHeader3:test3a\r\n";
+        stream << "TestHeader3:test3b\r\n";
         stream << "\r\n";
         
-        if(!parse_request(request))
-            return 0;
+        assert(parse_request(request));
         
-        if(request->method!="GET")
-            return 0;
-        if(request->path!="/test/")
-            return 0;
-        if(request->http_version!="1.1")
-            return 0;
+        assert(request->method=="GET");
+        assert(request->path=="/test/");
+        assert(request->http_version=="1.1");
         
-        if(request->header.size()!=2)
-            return 0;
+        assert(request->header.size()==4);
         auto header_it=request->header.find("TestHeader");
-        if(header_it==request->header.end() || header_it->second!="test")
-            return 0;
+        assert(header_it!=request->header.end() && header_it->second=="test");
         header_it=request->header.find("TestHeader2");
-        if(header_it==request->header.end() || header_it->second!="test2")
-            return 0;
+        assert(header_it!=request->header.end() && header_it->second=="test2");
         
-        return 1;
+        header_it=request->header.find("testheader");
+        assert(header_it!=request->header.end() && header_it->second=="test");
+        header_it=request->header.find("testheader2");
+        assert(header_it!=request->header.end() && header_it->second=="test2");
+        
+        auto range=request->header.equal_range("testheader3");
+        auto first=range.first;
+        auto second=first;
+        ++second;
+        assert(range.first!=request->header.end() && range.second!=request->header.end() &&
+               ((first->second=="test3a" && second->second=="test3b") ||
+                (first->second=="test3b" && second->second=="test3a")));
     }
 };
 
@@ -51,51 +57,50 @@ public:
     
     void connect() {}
     
-    bool constructor_parse_test1() {
-        if(host!="test.org")
-            return 0;
-        if(port!=8080)
-            return 0;
-        
-        return 1;
+    void constructor_parse_test1() {
+        assert(host=="test.org");
+        assert(port==8080);
     }
     
-    bool constructor_parse_test2() {
-        if(host!="test.org")
-            return 0;
-        if(port!=80)
-            return 0;
-        
-        return 1;
+    void constructor_parse_test2() {
+        assert(host=="test.org");
+        assert(port==80);
     }
     
-    bool parse_response_header_test() {
+    void parse_response_header_test() {
         std::shared_ptr<Response> response(new Response());
         
         ostream stream(&response->content_buffer);
         stream << "HTTP/1.1 200 OK\r\n";
         stream << "TestHeader: test\r\n";
         stream << "TestHeader2:test2\r\n";
+        stream << "TestHeader3:test3a\r\n";
+        stream << "TestHeader3:test3b\r\n";
         stream << "\r\n";
         
         parse_response_header(response);
         
-        if(response->http_version!="1.1")
-            return 0;
-        if(response->status_code!="200 OK")
-            return 0;
+        assert(response->http_version=="1.1");
+        assert(response->status_code=="200 OK");
         
-        if(response->header.size()!=2)
-            return 0;
-
+        assert(response->header.size()==4);
         auto header_it=response->header.find("TestHeader");
-        if(header_it==response->header.end() || header_it->second!="test")
-          return 0;
+        assert(header_it!=response->header.end() && header_it->second=="test");
         header_it=response->header.find("TestHeader2");
-        if(header_it==response->header.end() || header_it->second!="test2")
-          return 0;
+        assert(header_it!=response->header.end() && header_it->second=="test2");
         
-        return 1;
+        header_it=response->header.find("testheader");
+        assert(header_it!=response->header.end() && header_it->second=="test");
+        header_it=response->header.find("testheader2");
+        assert(header_it!=response->header.end() && header_it->second=="test2");
+        
+        auto range=response->header.equal_range("testheader3");
+        auto first=range.first;
+        auto second=first;
+        ++second;
+        assert(range.first!=response->header.end() && range.second!=response->header.end() &&
+               ((first->second=="test3a" && second->second=="test3b") ||
+                (first->second=="test3b" && second->second=="test3a")));
     }
 };
 
@@ -103,27 +108,13 @@ int main() {
     ServerTest serverTest;
     serverTest.io_service=std::make_shared<boost::asio::io_service>();
     
-    if(!serverTest.parse_request_test()) {
-        cerr << "FAIL Server::parse_request" << endl;
-        return 1;
-    }
+    serverTest.parse_request_test();
     
     ClientTest clientTest("test.org:8080");
-    if(!clientTest.constructor_parse_test1()) {
-        cerr << "FAIL Client::Client" << endl;
-        return 1;
-    }
+    clientTest.constructor_parse_test1();
     
     ClientTest clientTest2("test.org");
-    if(!clientTest2.constructor_parse_test2()) {
-        cerr << "FAIL Client::Client" << endl;
-        return 1;
-    }
+    clientTest2.constructor_parse_test2();
     
-    if(!clientTest2.parse_response_header_test()) {
-        cerr << "FAIL Client::parse_response_header" << endl;
-        return 1;
-    }
-    
-    return 0;
-}
+    clientTest2.parse_response_header_test();
+}