[cig-commits] r17283 - in short/3D/PyLith/trunk: pylith/meshio unittests/pytests/meshio

[brad at geodynamics.org]

Author: brad
Date: 2010-10-15 12:33:53 -0700 (Fri, 15 Oct 2010)
New Revision: 17283

Added:
   short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterHDF5.py
Modified:
   short/3D/PyLith/trunk/pylith/meshio/DataWriterHDF5SubMesh.py
   short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterVTK.py
   short/3D/PyLith/trunk/unittests/pytests/meshio/testmeshio.py
Log:
Added Python unit tests for DataWriterHDF5.

Modified: short/3D/PyLith/trunk/pylith/meshio/DataWriterHDF5SubMesh.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/DataWriterHDF5SubMesh.py	2010-10-15 18:59:54 UTC (rev 17282)
+++ short/3D/PyLith/trunk/pylith/meshio/DataWriterHDF5SubMesh.py	2010-10-15 19:33:53 UTC (rev 17283)
@@ -16,17 +16,17 @@
 # ----------------------------------------------------------------------
 #
 
-## @file pyre/meshio/DataWriterVTKSubMesh.py
+## @file pyre/meshio/DataWriterHDF5SubMesh.py
 ##
-## @brief Python object for writing finite-element data to VTK file.
+## @brief Python object for writing finite-element data to HDF5 file.
 
-from DataWriterVTK import DataWriterVTK
-from meshio import SubMeshDataWriterVTK as ModuleDataWriterVTK
+from DataWriterHDF5 import DataWriterHDF5
+from meshio import SubMeshDataWriterHDF5 as ModuleDataWriterHDF5
 
-# DataWriterVTKSubMesh class
-class DataWriterVTKSubMesh(DataWriterVTK, ModuleDataWriterVTK):
+# DataWriterHDF5SubMesh class
+class DataWriterHDF5SubMesh(DataWriterHDF5, ModuleDataWriterHDF5):
   """
-  Python object for writing finite-element data to VTK file.
+  Python object for writing finite-element data to HDF5 file.
 
   Inventory
 
@@ -35,12 +35,12 @@
 
   # PUBLIC METHODS /////////////////////////////////////////////////////
 
-  def __init__(self, name="datawritervtksubmesh"):
+  def __init__(self, name="datawriterhdf5submesh"):
     """
     Constructor.
     """
-    DataWriterVTK.__init__(self, name)
-    ModuleDataWriterVTK.__init__(self)
+    DataWriterHDF5.__init__(self, name)
+    ModuleDataWriterHDF5.__init__(self)
     return
 
 
@@ -48,12 +48,9 @@
     """
     Initialize writer.
     """
-    DataWriterVTK.initialize(self, normalizer)
+    DataWriterHDF5.initialize(self, normalizer)
 
-    ModuleDataWriterVTK.filename(self, self.filename)
-    ModuleDataWriterVTK.timeFormat(self, self.timeFormat)
-    ModuleDataWriterVTK.timeConstant(self, self.timeConstantN)
-    ModuleDataWriterVTK.precision(self, self.precision)
+    ModuleDataWriterHDF5.filename(self, self.filename)
     return
   
 
@@ -63,7 +60,7 @@
   """
   Factory associated with DataWriter.
   """
-  return DataWriterVTKSubMesh()
+  return DataWriterHDF5SubMesh()
 
 
 # End of file 

Added: short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterHDF5.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterHDF5.py	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterHDF5.py	2010-10-15 19:33:53 UTC (rev 17283)
@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+#
+# ======================================================================
+#
+# Brad T. Aagaard, U.S. Geological Survey
+# Charles A. Williams, GNS Science
+# Matthew G. Knepley, University of Chicago
+#
+# This code was developed as part of the Computational Infrastructure
+# for Geodynamics (http://geodynamics.org).
+#
+# Copyright (c) 2010 University of California, Davis
+#
+# See COPYING for license information.
+#
+# ======================================================================
+#
+
+## @file unittests/pytests/meshio/TestDataWriterHDF5.py
+
+## @brief Unit testing of Python DataWriterHDF5 object.
+
+import unittest
+
+from pylith.meshio.DataWriterHDF5Mesh import DataWriterHDF5Mesh
+from pylith.meshio.DataWriterHDF5SubMesh import DataWriterHDF5SubMesh
+from pylith.meshio.DataWriterHDF5SubSubMesh import DataWriterHDF5SubSubMesh
+
+# ----------------------------------------------------------------------
+class TestDataWriterHDF5Mesh(unittest.TestCase):
+  """
+  Unit testing of Python DataWriterHDF5Mesh object.
+  """
+
+  def test_constructor(self):
+    """
+    Test constructor.
+    """
+    filter = DataWriterHDF5Mesh()
+    filter._configure()
+    return
+
+
+  def test_initialize(self):
+    """
+    Test constructor.
+    """
+    filter = DataWriterHDF5Mesh()
+    filter._configure()
+
+    from spatialdata.units.Nondimensional import Nondimensional
+    normalizer = Nondimensional()
+    filter.initialize(normalizer)
+    return
+
+
+  def test_factory(self):
+    """
+    Test factory method.
+    """
+    from pylith.meshio.DataWriterHDF5Mesh import data_writer
+    filter = data_writer()
+    return
+
+
+# ----------------------------------------------------------------------
+class TestDataWriterHDF5SubMesh(unittest.TestCase):
+  """
+  Unit testing of Python DataWriterHDF5 object.
+  """
+
+  def test_constructor(self):
+    """
+    Test constructor.
+    """
+    filter = DataWriterHDF5SubMesh()
+    filter._configure()
+    return
+
+
+  def test_initialize(self):
+    """
+    Test constructor.
+    """
+    filter = DataWriterHDF5SubMesh()
+    filter._configure()
+
+    from spatialdata.units.Nondimensional import Nondimensional
+    normalizer = Nondimensional()
+    filter.initialize(normalizer)
+    return
+
+
+  def test_factory(self):
+    """
+    Test factory method.
+    """
+    from pylith.meshio.DataWriterHDF5SubMesh import data_writer
+    filter = data_writer()
+    return
+
+
+# ----------------------------------------------------------------------
+class TestDataWriterHDF5SubSubMesh(unittest.TestCase):
+  """
+  Unit testing of Python DataWriterHDF5 object.
+  """
+
+  def test_constructor(self):
+    """
+    Test constructor.
+    """
+    filter = DataWriterHDF5SubSubMesh()
+    filter._configure()
+    return
+
+
+  def test_initialize(self):
+    """
+    Test constructor.
+    """
+    filter = DataWriterHDF5SubSubMesh()
+    filter._configure()
+
+    from spatialdata.units.Nondimensional import Nondimensional
+    normalizer = Nondimensional()
+    filter.initialize(normalizer)
+    return
+
+
+  def test_factory(self):
+    """
+    Test factory method.
+    """
+    from pylith.meshio.DataWriterHDF5SubSubMesh import data_writer
+    filter = data_writer()
+    return
+
+
+# End of file 

Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterVTK.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterVTK.py	2010-10-15 18:59:54 UTC (rev 17282)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestDataWriterVTK.py	2010-10-15 19:33:53 UTC (rev 17283)
@@ -58,8 +58,8 @@
     """
     Test factory method.
     """
-    from pylith.meshio.DataWriterVTKMesh import output_data_writer
-    filter = output_data_writer()
+    from pylith.meshio.DataWriterVTKMesh import data_writer
+    filter = data_writer()
     return
 
 
@@ -95,8 +95,8 @@
     """
     Test factory method.
     """
-    from pylith.meshio.DataWriterVTKSubMesh import output_data_writer
-    filter = output_data_writer()
+    from pylith.meshio.DataWriterVTKSubMesh import data_writer
+    filter = data_writer()
     return
 
 
@@ -132,8 +132,8 @@
     """
     Test factory method.
     """
-    from pylith.meshio.DataWriterVTKSubSubMesh import output_data_writer
-    filter = output_data_writer()
+    from pylith.meshio.DataWriterVTKSubSubMesh import data_writer
+    filter = data_writer()
     return
 
 

Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/testmeshio.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/testmeshio.py	2010-10-15 18:59:54 UTC (rev 17282)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/testmeshio.py	2010-10-15 19:33:53 UTC (rev 17283)
@@ -89,6 +89,15 @@
     from TestDataWriterVTK import TestDataWriterVTKSubSubMesh
     suite.addTest(unittest.makeSuite(TestDataWriterVTKSubSubMesh))
 
+    from TestDataWriterHDF5 import TestDataWriterHDF5Mesh
+    suite.addTest(unittest.makeSuite(TestDataWriterHDF5Mesh))
+
+    from TestDataWriterHDF5 import TestDataWriterHDF5SubMesh
+    suite.addTest(unittest.makeSuite(TestDataWriterHDF5SubMesh))
+
+    from TestDataWriterHDF5 import TestDataWriterHDF5SubSubMesh
+    suite.addTest(unittest.makeSuite(TestDataWriterHDF5SubSubMesh))
+
     from TestOutputManagerMesh import TestOutputManagerMesh
     suite.addTest(unittest.makeSuite(TestOutputManagerMesh))