@@ -326,8 +326,6 @@ def test_09c_import_into_report(self):
326
326
new_report = self .aedtapp .create_scattering ("import_test" )
327
327
csv_file_path = self .aedtapp .post .export_report_to_csv (self .local_scratch .path , "import_test" )
328
328
rdat_file_path = self .aedtapp .post .export_report_to_file (self .local_scratch .path , "import_test" , ".rdat" )
329
- # self.aedtapp.post.export_report_to_jpg(self.local_scratch.path, "import_test")
330
- # jpg_file_path = os.path.join(self.local_scratch.path, "import_test.jpg")
331
329
plot_name = new_report .plot_name
332
330
333
331
trace_names = []
@@ -340,25 +338,22 @@ def test_09c_import_into_report(self):
340
338
my_data = self .aedtapp .post .get_report_data (expression = trace_names , families_dict = families )
341
339
my_data .export_data_to_csv (os .path .join (self .local_scratch .path , "output.csv" ))
342
340
csv_solution_data_file_path = os .path .join (self .local_scratch .path , "output.csv" )
343
- assert not new_report .import_into_report (csv_solution_data_file_path , plot_name )
341
+ assert not new_report .import_traces (csv_solution_data_file_path , plot_name )
344
342
345
343
# test import with correct inputs from csv
346
- assert new_report .import_into_report (csv_file_path , plot_name )
344
+ assert new_report .import_traces (csv_file_path , plot_name )
347
345
# test import with correct inputs from rdat
348
- assert new_report .import_into_report (rdat_file_path , plot_name )
346
+ assert new_report .import_traces (rdat_file_path , plot_name )
349
347
# test import with not existing plot_name
350
348
if not is_ironpython :
351
349
with pytest .raises (ValueError ):
352
- new_report .import_into_report (csv_file_path , "plot_name" )
350
+ new_report .import_traces (csv_file_path , "plot_name" )
353
351
# test import with random file path
354
352
with pytest .raises (FileExistsError ):
355
- new_report .import_into_report (str (uuid .uuid4 ()), plot_name )
353
+ new_report .import_traces (str (uuid .uuid4 ()), plot_name )
356
354
# test import without plot_name
357
355
with pytest .raises (ValueError ):
358
- new_report .import_into_report (csv_file_path , None )
359
- # test import with wrong file extension
360
- # with pytest.raises(ValueError):
361
- # new_report.import_into_report(jpg_file_path, plot_name)
356
+ new_report .import_traces (csv_file_path , None )
362
357
363
358
def test_09d_delete_traces_from_report (self ):
364
359
new_report = self .aedtapp .create_scattering ("delete_traces_test" )
0 commit comments