From 5c1a440f9d2b02ce8ecd19fb760da30c5d1419ee Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Tue, 18 Mar 2014 10:46:26 +0100
Subject: [PATCH] changed argument order for tests
---
Tests/MeshLib/TestElementStatus.cpp | 32 ++++++++++++++---------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/Tests/MeshLib/TestElementStatus.cpp b/Tests/MeshLib/TestElementStatus.cpp
index f194fc12115..6b75ec19d1f 100644
--- a/Tests/MeshLib/TestElementStatus.cpp
+++ b/Tests/MeshLib/TestElementStatus.cpp
@@ -22,7 +22,7 @@
TEST(MeshLib, ElementStatus)
{
-const unsigned width (100);
+ const unsigned width (100);
const unsigned elements_per_side (20);
MeshLib::Mesh* mesh (MeshLib::MeshGenerator::generateRegularQuadMesh(width, elements_per_side));
MeshLib::ElementStatus status(mesh);
@@ -35,21 +35,21 @@ const unsigned width (100);
}
// all elements active
- ASSERT_EQ (status.getNActiveElements(), elements.size());
+ ASSERT_EQ (elements.size(), status.getNActiveElements());
// all nodes active
- ASSERT_EQ (status.getNActiveNodes(), mesh->getNNodes());
+ ASSERT_EQ (mesh->getNNodes(), status.getNActiveNodes());
// set material 1 to false
status.setMaterialStatus(1, false);
- ASSERT_EQ (status.getNActiveElements(), elements.size()-elements_per_side);
+ ASSERT_EQ (elements.size()-elements_per_side, status.getNActiveElements());
// set material 1 to false (again)
status.setMaterialStatus(1, false);
- ASSERT_EQ (status.getNActiveElements(), elements.size()-elements_per_side);
+ ASSERT_EQ (elements.size()-elements_per_side, status.getNActiveElements());
// set material 0 to false
status.setMaterialStatus(0, false);
- ASSERT_EQ (status.getNActiveElements(), elements.size()-(2*elements_per_side));
+ ASSERT_EQ (elements.size()-(2*elements_per_side), status.getNActiveElements());
// active elements
std::vector<std::size_t> active_elements (status.getActiveElements());
@@ -62,27 +62,27 @@ const unsigned width (100);
// set element 1 to false (yet again)
status.setElementStatus(1, false);
status.getElementStatus(1);
- ASSERT_EQ (status.getNActiveElements(), elements.size()-(2*elements_per_side));
- ASSERT_EQ (status.getNActiveNodes(), mesh->getNNodes()-(2*(elements_per_side+1)));
+ ASSERT_EQ (elements.size()-(2*elements_per_side), status.getNActiveElements());
+ ASSERT_EQ (mesh->getNNodes()-(2*(elements_per_side+1)), status.getNActiveNodes());
// set element 1 to true
status.setElementStatus(1, true);
- ASSERT_EQ (status.getNActiveElements(), elements.size()-(2*elements_per_side)+1);
- ASSERT_EQ (status.getNActiveNodes(), mesh->getNNodes()-(2*(elements_per_side+1))+4);
+ ASSERT_EQ (elements.size()-(2*elements_per_side)+1, status.getNActiveElements());
+ ASSERT_EQ (mesh->getNNodes()-(2*(elements_per_side+1))+4, status.getNActiveNodes());
ASSERT_EQ(status.getElementStatus(1), true);
std::vector<std::size_t> active_elements_at_node (status.getActiveElementsAtNode(2));
- ASSERT_EQ(active_elements_at_node.size(), 1);
+ ASSERT_EQ(1, active_elements_at_node.size());
active_elements_at_node = status.getActiveElementsAtNode(22);
- ASSERT_EQ(active_elements_at_node.size(), 1);
+ ASSERT_EQ(1, active_elements_at_node.size());
active_elements_at_node = status.getActiveElementsAtNode(44);
- ASSERT_EQ(active_elements_at_node.size(), 2);
+ ASSERT_EQ(2, active_elements_at_node.size());
active_elements_at_node = status.getActiveElementsAtNode(102);
- ASSERT_EQ(active_elements_at_node.size(), 4);
+ ASSERT_EQ(4, active_elements_at_node.size());
status.setAll(true);
- ASSERT_EQ(status.getNActiveElements(), elements.size());
- ASSERT_EQ(status.getNActiveNodes(), mesh->getNNodes());
+ ASSERT_EQ(elements.size(), status.getNActiveElements());
+ ASSERT_EQ(mesh->getNNodes(), status.getNActiveNodes());
status.setAll(false);
ASSERT_EQ(0, status.getNActiveElements());
--
GitLab