Changeset 2975

Timestamp:

07/02/09 01:24:01 (5 months ago)

Author:

jvporter

Message:

* Fix typos in PyTAPS documentation
* Fix test suite not running properly (read: at all)
* Add tests for alternate rootSet method calls

Location:

MOAB/trunk/tools/iMesh/python

Files:

• doc/imesh.rst (modified) (1 diff)
• test/__init__.py (added)
• test/adj.py (modified) (1 diff)
• test/all.py (deleted)
• test/basic.py (modified) (6 diffs)
• test/entset.py (modified) (1 diff)

MOAB/trunk/tools/iMesh/python/doc/imesh.rst

@@ -218 +218 @@
 method calls to the root :class:`EntitySet`. Thus, ::
 
-  mesh.getEntities(iBase.type.all, iMesh.topology.all)
+  mesh.getEntities(iBase.Type.all, iMesh.Topology.all)
 
 is equivalent to::
 
-  mesh.rootSet.getEntities(iBase.type.all, iMesh.topology.all)
+  mesh.rootSet.getEntities(iBase.Type.all, iMesh.Topology.all)
 
 EntitySet

MOAB/trunk/tools/iMesh/python/test/adj.py

@@ -17 +17 @@
             self.mesh.createEnt(topo.line_segment, self.ents[::-3])[0] ]
 
-    def tearDown(self):
-        self.mesh  = None
-        self.verts = None
-        self.ents  = None
-        self.root  = None
-        self.lines = None
-
     def testSquare(self):
         quad = self.mesh.createEnt(topo.quadrilateral, self.lines)[0]
-        root = self.mesh.rootSet
 
-        self.assertEqual(root.getNumOfType(iBase.Type.vertex),  4)
-        self.assertEqual(root.getNumOfType(iBase.Type.edge),    4)
-        self.assertEqual(root.getNumOfType(iBase.Type.face),    1)
+        self.assertEqual(self.mesh.getNumOfType(iBase.Type.vertex),  4)
+        self.assertEqual(self.mesh.getNumOfType(iBase.Type.edge),    4)
+        self.assertEqual(self.mesh.getNumOfType(iBase.Type.face),    1)
 
-        self.assertEqual(root.getNumOfTopo(topo.point),         4)
-        self.assertEqual(root.getNumOfTopo(topo.line_segment),  4)
-        self.assertEqual(root.getNumOfTopo(topo.quadrilateral), 1)
+        self.assertEqual(self.mesh.getNumOfTopo(topo.point),         4)
+        self.assertEqual(self.mesh.getNumOfTopo(topo.line_segment),  4)
+        self.assertEqual(self.mesh.getNumOfTopo(topo.quadrilateral), 1)
 
         self.mesh.deleteEnt(quad)
-        self.assertEqual(root.getNumOfType(iBase.Type.face),    0)
-        self.assertEqual(root.getNumOfTopo(topo.quadrilateral), 0)
+        self.assertEqual(self.mesh.getNumOfType(iBase.Type.face),    0)
+        self.assertEqual(self.mesh.getNumOfTopo(topo.quadrilateral), 0)
 
         self.mesh.deleteEnt(self.lines)
-        self.assertEqual(root.getNumOfType(iBase.Type.edge),    0)
-        self.assertEqual(root.getNumOfTopo(topo.line_segment),  0)
+        self.assertEqual(self.mesh.getNumOfType(iBase.Type.edge),    0)
+        self.assertEqual(self.mesh.getNumOfTopo(topo.line_segment),  0)
 
         self.mesh.deleteEnt(self.ents)
-        self.assertEqual(root.getNumOfType(iBase.Type.vertex),  0)
-        self.assertEqual(root.getNumOfTopo(topo.point),         0)
+        self.assertEqual(self.mesh.getNumOfType(iBase.Type.vertex),  0)
+        self.assertEqual(self.mesh.getNumOfTopo(topo.point),         0)
 
     def testAdj(self):

MOAB/trunk/tools/iMesh/python/test/basic.py

@@ -13 +13 @@
 
         self.assert_(mesh.areEHValid(True))
+
+        self.assertEqual(mesh.getNumOfType(iBase.Type.all),     0)
         self.assertEqual(root.getNumOfType(iBase.Type.all),     0)
+        self.assertEqual(mesh.getNumOfTopo(iMesh.Topology.all), 0)
         self.assertEqual(root.getNumOfTopo(iMesh.Topology.all), 0)
+
         self.assertEqual(mesh.adjTable.shape, (4,4))
 
@@ -22 +26 @@
         root = mesh.rootSet
 
+        self.assertEqual(mesh.getNumOfType(iBase.Type.vertex),    1)
         self.assertEqual(root.getNumOfType(iBase.Type.vertex),    1)
+        self.assertEqual(mesh.getNumOfTopo(iMesh.Topology.point), 1)
         self.assertEqual(root.getNumOfTopo(iMesh.Topology.point), 1)
 
@@ -41 +47 @@
         root = mesh.rootSet
 
+        self.assertEqual(mesh.getNumOfType(iBase.Type.vertex),    4)
         self.assertEqual(root.getNumOfType(iBase.Type.vertex),    4)
+        self.assertEqual(mesh.getNumOfTopo(iMesh.Topology.point), 4)
         self.assertEqual(root.getNumOfTopo(iMesh.Topology.point), 4)
 
@@ -68 +76 @@
 
         lines = mesh.createEntArr(topo.line_segment,ents)[0]
+        self.assertEqual(mesh.getNumOfType(iBase.Type.vertex),  4)
         self.assertEqual(root.getNumOfType(iBase.Type.vertex),  4)
+        self.assertEqual(mesh.getNumOfType(iBase.Type.edge),    2)
         self.assertEqual(root.getNumOfType(iBase.Type.edge),    2)
 
+        self.assertEqual(mesh.getNumOfTopo(topo.point),         4)
         self.assertEqual(root.getNumOfTopo(topo.point),         4)
+        self.assertEqual(mesh.getNumOfTopo(topo.line_segment),  2)
         self.assertEqual(root.getNumOfTopo(topo.line_segment),  2)
 
@@ -87 +99 @@
         mesh.load(file.name)
         ents = root.getEntities(iBase.Type.all, iMesh.Topology.all)
+        self.assertEqual(ents.tolist(), mesh.getEntities(iBase.Type.all,
+            iMesh.Topology.all).tolist())
 
+        self.assertEqual(mesh.getNumOfType(iBase.Type.vertex),    1)
         self.assertEqual(root.getNumOfType(iBase.Type.vertex),    1)
+        self.assertEqual(mesh.getNumOfTopo(iMesh.Topology.point), 1)
         self.assertEqual(root.getNumOfTopo(iMesh.Topology.point), 1)
 
@@ -107 +123 @@
         root.load(file.name)
         ents = root.getEntities(iBase.Type.all, iMesh.Topology.all)
+        self.assertEqual(ents.tolist(), mesh.getEntities(iBase.Type.all,
+            iMesh.Topology.all).tolist())
 
+        self.assertEqual(mesh.getNumOfType(iBase.Type.vertex),    1)
         self.assertEqual(root.getNumOfType(iBase.Type.vertex),    1)
+        self.assertEqual(mesh.getNumOfTopo(iMesh.Topology.point), 1)
         self.assertEqual(root.getNumOfTopo(iMesh.Topology.point), 1)
 

MOAB/trunk/tools/iMesh/python/test/entset.py

@@ -14 +14 @@
         self.assertEqual(self.set.isList, True)
         self.assertEqual(self.set.getNumEntSets(1), 0)
+        self.assertEqual(self.mesh.getNumEntSets(0), 1)
         self.assertEqual(self.mesh.rootSet.getNumEntSets(0), 1)
 
-        foo = self.mesh.rootSet.getEntSets(0)[0]
-        self.assertEqual(self.set, foo)
+        my_set = self.mesh.getEntSets(0)[0]
+        self.assertEqual(my_set, self.mesh.rootSet.getEntSets(0)[0])
+        self.assertEqual(self.set, my_set)
 
         self.mesh.destroyEntSet(self.set)
+        self.assertEqual(self.mesh.getNumEntSets(0), 0)
         self.assertEqual(self.mesh.rootSet.getNumEntSets(0), 0)