[cig-commits] r14619 - in short/3D/PyLith/branches/pylith-swig: . unittests/libtests/faults

[brad at geodynamics.org]

Author: brad
Date: 2009-04-07 16:44:26 -0700 (Tue, 07 Apr 2009)
New Revision: 14619

Modified:
   short/3D/PyLith/branches/pylith-swig/TODO
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFault.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.hh
Log:
Updated FaultCohesive tests (reenable FaultCohesiveKin tests).

Modified: short/3D/PyLith/branches/pylith-swig/TODO
===================================================================
--- short/3D/PyLith/branches/pylith-swig/TODO	2009-04-07 23:07:21 UTC (rev 14618)
+++ short/3D/PyLith/branches/pylith-swig/TODO	2009-04-07 23:44:26 UTC (rev 14619)
@@ -26,7 +26,6 @@
 
   (4) Faults
     Use visitors in FaultCohesiveKin
-    TestFaultCohesive (FaultCohesiveKin cases)
 
   (5) Add missing unit tests
 

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am	2009-04-07 23:07:21 UTC (rev 14618)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am	2009-04-07 23:44:26 UTC (rev 14619)
@@ -21,6 +21,7 @@
 
 # Primary source files
 testfaults_SOURCES = \
+	TestFault.cc \
 	TestFaultCohesive.cc \
 	TestStepSlipFn.cc \
 	TestConstRateSlipFn.cc \
@@ -29,7 +30,6 @@
 	TestEqKinSrc.cc \
 	test_faults.cc
 
-#	TestFault.cc \
 #	TestFaultCohesiveKin.cc \
 #	TestFaultCohesiveKinLine2.cc \
 #	TestFaultCohesiveKinTri3.cc \

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFault.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFault.cc	2009-04-07 23:07:21 UTC (rev 14618)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFault.cc	2009-04-07 23:44:26 UTC (rev 14619)
@@ -42,7 +42,7 @@
   FaultCohesiveKin fault;
   fault.label(label.c_str());
   
-  CPPUNIT_ASSERT_EQUAL(label, fault.label());
+  CPPUNIT_ASSERT_EQUAL(label, std::string(fault.label()));
 } // testLabel
     
 

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.cc	2009-04-07 23:07:21 UTC (rev 14618)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.cc	2009-04-07 23:44:26 UTC (rev 14619)
@@ -14,7 +14,7 @@
 
 #include "TestFaultCohesive.hh" // Implementation of class methods
 
-//#include "pylith/faults/FaultCohesiveKin.hh" // USES FaultsCohesiveKin
+#include "pylith/faults/FaultCohesiveKin.hh" // USES FaultsCohesiveKin
 #include "pylith/faults/FaultCohesiveDyn.hh" // USES FaultsCohesiveDyn
 
 #include "pylith/topology/Mesh.hh" // USES Mesh
@@ -422,7 +422,6 @@
   _testAdjustTopology(&fault, data, false);
 } // testAdjustTopologyHex8i
 
-#if 0
 // ----------------------------------------------------------------------
 // Test adjustTopology() with 1-D line element for Lagrange
 // multipliers.
@@ -477,7 +476,6 @@
   FaultCohesiveKin fault;
   _testAdjustTopology(&fault, data, true);
 } // testAdjustTopologyHex8Lagrange
-#endif
 
 // ----------------------------------------------------------------------
 // Test adjustTopology().

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.hh	2009-04-07 23:07:21 UTC (rev 14618)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesive.hh	2009-04-07 23:44:26 UTC (rev 14619)
@@ -77,13 +77,11 @@
   CPPUNIT_TEST( testAdjustTopologyHex8h );
   CPPUNIT_TEST( testAdjustTopologyHex8i );
 
-#if 0
   CPPUNIT_TEST( testAdjustTopologyLine2Lagrange );
   CPPUNIT_TEST( testAdjustTopologyTri3Lagrange );
   CPPUNIT_TEST( testAdjustTopologyQuad4Lagrange );
   CPPUNIT_TEST( testAdjustTopologyTet4Lagrange );
   CPPUNIT_TEST( testAdjustTopologyHex8Lagrange );
-#endif
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -195,7 +193,6 @@
   /// Test adjustTopology() with 3-D hexahedral element (edge/vertex on fault).
   void testAdjustTopologyHex8i(void);
 
-#if 0
   /// Test adjustTopology() with 1-D line element for Lagrange
   /// multipliers.
   void testAdjustTopologyLine2Lagrange(void);
@@ -215,7 +212,6 @@
   /// Test adjustTopology() with 3-D hexahedral element for Lagrange
   /// multipliers.
   void testAdjustTopologyHex8Lagrange(void);
-#endif
 
   // PROTECTED METHODS //////////////////////////////////////////////////
 public :