[cig-commits] r7095 - short/3D/PyLith/trunk/unittests/libtests/feassemble

[brad at geodynamics.org]

Author: brad
Date: 2007-06-07 17:03:11 -0700 (Thu, 07 Jun 2007)
New Revision: 7095

Modified:
   short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
   short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh
Log:
Added missing C++ unit test for Quadrature refGeometry().

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc	2007-06-07 23:37:26 UTC (rev 7094)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc	2007-06-08 00:03:11 UTC (rev 7095)
@@ -15,6 +15,8 @@
 #include "TestQuadrature.hh" // Implementation of class methods
 
 #include "pylith/feassemble/Quadrature1D.hh" // USES Quadrature1D
+#include "pylith/feassemble/GeometryLine1D.hh" // USES GeometryLine1D
+
 #include "data/QuadratureData.hh" // USES QuadratureData
 
 // ----------------------------------------------------------------------
@@ -40,6 +42,7 @@
   const double jacobianE[] = { 2.56 };
   const double jacobianInvE[] = { 5.12 };
   const double jacobianDetE[] = { 10.24 };
+  GeometryLine1D geometry;
 
   // Set values
   Quadrature1D qOrig;
@@ -85,6 +88,8 @@
   qOrig._jacobianDet.resize(size);
   memcpy(&qOrig._jacobianDet[0], jacobianDetE, size*sizeof(double));
 
+  qOrig._geometry = geometry.clone();
+
   // Clone
   const Quadrature* qCopy = qOrig.clone();
 
@@ -151,6 +156,11 @@
   for (int i=0; i < size; ++i)
     CPPUNIT_ASSERT_EQUAL(jacobianDetE[i], jacobianDet[i]);
 
+  CPPUNIT_ASSERT(0 != qCopy->_geometry);
+  CPPUNIT_ASSERT_EQUAL(geometry.cellDim(), qCopy->_geometry->cellDim());
+  CPPUNIT_ASSERT_EQUAL(geometry.spaceDim(), qCopy->_geometry->spaceDim());
+  CPPUNIT_ASSERT_EQUAL(geometry.numCorners(), qCopy->_geometry->numCorners());
+
   delete qCopy; qCopy = 0;
 } // testCopy
 
@@ -166,6 +176,21 @@
 } // testMinJacobian
 
 // ----------------------------------------------------------------------
+// Test refGeometry()
+void
+pylith::feassemble::TestQuadrature::testRefGeometry(void)
+{ // testRefGeometry
+  GeometryLine1D geometry;
+  Quadrature1D quadrature;
+  quadrature.refGeometry(&geometry);
+  const CellGeometry& test = quadrature.refGeometry();
+
+  CPPUNIT_ASSERT_EQUAL(geometry.cellDim(), test.cellDim());
+  CPPUNIT_ASSERT_EQUAL(geometry.spaceDim(), test.spaceDim());
+  CPPUNIT_ASSERT_EQUAL(geometry.numCorners(), test.numCorners());
+} // testRefGeometry
+
+// ----------------------------------------------------------------------
 // Test initialize()
 void
 pylith::feassemble::TestQuadrature::testInitialize(void)

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh	2007-06-07 23:37:26 UTC (rev 7094)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh	2007-06-08 00:03:11 UTC (rev 7095)
@@ -41,6 +41,7 @@
 
   CPPUNIT_TEST( testClone );
   CPPUNIT_TEST( testMinJacobian );
+  CPPUNIT_TEST( testRefGeometry );
   CPPUNIT_TEST( testInitialize );
 
   CPPUNIT_TEST_SUITE_END();
@@ -54,6 +55,9 @@
   /// Test minJacobian()
   void testMinJacobian(void);
 
+  /// Test refGeometry()
+  void testRefGeometry(void);
+
   /// Test initialize()
   void testInitialize(void);