Changeset 6428 for branches/numpy/anuga/load_mesh/test_loadASCII.py

Timestamp:

Feb 27, 2009, 11:54:09 AM (15 years ago)

Author:

rwilson

Message:

numpy changes

File:

• branches/numpy/anuga/load_mesh/test_loadASCII.py (modified) (10 diffs)

branches/numpy/anuga/load_mesh/test_loadASCII.py

@@ -209 +209 @@
         os.remove(fileName)
         dict = self.dict
-        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_file')
+        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_tsh_file')
 
     def test_read_write_tsh_fileII(self):
@@ -227 +227 @@
         os.remove(fileName)
         dict = self.blank_dict
-        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_fileIII')
+        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_tsh_fileIII')
 
     def test_read_write_tsh_file4(self):
@@ -236 +236 @@
         os.remove(fileName)
         dict = self.seg_dict
-        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_file4')
+        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_tsh_file4')
 
     def test_read_write_tsh_file5(self):
@@ -244 +244 @@
         loaded_dict = import_mesh_file(fileName)
         dict = self.triangle_tags_dict
-        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_file5')
+        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_tsh_file5')
         os.remove(fileName)
 
@@ -253 +253 @@
         loaded_dict = import_mesh_file(fileName)
         dict = self.tri_dict
-        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_file6')
+        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_tsh_file6')
         os.remove(fileName)
 
@@ -312 +312 @@
   ############### .MSH ##########
 
-    def test_read_write_msh_file(self):
+    def test_read_write_msh_file1(self):
         dict = self.dict.copy()
         fileName = tempfile.mktemp('.msh')
@@ -319 +319 @@
         os.remove(fileName)
         dict = self.dict
-        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_file')
+        self.check_mesh_dicts(loaded_dict, dict, 'test_read_write_msh_file1')
 
     def test_read_write_msh_fileII(self):
@@ -399 +399 @@
                             num.array(loaded_dict['segments']))
 
+        self.failUnlessEqual(dict['triangle_tags'], loaded_dict['triangle_tags'])
+
         for ob, ldob in map(None, dict['triangle_tags'],
                             loaded_dict['triangle_tags']):
+            msg = ('ob=\n%s\nshould be same as ldob=\n%s' % (str(ob), str(ldob)))
             self.failUnless(ob == ldob,
-                            fail_string + ' failed!! Test triangle_tags')
+                            fail_string + ' failed\n' + msg)
 
         # A bit hacky
-        self.failUnless((loaded_dict['vertex_attributes'] ==
-                         dict['vertex_attributes']) or \
-                        (loaded_dict['vertex_attributes'] == None and \
+        self.failUnless(num.alltrue(loaded_dict['vertex_attributes'] ==
+                                    dict['vertex_attributes']) or
+                        (loaded_dict['vertex_attributes'] == None and
                          dict['vertex_attributes'] == []),
                         fail_string + ' failed!! Test vertex_attributes')
@@ -416 +419 @@
         for seg, ldseg in map(None, dict['segment_tags'],
                               loaded_dict['segment_tags']):
-            self.failUnless(seg == ldseg,
-                            fail_string + ' failed!! Test 8')
+            msg = ('seg=\n"%s"\nshould be same as ldseg=\n"%s"'
+                   % (str(seg), str(ldseg)))
+            self.failUnless(seg == ldseg, fail_string + ' failed\n' + msg)
 
         dict_array = num.array(dict['vertex_attribute_titles'])
@@ -429 +433 @@
 
         try:
+            msg = ("loaded_dict['geo_reference']=\n%s\n"
+                   "should be same as dict['geo_reference']=%s"
+                  % (str(loaded_dict['geo_reference']),
+                     str(dict['geo_reference'])))
             self.failUnless(loaded_dict['geo_reference'] ==
                             dict['geo_reference'],
-                            fail_string + ' failed!! Test geo_reference')
+                            fail_string + ' failed\n' + msg)
         except KeyError:        #??# 2 lines below??
-#           self.failUnless(not dict.has_key('geo_reference' and
-#                               loaded_dict['geo_reference'] == None),
-#                           fail_string + ' failed!! Test geo_reference')
+            msg = ("'dict' has no key 'geo_reference' "
+                   "but loaded_dict['geo_reference'] isn't None")
             self.failUnless(not dict.has_key('geo_reference') and
                                 loaded_dict['geo_reference'] == None,
-                            fail_string + ' failed!! Test geo_reference')
+                            fail_string + ' failed\n' + msg)
 
 ########################## BAD .MSH ##########################