upd: striping system lib crom coverage

[cassiopeia.git] / test / src / slipBioTest.cpp

diff --git a/test/src/slipBioTest.cpp b/test/src/slipBioTest.cpp
index 48578c41ece0a4a0f99afc6baafaec4270d68e7e..8f967de73f47733967b7c3373cee803f939267a1 100644 (file)
--- a/test/src/slipBioTest.cpp
+++ b/test/src/slipBioTest.cpp
@@ -6,21 +6,18 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#include "bios.h"
-#include "opensslBIO.h"
-#include "slipBio.h"
+#include "io/bios.h"
+#include "io/opensslBIO.h"
+#include "io/slipBio.h"
 
 class OpensslBIOVector : public OpensslBIO {
 private:
-    std::vector<std::vector<char>>::iterator it, end;
     std::vector<std::vector<char>> input;
+    std::vector<std::vector<char>>::iterator it, end;
 
 public:
     std::vector<std::vector<char>> result = std::vector<std::vector<char>>();
-    OpensslBIOVector( std::vector<std::vector<char>> data ) {
-        input = data;
-        it = input.begin();
-        end = input.end();
+    OpensslBIOVector( std::vector<std::vector<char>> data ) : input( data ), it( input.begin() ), end( input.end() ) {
     }
 
     int write( const char* buf, int num );
@@ -46,7 +43,7 @@ int OpensslBIOVector::read( char* buf, int size ) {
 
     std::copy( it->begin(), it->end(), buf );
     auto result = it->size();
-    it++;
+    ++it;
     return result;
 }
 
@@ -158,16 +155,16 @@ BOOST_AUTO_TEST_CASE( TestSSLThroughSLIP ) {
     BOOST_CHECK_EQUAL( res, 5 );
     BOOST_CHECK_EQUAL_COLLECTIONS( data, data + 5, data2, data2 + 5 );
 
-    BIO_free(c_bio);
-    BIO_free(s_bio);
+    BIO_free( c_bio );
+    BIO_free( s_bio );
 
-    BIO_free(slip1);
-    BIO_free(slip2);
-    SSL_free(c_ssl);
-    SSL_free(s_ssl);
+    BIO_free( slip1 );
+    BIO_free( slip2 );
+    SSL_free( c_ssl );
+    SSL_free( s_ssl );
 
-    SSL_CTX_free(c_ctx);
-    SSL_CTX_free(s_ctx);
+    SSL_CTX_free( c_ctx );
+    SSL_CTX_free( s_ctx );
 }
 
 BOOST_AUTO_TEST_SUITE_END()