[cig-commits] r14112 - short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials

[brad at geodynamics.org]

Author: brad
Date: 2009-02-20 17:19:33 -0800 (Fri, 20 Feb 2009)
New Revision: 14112

Modified:
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.hh
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh
Log:
More work on updating material unit tests.

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.cc	2009-02-21 00:55:53 UTC (rev 14111)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.cc	2009-02-21 01:19:33 UTC (rev 14112)
@@ -25,6 +25,46 @@
 CPPUNIT_TEST_SUITE_REGISTRATION( pylith::materials::TestElasticMaterial );
 
 // ----------------------------------------------------------------------
+// Test dbInitialStress()
+void
+pylith::materials::TestElasticMaterial::testDBInitialStress(void)
+{ // testDBInitialStress
+  const std::string& label = "my_database";
+  spatialdata::spatialdb::SimpleDB db;
+  db.label(label.c_str());
+  
+  ElasticIsotropic3D material;
+  material.dbInitialStress(&db);
+  
+  CPPUNIT_ASSERT(0 != material._dbInitialStress);
+  CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialStress->label()));
+} // testDBInitialStress
+
+// ----------------------------------------------------------------------
+// Test dbInitialStrain()
+void
+pylith::materials::TestElasticMaterial::testDBInitialStrain(void)
+{ // testDBInitialStrain
+  const std::string& label = "my_database";
+  spatialdata::spatialdb::SimpleDB db;
+  db.label(label.c_str());
+  
+  ElasticIsotropic3D material;
+  material.dbInitialStrain(&db);
+  
+  CPPUNIT_ASSERT(0 != material._dbInitialStrain);
+  CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialStrain->label()));
+} // testDBInitialStrain
+
+// ----------------------------------------------------------------------
+// Test initialize()
+void
+pylith::materials::TestElasticMaterial::testInitialize(void)
+{ // testInitialize
+  CPPUNIT_ASSERT(false);
+} // testInitialize
+
+// ----------------------------------------------------------------------
 // Test calcDensity()
 void
 pylith::materials::TestElasticMaterial::testCalcDensity(void)
@@ -251,8 +291,16 @@
 } // testCalcDerivElastic
     
 // ----------------------------------------------------------------------
-// Test calcDensity()
+// Test updateStateVars()
 void
+pylith::materials::TestElasticMaterial::testUpdateStateVars(void)
+{ // testUpdateStateVars
+  CPPUNIT_ASSERT(false);
+} // testUpdateStateVars
+
+// ----------------------------------------------------------------------
+// Test calcStableTimeStepImplicit()
+void
 pylith::materials::TestElasticMaterial::testStableTimeStepImplicit(void)
 { // testStableTimeStepImplicit
   ALE::Obj<Mesh> mesh;
@@ -321,6 +369,22 @@
 } // testStableTimeStepImplicit
     
 // ----------------------------------------------------------------------
+// Test useElasticBehavior()
+void
+pylith::materials::TestElasticMaterial::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
+  ElasticIsotropic3D material;
+
+  bool flag = false;
+  material.useElasticBehavior(flag);
+  CPPUNIT_ASSERT_EQUAL(flag, material._useElasticBehavior);
+
+  bool flag = true;
+  material.useElasticBehavior(flag);
+  CPPUNIT_ASSERT_EQUAL(flag, material._useElasticBehavior);
+} // testUseElasticBehavior
+
+// ----------------------------------------------------------------------
 // Setup testing data.
 void
 pylith::materials::TestElasticMaterial::setUp(void)
@@ -437,6 +501,13 @@
 				   tolerance);
 } // _testCalcElasticConsts
 
+// ----------------------------------------------------------------------
+// Test _updateStateVars()
+void
+pylith::materials::TestElasticMaterial::test_updateStateVars(void)
+{ // test_updateStateVars
+  CPPUNIT_ASSERT(false);
+} // test_updateStateVars
 
 // ----------------------------------------------------------------------
 // Test _stableTimeStepImplicit()

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.hh	2009-02-21 00:55:53 UTC (rev 14111)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestElasticMaterial.hh	2009-02-21 01:19:33 UTC (rev 14112)
@@ -26,7 +26,6 @@
 /// Namespace for pylith package
 namespace pylith {
   namespace materials {
-    class ElasticMaterial;
     class TestElasticMaterial;
     class ElasticMaterialData;
   } // materials
@@ -39,16 +38,34 @@
   // CPPUNIT TEST SUITE /////////////////////////////////////////////////
   CPPUNIT_TEST_SUITE( TestElasticMaterial );
 
+  CPPUNIT_TEST( testDBInitialStress );
+  CPPUNIT_TEST( testDBInitialStrain );
+  CPPUNIT_TEST( testInitialize );
+  CPPUNIT_TETS( testRetrievePropsAndVars );
   CPPUNIT_TEST( testCalcDensity );
   CPPUNIT_TEST( testCalcStress );
   CPPUNIT_TEST( testCalcDerivElastic );
+  CPPUNIT_TEST( testUpdateStateVars );
   CPPUNIT_TEST( testStableTimeStepImplicit );
+  CPPUNIT_TEST( testUseElasticBehavior );
 
   CPPUNIT_TEST_SUITE_END();
 
   // PUBLIC METHODS /////////////////////////////////////////////////////
 public :
 
+  /// Test dbInitialStress().
+  void testDBInitialStress(void);
+
+  /// Test dbInitialStrain().
+  void testDBInitialStrain(void);
+
+  /// Test initialize().
+  void testInitialize(void);
+
+  /// Test retrievePropsAndVars().
+  void testRetrievePropsAndVars(void);
+
   /// Test calcDensity()
   void testCalcDensity(void);
 
@@ -58,9 +75,15 @@
   /// Test calcDerivElastic()
   void testCalcDerivElastic(void);
 
+  /// Test updateStateVars().
+  void testUpdateStateVars(void);
+
   /// Test stableTimeStepImplicit().
   void testStableTimeStepImplicit(void);
 
+  /// Test useElasticBehavior().
+  void testUseElasticBehavior(void);
+
   // PUBLIC METHODS /////////////////////////////////////////////////////
 public :
 
@@ -83,6 +106,9 @@
   /// Test _calcElasticConsts().
   void test_calcElasticConsts(void);
 
+  /// Test _updateStateVars().
+  void test_updateStateVars(void);
+
   /// Test _stableTimeStepImplicit().
   void test_stableTimeStepImplicit(void);
 

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh	2009-02-21 00:55:53 UTC (rev 14111)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh	2009-02-21 01:19:33 UTC (rev 14112)
@@ -23,10 +23,11 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "pylith/materials/materialsfwd.hh" // forward declarations
+
 /// Namespace for pylith package
 namespace pylith {
   namespace materials {
-    class Material;
     class TestMaterial;
     class MaterialData;
   } // materials