Merge 72f9e9a into 85d8d5c

.gitignore

@@ -9,6 +9,8 @@ config*
 *Makefile
 *Makefile.in
 vendor/gtest-1.7.0/scripts/gtest-config
+test-program
+.libs
 
 *autom4te.cache
 *aclocal.m4
@@ -21,3 +23,9 @@ vendor/gtest-1.7.0/scripts/gtest-config
 *.dirstamp
 *ltmain.sh
 m4
+
+# coverage related files
+*gcda
+*gcno
+html
+coverage.info

.travis.yml

@@ -1,8 +1,12 @@
 language: cpp
 # command to install dependencies
-script: ./autogen.sh && ./configure && make check && ./test-program
+script: ./autogen.sh && ./configure --enable-coverage && make test
 before_script:
   - ./utils/build_gtest.sh
+  - gem install coveralls-lcov
+after_success:
+  - make coverage.info
+  - coveralls-lcov coverage.info
 sudo: false
 addons:
   apt:

CONTRIBUTING.md

@@ -11,4 +11,4 @@
 
 1. build vendorized gtest: `./utils/build_gtest.sh`
 2. build restclient-cpp: `./autogen.sh && ./configure && make check`
-3. run the unit test suite: `./test-program`
+3. run the unit test suite: `make test`

Makefile.am

@@ -11,3 +11,18 @@ lib_LTLIBRARIES=librestclient-cpp.la
 librestclient_cpp_la_SOURCES=source/restclient.cpp
 librestclient_cpp_la_CXXFLAGS=-fPIC
 librestclient_cpp_la_LDFLAGS=-version-info 1:0:1
+
+.PHONY: test check clean-coverage-files coverage-html
+
+test: check
+	./test-program
+
+clean-local:
+	find . -name "*.gcda" -print0 | xargs -0 rm
+
+coverage.info: test
+	./utils/lcov-1.11/bin/lcov --compat-libtool --capture --directory source --output-file coverage.info
+	./utils/lcov-1.11/bin/lcov --compat-libtool --remove coverage.info "/usr*" -o coverage.info
+
+coverage-html: coverage.info
+	./utils/lcov-1.11/bin/genhtml -t "restclient-cpp coverage report" --legend --show-details coverage.info --output-directory html

configure.ac

@@ -36,4 +36,6 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 
 AC_CONFIG_FILES([Makefile])
+AC_ARG_ENABLE(coverage,
+    AC_HELP_STRING([--enable-coverage],[Enable code coverage]), [CXXFLAGS=" -O0 -g -ftest-coverage -fprofile-arcs"])
 AC_OUTPUT

test/test_restclient_get.cpp

@@ -58,11 +58,11 @@ TEST_F(RestClientGetTest, TestRestClientGETAdditionalHeaders)
   headers["Accept-Charset"] = "iso8859-2";
   headers["Accept-Language"] = "en-US";
   headers["User-Agent"] = "restclient-cpp";
-  
+
   RestClient::response res = RestClient::get("http://httpbin.org/headers", headers);
-  
+
   EXPECT_EQ(200, res.code);
-  
+
   Json::Value root;
   std::istringstream str(res.body);
   str >> root;
@@ -93,4 +93,21 @@ TEST_F(RestClientGetTest, TestRestClientGETTimeout)
   EXPECT_EQ(28, res.code);
 }
 
+TEST_F(RestClientGetTest, TestRestClientGETAuth)
+{
+  RestClient::setAuth("foo", "bar");
+  RestClient::response res = RestClient::get("http://httpbin.org/basic-auth/foo/bar");
+  EXPECT_EQ(200, res.code);
+
+  Json::Value root;
+  std::istringstream str(res.body);
+  str >> root;
+
+  EXPECT_EQ("foo", root.get("user", "no user").asString());
+  EXPECT_EQ(true, root.get("authenticated", false).asBool());
+
+  RestClient::clearAuth();
+  res = RestClient::get("http://httpbin.org/basic-auth/foo/bar");
+  EXPECT_EQ(401, res.code);
+}