Skip to content

Commit 3611921

Browse files
committed
addGroup: add Group tests
1 parent 0b694b9 commit 3611921

File tree

3 files changed

+410
-30
lines changed

3 files changed

+410
-30
lines changed

+nix/Group.m

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% namespace reference for nix-mx functions
66
alias = 'Group'
77
end
8-
8+
99
methods
1010
function obj = Group(h)
1111
@@ -15,31 +15,27 @@
1515
nix.Dynamic.add_dyn_relation(obj, 'tags', @nix.Tag);
1616
nix.Dynamic.add_dyn_relation(obj, 'multiTags', @nix.MultiTag);
1717
end;
18-
18+
1919
% -----------------
2020
% DataArray methods
2121
% -----------------
22-
23-
%-- TODO seems to work -- remove me later
22+
2423
function hasDataArray = has_data_array(obj, id_or_name)
2524
hasDataArray = nix_mx('Group::hasDataArray', ...
2625
obj.nix_handle, id_or_name);
2726
end;
2827

29-
%-- TODO seems to work -- remove me later
3028
function retObj = get_data_array(obj, id_or_name)
3129
retObj = nix.Utils.open_entity(obj, ...
3230
'Group::getDataArray', id_or_name, @nix.DataArray);
3331
end;
3432

35-
%-- TODO seems to work -- remove me later
3633
function [] = add_data_array(obj, add_this)
3734
obj.dataArraysCache = nix.Utils.add_entity(obj, ...
3835
add_this, 'nix.DataArray', 'Group::addDataArray', ...
3936
obj.dataArraysCache);
4037
end;
4138

42-
%-- TODO seems to work -- remove me later
4339
function delCheck = remove_data_array(obj, del)
4440
[delCheck, obj.dataArraysCache] = nix.Utils.delete_entity(obj, ...
4541
del, 'nix.DataArray', 'Group::removeDataArray', ...
@@ -49,26 +45,22 @@
4945
% -----------------
5046
% Tags methods
5147
% -----------------
52-
53-
%-- TODO seems to work -- remove me later
48+
49+
function [] = add_tag(obj, add_this)
50+
obj.tagsCache = nix.Utils.add_entity(obj, ...
51+
add_this, 'nix.Tag', 'Group::addTag', ...
52+
obj.tagsCache);
53+
end;
54+
5455
function hasTag = has_tag(obj, id_or_name)
5556
hasTag = nix_mx('Group::hasTag', obj.nix_handle, id_or_name);
5657
end;
5758

58-
%-- TODO seems to work -- remove me later
5959
function retObj = get_tag(obj, id_or_name)
6060
retObj = nix.Utils.open_entity(obj, ...
6161
'Group::getTag', id_or_name, @nix.Tag);
6262
end;
6363

64-
%-- TODO seems to work -- remove me later
65-
function [] = add_tag(obj, add_this)
66-
obj.tagsCache = nix.Utils.add_entity(obj, ...
67-
add_this, 'nix.Tag', 'Group::addTag', ...
68-
obj.tagsCache);
69-
end;
70-
71-
%-- TODO seems to work -- remove me later
7264
function delCheck = remove_tag(obj, del)
7365
[delCheck, obj.tagsCache] = nix.Utils.delete_entity(obj, ...
7466
del, 'nix.Tag', 'Group::removeTag', ...
@@ -79,26 +71,22 @@
7971
% MultiTag methods
8072
% -----------------
8173

82-
%-- TODO seems to work -- remove me later
74+
function [] = add_multi_tag(obj, add_this)
75+
obj.multiTagsCache = nix.Utils.add_entity(obj, ...
76+
add_this, 'nix.MultiTag', 'Group::addMultiTag', ...
77+
obj.multiTagsCache);
78+
end;
79+
8380
function hasMTag = has_multi_tag(obj, id_or_name)
8481
hasMTag = nix_mx('Group::hasMultiTag', ...
8582
obj.nix_handle, id_or_name);
8683
end;
8784

88-
%-- TODO seems to work -- remove me later
8985
function retObj = get_multi_tag(obj, id_or_name)
9086
retObj = nix.Utils.open_entity(obj, ...
9187
'Group::getMultiTag', id_or_name, @nix.MultiTag);
9288
end;
9389

94-
%-- TODO seems to work -- remove me later
95-
function [] = add_multi_tag(obj, add_this)
96-
obj.multiTagsCache = nix.Utils.add_entity(obj, ...
97-
add_this, 'nix.MultiTag', 'Group::addMultiTag', ...
98-
obj.multiTagsCache);
99-
end;
100-
101-
%-- TODO seems to work -- remove me later
10290
function delCheck = remove_multi_tag(obj, del)
10391
[delCheck, obj.multiTagsCache] = nix.Utils.delete_entity(obj, ...
10492
del, 'nix.MultiTag', 'Group::removeMultiTag', ...

tests/RunTests.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@
3333
t9.tests = TestProperty();
3434
t10.name = 'DIMENSIONS';
3535
t10.tests = TestDimensions();
36+
t11.name = 'GROUP';
37+
t11.tests = TestGroup();
3638

3739
% concatenate all test handles
38-
all_tests = {t1, t2, t3, t4, t5, t6, t7, t8, t9, t10};
40+
all_tests = {t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11};
3941

4042
for i = 1:length(all_tests)
4143
fprintf([10 'Execute ' all_tests{i}.name ' tests:\n\n']);
@@ -46,4 +48,3 @@
4648
end;
4749

4850
disp([10 'Tests: ' num2str(stats.okCount) ' succeeded, ' num2str(stats.errorCount) ' failed']);
49-

0 commit comments

Comments
 (0)