[cig-commits] r13525 - cs/cigma/trunk/tests/libcigma
luis at geodynamics.org
luis at geodynamics.org
Tue Dec 9 18:13:19 PST 2008
Author: luis
Date: 2008-12-09 18:13:19 -0800 (Tue, 09 Dec 2008)
New Revision: 13525
Modified:
cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp
cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp
cs/cigma/trunk/tests/libcigma/FE_Test.cpp
cs/cigma/trunk/tests/libcigma/FE_Test.h
cs/cigma/trunk/tests/libcigma/FieldTest.cpp
cs/cigma/trunk/tests/libcigma/FieldTest.h
cs/cigma/trunk/tests/libcigma/FunctionTest.cpp
cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp
cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp
cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp
cs/cigma/trunk/tests/libcigma/QuadratureTest.h
Log:
Updates to CppUnit tests
Modified: cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -94,6 +94,7 @@
{
DataPath dofs_path("tests/data/brick1/brick1_coords.dat"); // load coords as dofs
shared_ptr<DofHandler> dofs = ReadDofHandler(dofs_path);
+
CPPUNIT_ASSERT(dofs);
CPPUNIT_ASSERT_EQUAL(27, dofs->n_nodes());
CPPUNIT_ASSERT_EQUAL(3, dofs->n_rank());
Modified: cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -45,6 +45,7 @@
{
DataPath eb_path("tests/data/brick1/brick1_connect.dat");
shared_ptr<ElementBlock> eb = ReadElementBlock(eb_path);
+
CPPUNIT_ASSERT(eb);
CPPUNIT_ASSERT_EQUAL(8, eb->n_cells());
CPPUNIT_ASSERT_EQUAL(8, eb->n_dofs());
Modified: cs/cigma/trunk/tests/libcigma/FE_Test.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FE_Test.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/FE_Test.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -2,10 +2,29 @@
using namespace libcigma;
#include "FE.h"
+#include "core_readers.h"
using namespace cigma;
+#include <boost/shared_ptr.hpp>
+using boost::shared_ptr;
+
void FE_Test::test_something()
{
FE fe;
}
+void FE_Test::test_text_reader()
+{
+ FE_Info fe_info;
+ fe_info.q_info.p_quadrature = DataPath("tests/data/qr/hex8_qr3.dat");
+ fe_info.q_info.cell_type_name = "hex8";
+ shared_ptr<FE> fe = ReadFE(fe_info);
+
+ CPPUNIT_ASSERT(fe);
+ CPPUNIT_ASSERT(fe->quadrature);
+ CPPUNIT_ASSERT(fe->cell);
+ CPPUNIT_ASSERT_EQUAL(8, fe->quadrature->n_points());
+ CPPUNIT_ASSERT_EQUAL(3, fe->quadrature->n_dim());
+ CPPUNIT_ASSERT_EQUAL(Cell::HEX8, fe->cell->cell_type());
+ CPPUNIT_ASSERT_EQUAL(fe->cell->cell_type(), fe->quadrature->getCellType());
+}
Modified: cs/cigma/trunk/tests/libcigma/FE_Test.h
===================================================================
--- cs/cigma/trunk/tests/libcigma/FE_Test.h 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/FE_Test.h 2008-12-10 02:13:19 UTC (rev 13525)
@@ -11,12 +11,14 @@
{
CPPUNIT_TEST_SUITE(FE_Test);
CPPUNIT_TEST(test_something);
+ CPPUNIT_TEST(test_text_reader);
CPPUNIT_TEST_SUITE_END();
public:
FE_Test() {}
~FE_Test() {}
void test_something();
+ void test_text_reader();
};
};
Modified: cs/cigma/trunk/tests/libcigma/FieldTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FieldTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/FieldTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -2,9 +2,56 @@
using namespace libcigma;
#include "Field.h"
+#include "Exception.h"
+#include "core_readers.h"
using namespace cigma;
+//#include <iostream>
+#include <boost/shared_ptr.hpp>
+using boost::shared_ptr;
+
void FieldTest::test_something()
{
Field field;
}
+
+void FieldTest::test_text_reader()
+{
+ FieldInfo field_info;
+ field_info.p_field = DataPath("tests/data/brick1/brick1_coords.dat");
+ field_info.fe_info.q_info.cell_type_name = "hex8";
+ field_info.mesh_info.p_nc = DataPath("tests/data/brick1/brick1_coords.dat");
+ field_info.mesh_info.p_eb = DataPath("tests/data/brick1/brick1_connect.dat");
+ field_info.mesh_info.cell_type_name = "hex8";
+ field_info.mesh_info.use_locator = false;
+ shared_ptr<Field> field = ReadField(field_info);
+
+ /*
+ try {
+ field = ReadField(field_info);
+ } catch (cigma::Exception& e) {
+ std::cout << e.getName() << ": " << e.getMessage() << std::endl;
+ } // */
+
+ CPPUNIT_ASSERT(field);
+ CPPUNIT_ASSERT_EQUAL(3, field->n_dim());
+ CPPUNIT_ASSERT_EQUAL(3, field->n_rank());
+
+ CPPUNIT_ASSERT(field->mesh);
+ CPPUNIT_ASSERT(field->mesh->coords);
+ CPPUNIT_ASSERT(field->mesh->connect);
+ CPPUNIT_ASSERT_EQUAL(27, field->mesh->coords->n_points());
+ CPPUNIT_ASSERT_EQUAL(3, field->mesh->coords->n_dim());
+ CPPUNIT_ASSERT_EQUAL(8, field->mesh->connect->n_cells());
+ CPPUNIT_ASSERT_EQUAL(8, field->mesh->connect->n_dofs());
+
+ CPPUNIT_ASSERT(field->fe);
+ CPPUNIT_ASSERT(field->fe->cell);
+ CPPUNIT_ASSERT(field->fe->quadrature);
+ CPPUNIT_ASSERT_EQUAL(8, field->fe->quadrature->n_points());
+ CPPUNIT_ASSERT_EQUAL(3, field->fe->quadrature->n_dim());
+
+ CPPUNIT_ASSERT(field->dofs);
+ CPPUNIT_ASSERT_EQUAL(27, field->dofs->n_nodes());
+ CPPUNIT_ASSERT_EQUAL(3, field->dofs->n_rank());
+}
Modified: cs/cigma/trunk/tests/libcigma/FieldTest.h
===================================================================
--- cs/cigma/trunk/tests/libcigma/FieldTest.h 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/FieldTest.h 2008-12-10 02:13:19 UTC (rev 13525)
@@ -11,12 +11,14 @@
{
CPPUNIT_TEST_SUITE(FieldTest);
CPPUNIT_TEST(test_something);
+ CPPUNIT_TEST(test_text_reader);
CPPUNIT_TEST_SUITE_END();
public:
FieldTest() {}
~FieldTest() {}
void test_something();
+ void test_text_reader();
};
};
Modified: cs/cigma/trunk/tests/libcigma/FunctionTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FunctionTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/FunctionTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -4,6 +4,7 @@
#include "Function.h"
#include "fn_zero.h"
using namespace cigma;
+using boost::shared_ptr;
const double delta = 1e-8;
@@ -13,15 +14,15 @@
double value = -1;
bool status;
- Function *fn = Function::New("zero");
- CPPUNIT_ASSERT(fn != 0);
+ shared_ptr<Function> fn = Function::New("zero");
+ CPPUNIT_ASSERT(fn);
status = fn->eval(&x, &value);
CPPUNIT_ASSERT_EQUAL(true, status);
CPPUNIT_ASSERT_DOUBLES_EQUAL(0, value, delta);
- Function *asdf = Function::New("asdf");
- CPPUNIT_ASSERT(asdf == 0);
+ shared_ptr<Function> asdf = Function::New("asdf");
+ CPPUNIT_ASSERT(!asdf);
}
void FunctionTest::test_zero()
Modified: cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -89,8 +89,8 @@
mesh_info.p_eb = DataPath("tests/data/brick1/brick1_connect.dat");
mesh_info.use_locator = false;
mesh_info.cell_type_name = "hex8";
+ shared_ptr<MeshPart> mesh = ReadMeshPart(mesh_info);
- shared_ptr<MeshPart> mesh = ReadMeshPart(mesh_info);
CPPUNIT_ASSERT(mesh);
CPPUNIT_ASSERT(mesh->coords);
CPPUNIT_ASSERT(mesh->connect);
Modified: cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -71,6 +71,7 @@
{
DataPath nc_path("tests/data/brick1/brick1_coords.dat");
shared_ptr<NodeCoordinates> nc = ReadNodeCoordinates(nc_path);
+
CPPUNIT_ASSERT(nc);
CPPUNIT_ASSERT_EQUAL(27, nc->n_points());
CPPUNIT_ASSERT_EQUAL(3, nc->n_dim());
Modified: cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp 2008-12-10 02:13:19 UTC (rev 13525)
@@ -2,8 +2,12 @@
using namespace libcigma;
#include "Quadrature.h"
+#include "core_readers.h"
using namespace cigma;
+#include <boost/shared_ptr.hpp>
+using boost::shared_ptr;
+
void QuadratureTest::test_constructor()
{
int i,j;
@@ -49,3 +53,17 @@
}
}
}
+
+void QuadratureTest::test_text_reader()
+{
+ QuadratureInfo q_info;
+ q_info.p_quadrature = DataPath("tests/data/qr/hex8_qr3.dat");
+ q_info.cell_type_name = "hex8";
+ shared_ptr<Quadrature> Q = ReadQuadrature(q_info);
+
+ CPPUNIT_ASSERT(Q);
+ CPPUNIT_ASSERT_EQUAL(8, Q->n_points());
+ CPPUNIT_ASSERT_EQUAL(3, Q->n_dim());
+ CPPUNIT_ASSERT_EQUAL(Cell::HEX8, Q->getCellType());
+}
+
Modified: cs/cigma/trunk/tests/libcigma/QuadratureTest.h
===================================================================
--- cs/cigma/trunk/tests/libcigma/QuadratureTest.h 2008-12-10 02:13:18 UTC (rev 13524)
+++ cs/cigma/trunk/tests/libcigma/QuadratureTest.h 2008-12-10 02:13:19 UTC (rev 13525)
@@ -11,12 +11,14 @@
{
CPPUNIT_TEST_SUITE(QuadratureTest);
CPPUNIT_TEST(test_constructor);
+ CPPUNIT_TEST(test_text_reader);
CPPUNIT_TEST_SUITE_END();
public:
QuadratureTest() {}
~QuadratureTest() {}
void test_constructor();
+ void test_text_reader();
};
};
More information about the CIG-COMMITS
mailing list