Skip to content

Commit b51b351

Browse files
mpsonntagmpsonntag
committed
[matlab] Refactor tests for Section.properties
1 parent 7844a50 commit b51b351

File tree

2 files changed

+75
-91
lines changed

2 files changed

+75
-91
lines changed

‎tests/TestProperty.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@
9191
assert(updateDouble.values{1}.value == 2.2);
9292

9393
%-- test remove values from property
94-
delValues = s.open_property(s.allProperties{3}.id);
94+
delValues = s.properties{3};
9595
assert(size(delValues.values, 1) == 4);
9696
delValues.values = {};
9797
assert(size(delValues.values, 1) == 0);
9898
clear delValues;
9999

100100
%-- test add new values to empty value property
101-
newValues = s.open_property(s.allProperties{3}.id);
101+
newValues = s.properties{3};
102102
newValues.values = [1,2,3,4,5];
103103
assert(newValues.values{5}.value == 5);
104104
newValues.values = {};
@@ -110,7 +110,7 @@
110110
val2 = newValues.values{2};
111111
updateNewDouble = s.create_property('doubleProperty2', nix.DataType.Double);
112112
updateNewDouble.values = {val1, val2};
113-
assert(s.open_property(s.allProperties{end}.id).values{2}.value == val2.value);
113+
assert(s.properties{end}.values{2}.value == val2.value);
114114
end
115115

116116
%% Test: Value count
@@ -127,7 +127,7 @@
127127

128128
clear p s f;
129129
f = nix.File(testFile, nix.FileMode.ReadOnly);
130-
pid = f.sections{1}.allProperties{1}.id;
130+
pid = f.sections{1}.properties{1}.id;
131131
assert(f.sections{1}.open_property(pid).value_count() == 1);
132132
end
133133

@@ -144,7 +144,7 @@
144144

145145
clear p s f;
146146
f = nix.File(testFile, nix.FileMode.ReadOnly);
147-
assert(isempty(f.sections{1}.allProperties{1}.values));
147+
assert(isempty(f.sections{1}.properties{1}.values));
148148
end
149149

150150
%% Test: Compare properties

‎tests/TestSection.m‎

Lines changed: 70 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,8 @@
184184
f = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
185185
trial = f.sections{2}.sections{2}.sections{1};
186186

187-
assert(~isempty(trial.allProperties));
188187
assert(~isempty(trial.properties));
189-
190-
p1 = trial.allProperties{1};
191-
assert(strcmp(p1.name, 'ExperimentalCondition'));
192-
193-
p1 = trial.properties{1};
194-
assert(strcmp(p1.name, 'ExperimentalCondition'));
195-
196-
disp(f.sections{3}.allProperties);
197-
disp(f.sections{3}.properties);
198-
199-
assert(isempty(f.sections{3}.allProperties));
188+
assert(strcmp(trial.properties{1}.name, 'ExperimentalCondition'));
200189
assert(isempty(f.sections{3}.properties));
201190
end
202191

@@ -205,94 +194,89 @@
205194
f = nix.File(fullfile(pwd,'tests','testRW.h5'), nix.FileMode.Overwrite);
206195
s = f.create_section('mainSection', 'nixSection');
207196

208-
tmp = s.create_property('newProperty1', nix.DataType.Double);
209-
tmp = s.create_property('newProperty2', nix.DataType.Bool);
210-
tmp = s.create_property('newProperty3', nix.DataType.String);
211-
assert(size(s.allProperties, 1) == 3);
212-
assert(strcmp(s.allProperties{1}.name, 'newProperty1'));
197+
s.create_property('newProperty1', nix.DataType.Double);
198+
s.create_property('newProperty2', nix.DataType.Bool);
199+
s.create_property('newProperty3', nix.DataType.String);
200+
assert(size(s.properties, 1) == 3);
201+
assert(strcmp(s.properties{1}.name, 'newProperty1'));
213202
end
214203

215204
%% Test: Create property with value
216205
function [] = test_create_property_with_value( varargin )
217206
f = nix.File(fullfile(pwd,'tests','testRW.h5'), nix.FileMode.Overwrite);
218207
s = f.create_section('mainSection', 'nixSection');
219208

220-
tmp = s.create_property_with_value('doubleProperty1', [5, 6, 7, 8]);
221-
assert(strcmp(s.allProperties{end}.name, 'doubleProperty1'));
222-
assert(s.allProperties{end}.values{1} == 5);
223-
assert(size(s.allProperties{end}.values, 2) == 4);
224-
assert(s.open_property(s.allProperties{end}.id).values{1}.value == 5);
225-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 4);
226-
assert(strcmpi(tmp.datatype,'double'));
227-
228-
tmp = s.create_property_with_value('doubleProperty2', {5, 6, 7, 8});
229-
assert(strcmp(s.allProperties{end}.name, 'doubleProperty2'));
230-
assert(s.open_property(s.allProperties{end}.id).values{1}.value == 5);
231-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 4);
232-
assert(strcmpi(tmp.datatype,'double'));
233-
234-
tmp = s.create_property_with_value('stringProperty1', ['a', 'string']);
235-
assert(strcmp(s.allProperties{end}.name, 'stringProperty1'));
236-
assert(strcmp(s.open_property(s.allProperties{end}.id).values{1}.value, 'a'));
237-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 7);
238-
assert(strcmpi(tmp.datatype, 'char'));
239-
240-
tmp = s.create_property_with_value('stringProperty2', {'this', 'has', 'strings'});
241-
assert(strcmp(s.allProperties{end}.name, 'stringProperty2'));
242-
assert(strcmp(s.allProperties{end}.values{1}, 'this'));
243-
assert(size(s.allProperties{end}.values, 2) == 3);
244-
assert(strcmp(s.open_property(s.allProperties{end}.id).values{1}.value, 'this'));
245-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
246-
assert(strcmpi(tmp.datatype, 'char'));
247-
248-
tmp = s.create_property_with_value('booleanProperty1', [true, false, true]);
249-
assert(strcmp(s.allProperties{end}.name, 'booleanProperty1'));
250-
assert(s.allProperties{end}.values{1});
251-
assert(~s.allProperties{end}.values{2});
252-
assert(size(s.allProperties{end}.values, 2) == 3);
253-
assert(s.open_property(s.allProperties{end}.id).values{1}.value);
254-
assert(~s.open_property(s.allProperties{end}.id).values{2}.value);
255-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
256-
assert(strcmpi(tmp.datatype, 'logical'));
257-
258-
tmp = s.create_property_with_value('booleanProperty2', {true, false, true});
259-
assert(strcmp(s.allProperties{end}.name, 'booleanProperty2'));
260-
assert(s.open_property(s.allProperties{end}.id).values{1}.value);
261-
assert(~s.open_property(s.allProperties{end}.id).values{2}.value);
262-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
263-
assert(strcmpi(tmp.datatype, 'logical'));
264-
265-
val1 = s.open_property(s.allProperties{1}.id).values{1};
266-
val2 = s.open_property(s.allProperties{1}.id).values{2};
267-
tmp = s.create_property_with_value('doubleByStrunct1', [val1, val2]);
268-
assert(strcmp(s.allProperties{end}.name, 'doubleByStrunct1'));
269-
assert(s.open_property(s.allProperties{end}.id).values{1}.value == 5);
270-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 2);
271-
assert(strcmpi(tmp.datatype,'double'));
272-
273-
val3 = s.open_property(s.allProperties{1}.id).values{3};
274-
tmp = s.create_property_with_value('doubleByStrunct2', {val1, val2, val3});
275-
assert(strcmp(s.allProperties{end}.name, 'doubleByStrunct2'));
276-
assert(s.open_property(s.allProperties{end}.id).values{3}.value == 7);
277-
assert(size(s.open_property(s.allProperties{end}.id).values, 1) == 3);
278-
assert(strcmpi(tmp.datatype,'double'));
209+
% test create by array
210+
s.create_property_with_value('doubleProperty1', [5, 6, 7, 8]);
211+
assert(strcmp(s.properties{end}.name, 'doubleProperty1'));
212+
assert(s.properties{end}.values{1}.value == 5);
213+
assert(size(s.properties{end}.values, 1) == 4);
214+
assert(strcmpi(s.properties{end}.datatype, 'double'));
215+
216+
% test create by cell array
217+
s.create_property_with_value('doubleProperty2', {5, 6, 7, 8});
218+
assert(strcmp(s.properties{end}.name, 'doubleProperty2'));
219+
assert(s.properties{end}.values{2}.value == 6);
220+
assert(size(s.properties{end}.values, 1) == 4);
221+
assert(strcmpi(s.properties{end}.datatype, 'double'));
222+
223+
s.create_property_with_value('stringProperty1', ['a', 'string']);
224+
assert(strcmp(s.properties{end}.name, 'stringProperty1'));
225+
assert(strcmp(s.properties{end}.values{1}.value, 'a'));
226+
assert(size(s.properties{end}.values, 1) == 7);
227+
assert(strcmpi(s.properties{end}.datatype, 'char'));
228+
229+
s.create_property_with_value('stringProperty2', {'this', 'has', 'strings'});
230+
assert(strcmp(s.properties{end}.name, 'stringProperty2'));
231+
assert(strcmp(s.properties{end}.values{1}.value, 'this'));
232+
assert(size(s.properties{end}.values, 1) == 3);
233+
assert(strcmpi(s.properties{end}.datatype, 'char'));
234+
235+
s.create_property_with_value('booleanProperty1', [true, false, true]);
236+
assert(strcmp(s.properties{end}.name, 'booleanProperty1'));
237+
assert(s.properties{end}.values{1}.value);
238+
assert(~s.properties{end}.values{2}.value);
239+
assert(size(s.properties{end}.values, 1) == 3);
240+
assert(strcmpi(s.properties{end}.datatype, 'logical'));
241+
242+
s.create_property_with_value('booleanProperty2', {true, false, true});
243+
assert(strcmp(s.properties{end}.name, 'booleanProperty2'));
244+
assert(s.properties{end}.values{1}.value);
245+
assert(~s.properties{end}.values{2}.value);
246+
assert(size(s.properties{end}.values, 1) == 3);
247+
assert(strcmpi(s.properties{end}.datatype, 'logical'));
248+
249+
val1 = s.properties{1}.values{1};
250+
val2 = s.properties{1}.values{2};
251+
s.create_property_with_value('doubleByStrunct1', [val1, val2]);
252+
assert(strcmp(s.properties{end}.name, 'doubleByStrunct1'));
253+
assert(s.properties{end}.values{1}.value == 5);
254+
assert(size(s.properties{end}.values, 1) == 2);
255+
assert(strcmpi(s.properties{end}.datatype, 'double'));
256+
257+
val3 = s.properties{1}.values{3};
258+
s.create_property_with_value('doubleByStrunct2', {val1, val2, val3});
259+
assert(strcmp(s.properties{end}.name, 'doubleByStrunct2'));
260+
assert(s.properties{end}.values{3}.value == 7);
261+
assert(size(s.properties{end}.values, 1) == 3);
262+
assert(strcmpi(s.properties{end}.datatype, 'double'));
279263
end
280264

281265
%% Test: Delete property by entity, propertyStruct, ID and name
282266
function [] = test_delete_property( varargin )
283267
f = nix.File(fullfile(pwd,'tests','testRW.h5'), nix.FileMode.Overwrite);
284268
s = f.create_section('mainSection', 'nixSection');
285-
tmp = s.create_property('newProperty1', nix.DataType.Double);
286-
tmp = s.create_property('newProperty2', nix.DataType.Bool);
287-
tmp = s.create_property('newProperty3', nix.DataType.String);
288-
tmp = s.create_property('newProperty4', nix.DataType.Double);
269+
s.create_property('newProperty1', nix.DataType.Double);
270+
s.create_property('newProperty2', nix.DataType.Bool);
271+
s.create_property('newProperty3', nix.DataType.String);
272+
s.create_property('newProperty4', nix.DataType.Double);
289273

290274
assert(s.delete_property('newProperty4'));
291-
assert(s.delete_property(s.allProperties{3}.id));
292-
delProp = s.open_property(s.allProperties{2}.id);
275+
assert(s.delete_property(s.properties{3}.id));
276+
delProp = s.properties{2};
293277
assert(s.delete_property(delProp));
294-
assert(s.delete_property(s.allProperties{1}));
295-
278+
assert(s.delete_property(s.properties{1}));
279+
296280
assert(~s.delete_property('I do not exist'));
297281
end
298282

@@ -301,8 +285,8 @@
301285
f = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
302286
trial = f.sections{2}.sections{2}.sections{1};
303287

304-
assert(~isempty(trial.open_property(trial.allProperties{1}.id)));
305-
assert(~isempty(trial.open_property(trial.allProperties{1}.name)));
288+
assert(~isempty(trial.open_property(trial.properties{1}.id)));
289+
assert(~isempty(trial.open_property(trial.properties{1}.name)));
306290
end
307291

308292
function [] = test_open_property_idx( varargin )

0 commit comments

Comments
 (0)