Skip to content

Commit e4ebd5b

Browse files
committed
code review
1 parent 1e1b2f9 commit e4ebd5b

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

tests/unit/test_fields_calculator.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@ def mock_app(tmp_path_factory):
4343
return app
4444

4545

46-
@pytest.fixture
47-
def fields_calculator(mock_app):
48-
return FieldsCalculator(mock_app)
49-
50-
51-
def test_write(fields_calculator, mock_app, test_tmp_dir):
46+
def test_write(mock_app, test_tmp_dir):
5247
"""Test the write method of FieldsCalculator class."""
48+
fields_calculator = FieldsCalculator(mock_app)
5349
fields_calculator.ofieldsreporter = MagicMock()
5450
fields_calculator.is_expression_defined = MagicMock(return_value=True)
5551
output_file = test_tmp_dir / "expr.fld"
@@ -64,8 +60,9 @@ def test_write(fields_calculator, mock_app, test_tmp_dir):
6460
assert result is True
6561

6662

67-
def test_evaluate(fields_calculator, mock_app):
63+
def test_evaluate(mock_app):
6864
"""Test the evaluate method of FieldsCalculator class."""
65+
fields_calculator = FieldsCalculator(mock_app)
6966
fields_calculator.is_expression_defined = MagicMock(return_value=True)
7067
fields_calculator.ofieldsreporter = MagicMock()
7168

@@ -83,8 +80,9 @@ def test_evaluate(fields_calculator, mock_app):
8380
assert value is not None
8481

8582

86-
def test_export_with_sample_points_string(fields_calculator, mock_app):
83+
def test_export_with_sample_points_string(mock_app):
8784
"""Test the export method of FieldsCalculator class with sample points as a path."""
85+
fields_calculator = FieldsCalculator(mock_app)
8886
mock_app.post.export_field_file = MagicMock(return_value="fake_output.fld")
8987

9088
with patch("ansys.aedt.core.visualization.post.fields_calculator.Path.exists", return_value=True):
@@ -97,8 +95,9 @@ def test_export_with_sample_points_string(fields_calculator, mock_app):
9795
assert output == "fake_output.fld"
9896

9997

100-
def test_export_with_sample_points_list(fields_calculator, mock_app):
98+
def test_export_with_sample_points_list(mock_app):
10199
"""Test the export method of FieldsCalculator class with sample points as a list."""
100+
fields_calculator = FieldsCalculator(mock_app)
102101
mock_app.post.export_field_file = MagicMock(return_value="fake_output.fld")
103102

104103
sample_points = [(0, 0, 0), (1, 1, 1), (2, 2, 2)]
@@ -113,17 +112,19 @@ def test_export_with_sample_points_list(fields_calculator, mock_app):
113112
assert output == "fake_output.fld"
114113

115114

116-
def test_export_with_invalid_sample_points(fields_calculator):
115+
def test_export_with_invalid_sample_points(mock_app):
117116
"""Test the export method of FieldsCalculator class with invalid sample points."""
117+
fields_calculator = FieldsCalculator(mock_app)
118118
sample_points = 1
119119

120120
assert not fields_calculator.export(
121121
quantity="Mag_E", output_file="fake_output.fld", solution="Setup1 : LastAdaptive", sample_points=sample_points
122122
)
123123

124124

125-
def test_export_grid_type(fields_calculator, mock_app):
125+
def test_export_grid_type(mock_app):
126126
"""Test the export method of FieldsCalculator class with different grid types."""
127+
fields_calculator = FieldsCalculator(mock_app)
127128
mock_app.post.export_field_file_on_grid = MagicMock(return_value="fake_output.fld")
128129

129130
grid_types = ["Cartesian", "Cylindrical", "Spherical"]
@@ -136,8 +137,9 @@ def test_export_grid_type(fields_calculator, mock_app):
136137
assert output == "fake_output.fld"
137138

138139

139-
def test_export_invalid_grid_type(fields_calculator, mock_app):
140+
def test_export_invalid_grid_type(mock_app):
140141
"""Test the export method of FieldsCalculator class with an invalid grid type."""
142+
fields_calculator = FieldsCalculator(mock_app)
141143
mock_app._FieldsCalculator__app.post.export_field_file_on_grid = MagicMock(return_value="fake_output.fld")
142144

143145
grid_type = "invalid"
@@ -147,8 +149,9 @@ def test_export_invalid_grid_type(fields_calculator, mock_app):
147149
)
148150

149151

150-
def test_export_failure(fields_calculator, mock_app):
152+
def test_export_failure(mock_app):
151153
"""Test the export method of FieldsCalculator class when export fails."""
154+
fields_calculator = FieldsCalculator(mock_app)
152155
assert not fields_calculator.export(
153156
quantity="Mag_E", output_file="fake_output.fld", solution="Setup1 : LastAdaptive"
154157
)

0 commit comments

Comments
 (0)