Added proxy unit tests to make file

Author: u3amar

Diff for: Makefile

@@ -44,12 +44,18 @@ test: lib
 	$(MAKE) -C test
 	cd bin && ./webserver_tests
 
+.PHONY: proxy-test
+proxy-test: lib
+	$(MAKE) -C src test
+	$(MAKE) -C test
+	cd bin && ./proxy_webserver_tests
+
 .PHONY: int-test
 int-test: test
 	scripts/integration.sh && scripts/multithread_test.sh && scripts/proxy_integration_test.sh
 
-.PHONY: proxy-test
-proxy-test: lib		
+.PHONY: prox-int-test
+proxy-int-test: lib		
 	scripts/proxy_integration_test.sh
 
 .PHONY: proxy-302-test

Diff for: bin/proxy_webserver_tests

@@ -56,18 +56,6 @@ fi
 # run server in background
 bin/webserver $CONFIG_FILE 2>&1 >/dev/null &
 
-# integration test for reverse proxy
-
-proxy_response="$(curl --silent -I localhost:${PORT}/proxy | head -n 1 | tr -d '\r\n')"
-
-if [ "$proxy_response" != "HTTP/1.1 200 OK" ]; then
-  echo "Reverse Proxy Test failed - got different response than expected."
-  echo "$proxy_response"
-  EXIT_STATUS=1
-else
-  echo "Reverse Proxy Test Passed."
-fi
-
 good_response="GET /echo1 HTTP/1.1\r\nUser-Agent: Mozilla/4.0\r\n"
 good_response="${good_response}Host: localhost:8080\r\nAccept: */*\r\n\r\n"
 # turn C-style escape sequences into actual carriage returns and newlines

Diff for: scripts/integration.sh

@@ -16,6 +16,7 @@ TEST_DEP_OBJECTS=$(OBJ_DIR)/config_parser.o
 
 TEST_SOURCES=$(wildcard *.cc)
 TEST_OBJECTS=$(patsubst %.cc,$(OBJ_DIR)/%.o,$(TEST_SOURCES))
+PROXY_TEST_OBJECT=$(OBJ_DIR)/proxy_handler_test.o
 
 SOURCES=$(wildcard $(SRC_DIR)/*.cc) \
 		$(wildcard $(SRC_DIR)/http/*.cc) \
@@ -35,7 +36,7 @@ $(EXECUTABLE): $(TEST_OBJECTS) $(SOURCE_OBJECTS) $(TEST_DEP_OBJECTS)
 	echo $(SOURCE_OBJECTS)
 	$(CXX) $^ $(GTEST_LIBS) -o $@ $(TEST_LDFLAGS)
 
-$(PROXY_HANDLER_EXECUTABLE): $(OBJ_DIR/proxy_handler_test.o) $(SOURCE_OBJECTS) $(TEST_DEP_OBJECTS)
+$(PROXY_HANDLER_EXECUTABLE): $(PROXY_TEST_OBJECT) $(SOURCE_OBJECTS) $(TEST_DEP_OBJECTS)
 	echo $(SOURCE_OBJECTS)
 	$(CXX) $^ $(GTEST_LIBS) -o $@ $(TEST_LDFLAGS)
 

Diff for: scripts/proxy_integration_test.sh~

@@ -6,7 +6,7 @@
 
 class ProxyHandlerTest : public ::testing::Test {
 public:
-	ProxyHandler* handler_;
+  ProxyHandler* handler_;
   NginxConfigParser parser_;
   NginxConfig config_;
 
@@ -24,14 +24,14 @@ class ProxyHandlerTest : public ::testing::Test {
     return true;
   }
 
-	std::unique_ptr<Request> GetClientRequest() {
-		std::string request_str = \
-			"GET /proxy/path/to/some_file HTTP/1.1\r\n"
-			"Content-Type: text/plain\r\n\r\n"
-			"I AM A BODY!";
-		auto r = Request::Parse(request_str);
-		return r;
-	}
+  std::unique_ptr<Request> GetClientRequest() {
+    std::string request_str = \
+      "GET /proxy/path/to/some_file HTTP/1.1\r\n"
+      "Content-Type: text/plain\r\n\r\n"
+      "I AM A BODY!";
+    auto r = Request::Parse(request_str);
+    return r;
+  }
 
   std::unique_ptr<Response> GetResponse() {
     std::string response_str = \
@@ -49,7 +49,7 @@ TEST_F(ProxyHandlerTest, ProxyHandlerInitTest) {
 
 TEST_F(ProxyHandlerTest, RequestTransformationTest) {
   EXPECT_TRUE(CreateProxyHandlerTest());
-	auto req = GetClientRequest();
+  auto req = GetClientRequest();
   auto proxy_req = handler_->CreateProxyRequestFromClientRequest(*req, "localhost:8080");
   EXPECT_EQ("/path/to/some_file", proxy_req->uri());
 }