From 1b8f586094813707b19cc55040849b56d15c685b Mon Sep 17 00:00:00 2001 From: bjaraujo Date: Thu, 28 Dec 2023 19:44:56 +0000 Subject: [PATCH] Revert "Updated test and gtest." This reverts commit 35ac1e9c0ac28f2f9673772d930d52e953997fba. --- trunk/tests/CMakeLists.txt.in | 4 ++-- trunk/tests/TestMshTetrahedronMesher.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/trunk/tests/CMakeLists.txt.in b/trunk/tests/CMakeLists.txt.in index 93f2be0..596ee21 100644 --- a/trunk/tests/CMakeLists.txt.in +++ b/trunk/tests/CMakeLists.txt.in @@ -4,8 +4,8 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz - URL_HASH SHA1=2b28c2a3a30d86b1759543ef61fac3c4d69f8c4c + URL https://github.com/google/googletest/archive/refs/tags/release-1.10.0.tar.gz + URL_HASH SHA1=9c89be7df9c5e8cb0bc20b3c4b39bf7e82686770 SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" diff --git a/trunk/tests/TestMshTetrahedronMesher.cpp b/trunk/tests/TestMshTetrahedronMesher.cpp index b69ed0e..3785d5e 100644 --- a/trunk/tests/TestMshTetrahedronMesher.cpp +++ b/trunk/tests/TestMshTetrahedronMesher.cpp @@ -168,6 +168,8 @@ TEST_F(CTestMshTetrahedronMesher, mesh2) { TEST_F(CTestMshTetrahedronMesher, mesh3) { + GTEST_SKIP(); + const Decimal d = 0.125; const Integer nu = 5; @@ -211,7 +213,7 @@ TEST_F(CTestMshTetrahedronMesher, mesh3) { CMshTetrahedronMesher aTetrahedronMesher; std::vector> sInteriorPoints; - aTetrahedronMesher.generate(aSurfaceMesh, 999, sInteriorPoints, d, d * 0.9, d * 1.1, 1E-6); + aTetrahedronMesher.generate(aSurfaceMesh, 999, sInteriorPoints, d * 1.1, d * 1.0, d * 1.2, 1E-3); CMshMesh aVolumeMesh; aVolumeMesh = aTetrahedronMesher.mesh(); @@ -219,7 +221,7 @@ TEST_F(CTestMshTetrahedronMesher, mesh3) { T.setMesh(aVolumeMesh); aPosGmsh.save(T, "tetra_volume3.msh", "tetras"); - EXPECT_EQ(322, aVolumeMesh.nbElements()); + EXPECT_EQ(281, aVolumeMesh.nbElements()); }