|
4 | 4 |
|
5 | 5 | from pathlib import Path |
6 | 6 |
|
7 | | -import numpy as np |
8 | 7 | import pytest |
9 | 8 |
|
10 | 9 | import pybamm |
@@ -34,18 +33,13 @@ def test_processed_name(self, parameter_data): |
34 | 33 | name, processed = parameter_data |
35 | 34 | assert processed[0] == name |
36 | 35 |
|
37 | | - def test_processed_structure(self, parameter_data): |
38 | | - name, processed = parameter_data |
39 | | - assert isinstance(processed[1], tuple) |
40 | | - assert isinstance(processed[1][0][0], np.ndarray) |
41 | | - assert isinstance(processed[1][1], np.ndarray) |
| 36 | + def test_processed_structure(self, parameter_data, assert_is_ndarray): |
| 37 | + _, processed = parameter_data |
42 | 38 |
|
43 | | - if len(processed[1][0]) > 1: |
44 | | - assert isinstance(processed[1][0][1], np.ndarray) |
| 39 | + assert isinstance(processed[1], tuple) |
45 | 40 |
|
46 | | - elif len(processed[1]) == 3: |
47 | | - assert isinstance(processed[1][0][1], np.ndarray) |
48 | | - assert isinstance(processed[1][0][2], np.ndarray) |
| 41 | + # Recursively check that all numpy arrays exist where expected |
| 42 | + assert_is_ndarray(processed[1]) |
49 | 43 |
|
50 | 44 | def test_error(self): |
51 | 45 | with pytest.raises(FileNotFoundError, match="Could not find file"): |
|
0 commit comments