Merge branch 'murmur_hash' into 'master'

Use MurmurHash3_x64_128 for Files::getHash

See merge request OpenMW/openmw!1404

apps/openmw_test_suite/CMakeLists.txt

@@ -62,6 +62,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
         esmloader/load.cpp
         esmloader/esmdata.cpp
+
+        files/hash.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})

apps/openmw_test_suite/files/hash.cpp

@@ -0,0 +1,55 @@
+#include <components/files/hash.hpp>
+#include <components/files/constrainedfilestream.hpp>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <algorithm>
+#include <fstream>
+#include <sstream>
+#include <string>
+
+namespace
+{
+    using namespace testing;
+    using namespace Files;
+
+    struct Params
+    {
+        std::size_t mSize;
+        std::array<std::uint64_t, 2> mHash;
+    };
+
+    struct FilesGetHash : TestWithParam<Params> {};
+
+    TEST_P(FilesGetHash, shouldReturnHashForStringStream)
+    {
+        const std::string fileName = "fileName";
+        std::string content;
+        std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
+        std::istringstream stream(content);
+        EXPECT_EQ(getHash(fileName, stream), GetParam().mHash);
+    }
+
+    TEST_P(FilesGetHash, shouldReturnHashForConstrainedFileStream)
+    {
+        std::string fileName(UnitTest::GetInstance()->current_test_info()->name());
+        std::replace(fileName.begin(), fileName.end(), '/', '_');
+        std::string content;
+        std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
+        std::fstream(fileName, std::ios_base::out | std::ios_base::binary)
+            .write(content.data(), static_cast<std::streamsize>(content.size()));
+        const auto stream = Files::openConstrainedFileStream(fileName.data(), 0, content.size());
+        EXPECT_EQ(getHash(fileName, *stream), GetParam().mHash);
+    }
+
+    INSTANTIATE_TEST_SUITE_P(Params, FilesGetHash, Values(
+        Params {0, {0, 0}},
+        Params {1, {9607679276477937801ull, 16624257681780017498ull}},
+        Params {128, {15287858148353394424ull, 16818615825966581310ull}},
+        Params {1000, {11018119256083894017ull, 6631144854802791578ull}},
+        Params {4096, {11972283295181039100ull, 16027670129106775155ull}},
+        Params {4097, {16717956291025443060ull, 12856404199748778153ull}},
+        Params {5000, {15775925571142117787ull, 10322955217889622896ull}}
+    ));
+}

apps/openmw_test_suite/nifloader/testbulletnifloader.cpp

@@ -335,7 +335,7 @@ namespace
         MOCK_METHOD(void, setUseSkinning, (bool), (override));
         MOCK_METHOD(bool, getUseSkinning, (), (const, override));
         MOCK_METHOD(std::string, getFilename, (), (const, override));
-        MOCK_METHOD(std::uint64_t, getHash, (), (const, override));
+        MOCK_METHOD(std::string, getHash, (), (const, override));
         MOCK_METHOD(unsigned int, getVersion, (), (const, override));
         MOCK_METHOD(unsigned int, getUserVersion, (), (const, override));
         MOCK_METHOD(unsigned int, getBethVersion, (), (const, override));
@@ -382,7 +382,7 @@ namespace
             ),
             btVector3(4, 8, 12)
         };
-        const std::uint64_t mHash = 42;
+        const std::string mHash = "hash";
 
         TestBulletNifLoader()
         {