[cig-commits] r13940 - short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology

[brad at geodynamics.org]

Author: brad
Date: 2009-01-23 21:12:06 -0800 (Fri, 23 Jan 2009)
New Revision: 13940

Modified:
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/Makefile.am
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestMeshOps.cc
Log:
Fixed C++ testing of MeshOps.

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/Makefile.am	2009-01-24 01:14:16 UTC (rev 13939)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/Makefile.am	2009-01-24 05:12:06 UTC (rev 13940)
@@ -23,11 +23,12 @@
 testtopology_SOURCES = \
 	TestField.cc \
 	TestFieldUniform.cc \
-	TestFieldsManager.cc \
 	TestMesh.cc \
 	TestMeshOps.cc \
 	test_topology.cc
 
+#	TestFieldsManager.cc
+
 noinst_HEADERS = \
 	TestField.hh \
 	TestFieldUniform.hh \

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestMeshOps.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestMeshOps.cc	2009-01-24 01:14:16 UTC (rev 13939)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestMeshOps.cc	2009-01-24 05:12:06 UTC (rev 13940)
@@ -16,8 +16,8 @@
 
 #include "pylith/topology/MeshOps.hh" // USES MeshOps
 
+#include "pylith/topology/Mesh.hh" // USES Mesh
 #include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
-#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
 
 // ----------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION( pylith::topology::TestMeshOps );
@@ -27,12 +27,12 @@
 void
 pylith::topology::TestMeshOps::testCheckMaterialIds(void)
 { // testCheckMaterialIds
-  ALE::Obj<Mesh> mesh;
+  const int dim = 2;
+  Mesh mesh(PETSC_COMM_WORLD, dim);
 
   meshio::MeshIOAscii iohandler;
   iohandler.filename("data/tri3.mesh");
   iohandler.read(&mesh);
-  CPPUNIT_ASSERT(!mesh.isNull());
 
   const int numMaterials = 2;
   int materialIds[numMaterials];