Commit b7e0e994 authored by Theo Steininger's avatar Theo Steininger
Browse files

Small modifications to common.py and test/test_field.py

parent 383d0a19
Pipeline #9611 failed with stage
in 28 minutes and 43 seconds
......@@ -7,5 +7,7 @@ def custom_name_func(testcase_func, param_num, param):
parameterized.to_safe_name("_".join(str(x) for x in param.args)),
)
expand = lambda z: parameterized.expand(z,
testcase_func_name=custom_name_func)
def expand(*args, **kwargs):
return parameterized.expand(*args, testcase_func_name=custom_name_func,
**kwargs)
......@@ -6,7 +6,7 @@ import numpy as np
from numpy.testing import assert_,\
assert_equal
import itertools
from itertools import product
from nifty import Field,\
RGSpace,\
......@@ -24,21 +24,23 @@ SPACE_COMBINATIONS = [SPACES[0], SPACES[1], SPACES]
class Test_Interface(unittest.TestCase):
@expand([['dtype', np.dtype],
['distribution_strategy', str],
['domain', tuple],
['field_type', tuple],
['domain_axes', tuple],
['field_type_axes', tuple],
['val', distributed_data_object],
['shape', tuple],
['dim', np.int],
['dof', np.int],
['total_volume', np.float]])
def test_return_types(self, attribute, desired_type):
x = RGSpace(shape=(4,))
@expand(product(SPACE_COMBINATIONS,
[['dtype', np.dtype],
['distribution_strategy', str],
['domain', tuple],
['field_type', tuple],
['domain_axes', tuple],
['field_type_axes', tuple],
['val', distributed_data_object],
['shape', tuple],
['dim', np.int],
['dof', np.int],
['total_volume', np.float]]))
def test_return_types(self, domain, attribute_desired_type):
attribute = attribute_desired_type[0]
desired_type = attribute_desired_type[1]
ft = FieldArray(shape=(2,), dtype=np.complex)
f = Field(domain=x, field_type=ft)
f = Field(domain=domain, field_type=ft)
assert_(isinstance(getattr(f, attribute), desired_type))
#class Test_Initialization(unittest.TestCase):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment