Skip to content

Commit c646923

Browse files
committed
string field
1 parent be0c93f commit c646923

File tree

3 files changed

+64
-6
lines changed

3 files changed

+64
-6
lines changed

tests/test_propertyfield.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,5 +215,21 @@ def test_mutable_data_property_field(server_clayer, simple_bar):
215215
assert np.allclose(changed_data[0], data_copy[0] + 2)
216216

217217

218+
@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
219+
reason='Copying data is '
220+
'supported starting server version 5.0')
221+
def test_print_property_field(server_type):
222+
pfield = dpf.core.PropertyField(server=server_type)
223+
assert "Property Field" in str(pfield)
224+
list_ids = [1, 2, 4, 6, 7]
225+
scop = core.Scoping(ids=list_ids, location=locations.nodal, server=server_type)
226+
pfield.scoping = scop
227+
pfield.data = [1, 2, 4, 6, 7]
228+
print(pfield)
229+
assert "Property Field" in str(pfield)
230+
assert "5 Nodal entities" in str(pfield)
231+
assert "1 components and 5 elementary data" in str(pfield)
232+
233+
218234
if __name__ == "__main__":
219235
test_local_property_field()

tests/test_python_plugins.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,19 @@ def test_property_field(server_type_remote_process):
113113
)
114114

115115

116-
def test_string_field(load_all_types_plugin):
117-
f = dpf.StringField()
116+
def test_string_field(server_type_remote_process):
117+
load_all_types_plugin_with_serv(server_type_remote_process)
118+
f = dpf.StringField(server=server_type_remote_process)
118119
f.data = ["hello", "good"]
119-
op = dpf.Operator("custom_forward_string_field")
120+
op = dpf.Operator("custom_forward_string_field", server=server_type_remote_process)
120121
op.connect(0, f)
121122
assert op.get_output(0, dpf.types.string_field).data == ["hello", "good"]
122123

123124

124-
def test_scoping(load_all_types_plugin):
125-
f = dpf.Scoping(location="Elemental")
126-
op = dpf.Operator("custom_forward_scoping")
125+
def test_scoping(server_type_remote_process):
126+
load_all_types_plugin_with_serv(server_type_remote_process)
127+
f = dpf.Scoping(location="Elemental", server=server_type_remote_process)
128+
op = dpf.Operator("custom_forward_scoping", server=server_type_remote_process)
127129
op.connect(0, f)
128130
assert op.get_output(0, dpf.types.scoping).location == "Elemental"
129131

tests/test_stringfield.py

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,43 @@ def test_stream_large_data_string_field(server_type):
8585
data.append("bla")
8686
field.data = data
8787
assert field.data == data
88+
89+
90+
@conftest.raises_for_servers_version_under("5.0")
91+
def test_print_string_vector(server_type):
92+
field = dpf.core.StringField(nentities=20, server=server_type)
93+
data = []
94+
for i in range(0, 20):
95+
data.append("bla")
96+
field.data = data
97+
d = field.data
98+
print(d)
99+
assert "['bla', 'bla', 'bla'" in d.__str__()
100+
data = []
101+
for i in range(0, 2):
102+
data.append("bla")
103+
field.data = data
104+
d = field.data
105+
print(d)
106+
assert "['bla', 'bla']" in d.__str__()
107+
data = []
108+
field.data = data
109+
d = field.data
110+
print(d)
111+
d.__str__()
112+
113+
114+
@conftest.raises_for_servers_version_under("5.0")
115+
def test_print_string_field(server_type):
116+
field = dpf.core.StringField(nentities=20, server=server_type)
117+
assert "String Field" in str(field)
118+
data = []
119+
for i in range(0, 20):
120+
data.append("bla")
121+
field.data = data
122+
field.scoping.ids = range(1, 21)
123+
field.scoping.location = dpf.core.locations.nodal
124+
assert "20 Nodal entities" in str(field)
125+
assert "20 elementary data" in str(field)
126+
127+

0 commit comments

Comments
 (0)