From cc7a55c842a4853a8ddf1e30d0c8907b6bb48df0 Mon Sep 17 00:00:00 2001 From: Braden Date: Mon, 25 Mar 2024 15:15:43 -0600 Subject: [PATCH] Modified unit test functionalities. --- opencsp/app/sofast/test/test_DisplayShape.py | 32 +++++++++++++++---- .../sofast/test/test_SpatialOrientation.py | 6 ++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/opencsp/app/sofast/test/test_DisplayShape.py b/opencsp/app/sofast/test/test_DisplayShape.py index a965b2e10..071f9ca92 100644 --- a/opencsp/app/sofast/test/test_DisplayShape.py +++ b/opencsp/app/sofast/test/test_DisplayShape.py @@ -99,7 +99,7 @@ def test_distorted3D(self): def test_save_load_hdf_dist_3d(self): # Instantiate display object - name = 'Test DisplayShape' + name = 'Test DisplayShape 3D' disp = DisplayShape(self.grid_data_3D, name) file = join(self.save_dir, 'test_display_shape_dist_3d.h5') @@ -107,11 +107,18 @@ def test_save_load_hdf_dist_3d(self): disp.save_to_hdf(file) # Load - DisplayShape.load_from_hdf(file) + disp_load = DisplayShape.load_from_hdf(file) + + # Compare + self.assertEqual(disp.grid_data['screen_model'], disp_load.grid_data['screen_model']) + self.assertEqual(disp.name, disp_load.name) + np.testing.assert_equal( + disp.grid_data['xy_screen_fraction'].data, disp_load.grid_data['xy_screen_fraction'].data) + np.testing.assert_equal(disp.grid_data['xyz_screen_coords'].data, disp_load.grid_data['xyz_screen_coords'].data) def test_save_load_hdf_dist_2d(self): # Instantiate display object - name = 'Test DisplayShape' + name = 'Test DisplayShape 2D' disp = DisplayShape(self.grid_data_2D, name) file = join(self.save_dir, 'test_display_shape_dist_2d.h5') @@ -119,11 +126,18 @@ def test_save_load_hdf_dist_2d(self): disp.save_to_hdf(file) # Load - DisplayShape.load_from_hdf(file) + disp_load = DisplayShape.load_from_hdf(file) + + # Compare + self.assertEqual(disp.grid_data['screen_model'], disp_load.grid_data['screen_model']) + self.assertEqual(disp.name, disp_load.name) + np.testing.assert_equal( + disp.grid_data['xy_screen_fraction'].data, disp_load.grid_data['xy_screen_fraction'].data) + np.testing.assert_equal(disp.grid_data['xy_screen_coords'].data, disp_load.grid_data['xy_screen_coords'].data) def test_save_load_hdf_rectangular(self): # Instantiate display object - name = 'Test DisplayShape' + name = 'Test DisplayShape Rectangular' disp = DisplayShape(self.grid_data_rect2D, name) file = join(self.save_dir, 'test_display_shape_rect.h5') @@ -131,7 +145,13 @@ def test_save_load_hdf_rectangular(self): disp.save_to_hdf(file) # Load - DisplayShape.load_from_hdf(file) + disp_load = DisplayShape.load_from_hdf(file) + + # Compare + self.assertEqual(disp.grid_data['screen_model'], disp_load.grid_data['screen_model']) + self.assertEqual(disp.name, disp_load.name) + self.assertEqual(disp.grid_data['screen_x'], disp_load.grid_data['screen_x']) + self.assertEqual(disp.grid_data['screen_y'], disp_load.grid_data['screen_y']) if __name__ == '__main__': diff --git a/opencsp/app/sofast/test/test_SpatialOrientation.py b/opencsp/app/sofast/test/test_SpatialOrientation.py index 97d1196ba..2e705512a 100644 --- a/opencsp/app/sofast/test/test_SpatialOrientation.py +++ b/opencsp/app/sofast/test/test_SpatialOrientation.py @@ -78,7 +78,7 @@ def test_io_oriented_optic(self): # Load ori = SpatialOrientation.load_from_hdf(file) # Check optic is oriented - np.testing.assert_equal(ori.optic_oriented, True) + self.assertEqual(ori.optic_oriented, True) def test_io_unoriented_optic(self): file = join(self.save_dir, 'test_spatial_orientation_unoriented_optic.h5') @@ -90,8 +90,8 @@ def test_io_unoriented_optic(self): # Load ori_2 = SpatialOrientation.load_from_hdf(file) # Check optic not oriented - np.testing.assert_equal(ori_1.optic_oriented, False) - np.testing.assert_equal(ori_2.optic_oriented, False) + self.assertEqual(ori_1.optic_oriented, False) + self.assertEqual(ori_2.optic_oriented, False) if __name__ == '__main__':