Release preparation (#73)

HBPVIS · May 23, 2017 · 6998512 · 6998512
1 parent bb88876
commit 6998512
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,8 @@ if(Qt5Core_FOUND)
   set(SERVUS_DEPENDENT_LIBRARIES Qt5Core)
 endif()
 
+set(LCOV_EXCLUDE "servus/md5/*")
+
 add_subdirectory(servus)
 add_subdirectory(apps)
 add_subdirectory(tests)

diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -1,7 +1,7 @@
 
 # Changelog {#Changelog}
 
-# Release 1.5.1 (git master)
+# Release 1.5.1 (22-05-2017)
 
 * [72](https://github.com/HBPVis/Servus/pull/72):
   Removed legacy warning about ',' separator in URIs.

diff --git a/servus/serializable.cpp b/servus/serializable.cpp
@@ -64,7 +64,6 @@ Serializable& Serializable::operator=(const Serializable& rhs)
     return *this;
 }
 
-#ifdef SERVUS_USE_CXX11
 Serializable::Serializable(Serializable&& rhs)
     : _impl(nullptr)
 {
@@ -76,7 +75,6 @@ Serializable& Serializable::operator=(Serializable&& rhs)
     std::swap(_impl, rhs._impl);
     return *this;
 }
-#endif
 
 uint128_t Serializable::getTypeIdentifier() const
 {

diff --git a/servus/serializable.h b/servus/serializable.h
@@ -115,10 +115,8 @@ class Serializable
 protected:
     SERVUS_API Serializable(const Serializable&);
     SERVUS_API Serializable& operator=(const Serializable&);
-#ifdef SERVUS_USE_CXX11
     SERVUS_API Serializable(Serializable&&);
     SERVUS_API Serializable& operator=(Serializable&&);
-#endif
 
 private:
     /**

diff --git a/servus/uint128_t.cpp b/servus/uint128_t.cpp
@@ -95,7 +95,7 @@ uint128_t make_UUID()
         // Also, creating a new generator each call seems to increases the
         // chances of collissions up to a noticeable level.
 
-        // http://stackoverflow.com/questions/14711263/c11-stdmutex-in-visual-studio-2012-deadlock-when-locked-from-dllmain
+        // http://stackoverflow.com/questions/14711263
         static std::mutex mutex;
         ScopedLock lock(mutex);
 #endif

diff --git a/tests/servus.cpp b/tests/servus.cpp
@@ -89,6 +89,9 @@ BOOST_AUTO_TEST_CASE(test_servus)
         return;
     }
     BOOST_CHECK_EQUAL(result, result);
+    BOOST_CHECK_EQUAL(result.getString(), "success");
+    BOOST_CHECK_EQUAL(result.getCode(), 0);
+    std::cout << result << std::endl; // for coverage
 
     service.withdraw();
     service.set("foo", "bar");

diff --git a/tests/uint128_t.cpp b/tests/uint128_t.cpp
@@ -118,6 +118,18 @@ BOOST_AUTO_TEST_CASE(basic)
     id6 = std::string("0xD41D8CD98F00B204:0xE9800998ECF8427E");
     BOOST_CHECK_EQUAL(id6.high(), 0xD41D8CD98F00B204ull);
     BOOST_CHECK_EQUAL(id6.low(), 0xE9800998ECF8427Eull);
+
+    id6 = std::string();
+    BOOST_CHECK_EQUAL(id6.high(), 0);
+    BOOST_CHECK_EQUAL(id6.low(), 0);
+
+    std::cout << id6 << std::endl; // for coverage
+
+    id6 = std::string("0xD41D8CD98F00B204\\0580xE9800998ECF8427E");
+    BOOST_CHECK_EQUAL(id6.high(), 0xD41D8CD98F00B204ull);
+    BOOST_CHECK_EQUAL(id6.low(), 0xE9800998ECF8427Eull);
+
+    std::cout << id6 << std::endl; // for coverage
 }
 
 class Thread