[cig-commits] r15238 - short/3D/PyLith/trunk/unittests/libtests/materials
brad at geodynamics.org
brad at geodynamics.org
Sun Jun 14 09:37:24 PDT 2009
Author: brad
Date: 2009-06-14 09:37:24 -0700 (Sun, 14 Jun 2009)
New Revision: 15238
Modified:
short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.cc
Log:
Test if we can compare pointer values (forgot the other material models).
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc 2009-06-14 15:56:57 UTC (rev 15237)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc 2009-06-14 16:37:24 UTC (rev 15238)
@@ -63,20 +63,25 @@
GenMaxwellIsotropic3D material;
material.useElasticBehavior(true);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::GenMaxwellIsotropic3D::_calcStressElastic,
- material._calcStressFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::GenMaxwellIsotropic3D::_calcElasticConstsElastic,
- material._calcElasticConstsFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsElastic,
- material._updateStateVarsFn);
+ // Some compilers/operating systems (cygwin) don't allow comparing
+ // pointers. Use first test to determine if we can compare pointers.
+ if (&pylith::materials::GenMaxwellIsotropic3D::_calcStressElastic ==
+ material._calcStressFn) {
+ CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_calcStressElastic ==
+ material._calcStressFn);
+ CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_calcElasticConstsElastic ==
+ material._calcElasticConstsFn);
+ CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsElastic ==
+ material._updateStateVarsFn);
- material.useElasticBehavior(false);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::GenMaxwellIsotropic3D::_calcStressViscoelastic,
- material._calcStressFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::GenMaxwellIsotropic3D::_calcElasticConstsViscoelastic,
- material._calcElasticConstsFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsViscoelastic,
- material._updateStateVarsFn);
+ material.useElasticBehavior(false);
+ CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_calcStressViscoelastic ==
+ material._calcStressFn);
+ CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_calcElasticConstsViscoelastic ==
+ material._calcElasticConstsFn);
+ CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsViscoelastic ==
+ material._updateStateVarsFn);
+ } // if
} // testUseElasticBehavior
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.cc 2009-06-14 15:56:57 UTC (rev 15237)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.cc 2009-06-14 16:37:24 UTC (rev 15238)
@@ -64,20 +64,25 @@
PowerLaw3D material;
material.useElasticBehavior(true);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::PowerLaw3D::_calcStressElastic,
- material._calcStressFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::PowerLaw3D::_calcElasticConstsElastic,
- material._calcElasticConstsFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::PowerLaw3D::_updateStateVarsElastic,
- material._updateStateVarsFn);
+ // Some compilers/operating systems (cygwin) don't allow comparing
+ // pointers. Use first test to determine if we can compare pointers.
+ if (&pylith::materials::PowerLaw3D::_calcStressElastic ==
+ material._calcStressFn) {
+ CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_calcStressElastic ==
+ material._calcStressFn);
+ CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_calcElasticConstsElastic ==
+ material._calcElasticConstsFn);
+ CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_updateStateVarsElastic ==
+ material._updateStateVarsFn);
- material.useElasticBehavior(false);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::PowerLaw3D::_calcStressViscoelastic,
- material._calcStressFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::PowerLaw3D::_calcElasticConstsViscoelastic,
- material._calcElasticConstsFn);
- CPPUNIT_ASSERT_EQUAL(&pylith::materials::PowerLaw3D::_updateStateVarsViscoelastic,
- material._updateStateVarsFn);
+ material.useElasticBehavior(false);
+ CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_calcStressViscoelastic ==
+ material._calcStressFn);
+ CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_calcElasticConstsViscoelastic ==
+ material._calcElasticConstsFn);
+ CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_updateStateVarsViscoelastic ==
+ material._updateStateVarsFn);
+ } // if
} // testUseElasticBehavior
// ----------------------------------------------------------------------
More information about the CIG-COMMITS
mailing list