Skip to content

Commit 0c85de8

Browse files
authored
[GeoMechanicsApplication] Sorted the stresses in the unit tests of the principal stress vectors (#14227)
1 parent 11df7e0 commit 0c85de8

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

applications/GeoMechanicsApplication/tests/cpp_tests/custom_constitutive/test_principal_stresses.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//
1212

1313
#include "custom_constitutive/principal_stresses.hpp"
14-
#include "custom_utilities/ublas_utilities.h"
1514
#include "includes/expect.h"
1615
#include "tests/cpp_tests/geo_mechanics_fast_suite_without_kernel.h"
1716
#include "tests/cpp_tests/test_utilities.h"
@@ -35,9 +34,9 @@ TYPED_TEST_SUITE(TestPrincipalStressFixture, TestVectorTypesPrincipalStress);
3534
TYPED_TEST(TestPrincipalStressFixture, PrincipalStresses_CanBeConstructedFromAnyVectorWithSizeOf3)
3635
{
3736
TypeParam initialization_vector(3);
38-
initialization_vector[0] = 1.0;
37+
initialization_vector[0] = 3.0;
3938
initialization_vector[1] = 2.0;
40-
initialization_vector[2] = 3.0;
39+
initialization_vector[2] = 1.0;
4140

4241
const auto principal_stresses = Geo::PrincipalStresses{initialization_vector};
4342

@@ -50,16 +49,16 @@ TEST_F(KratosGeoMechanicsFastSuiteWithoutKernel, PrincipalStresses_ThrowsWhenSiz
5049
GTEST_SKIP() << "This test requires a debug build";
5150
#endif
5251

53-
const auto too_short = {1.0, 2.0};
54-
const auto too_long = {1.0, 2.0, 3.0, 4.0};
52+
const auto too_short = {2.0, 1.0};
53+
const auto too_long = {4.0, 3.0, 2.0, 1.0};
5554
EXPECT_THROW(Geo::PrincipalStresses{too_long}, Exception);
5655
EXPECT_THROW(Geo::PrincipalStresses{too_short}, Exception);
5756
}
5857

5958
TEST_F(KratosGeoMechanicsFastSuiteWithoutKernel, PrincipalStresses_CanBeConstructedFromAStdInitializerListWithSize3)
6059
{
61-
KRATOS_EXPECT_VECTOR_NEAR((Geo::PrincipalStresses{1.0, 2.0, 3.0}.Values()),
62-
(std::vector{1.0, 2.0, 3.0}), Defaults::absolute_tolerance);
60+
KRATOS_EXPECT_VECTOR_NEAR((Geo::PrincipalStresses{3.0, 2.0, 1.0}.Values()),
61+
(std::vector{3.0, 2.0, 1.0}), Defaults::absolute_tolerance);
6362
}
6463

6564
TEST_F(KratosGeoMechanicsFastSuiteWithoutKernel,
@@ -69,13 +68,13 @@ TEST_F(KratosGeoMechanicsFastSuiteWithoutKernel,
6968
GTEST_SKIP() << "This test requires a debug build";
7069
#endif
7170

72-
EXPECT_THROW((Geo::PrincipalStresses{1.0, 2.0}), Exception);
73-
EXPECT_THROW((Geo::PrincipalStresses{1.0, 2.0, 3.0, 4.0}), Exception);
71+
EXPECT_THROW((Geo::PrincipalStresses{2.0, 1.0}), Exception);
72+
EXPECT_THROW((Geo::PrincipalStresses{4.0, 3.0, 2.0, 1.0}), Exception);
7473
}
7574

7675
TYPED_TEST(TestPrincipalStressFixture, PrincipalStressesCanBeCopiedToAnyVectorWithSize3)
7776
{
78-
Geo::PrincipalStresses principal_stresses{std::vector{1.0, 2.0, 3.0}};
77+
Geo::PrincipalStresses principal_stresses{std::vector{3.0, 2.0, 1.0}};
7978

8079
const auto copied_vector = principal_stresses.CopyTo<TypeParam>();
8180

@@ -84,11 +83,11 @@ TYPED_TEST(TestPrincipalStressFixture, PrincipalStressesCanBeCopiedToAnyVectorWi
8483

8584
TEST_F(KratosGeoMechanicsFastSuiteWithoutKernel, PrincipalStresses_CanBeChangedDirectly)
8685
{
87-
auto stresses = Geo::PrincipalStresses{1.0, 2.0, 3.0};
86+
auto stresses = Geo::PrincipalStresses{3.0, 2.0, 1.0};
8887

8988
stresses.Values()[0] = 4.0;
9089

91-
KRATOS_EXPECT_VECTOR_NEAR(stresses.Values(), (std::vector{4.0, 2.0, 3.0}), Defaults::absolute_tolerance);
90+
KRATOS_EXPECT_VECTOR_NEAR(stresses.Values(), (std::vector{4.0, 2.0, 1.0}), Defaults::absolute_tolerance);
9291
}
9392

9493
TEST_F(KratosGeoMechanicsFastSuiteWithoutKernel, PrincipalStresses_SupportsCompoundAssignment)

0 commit comments

Comments
 (0)