Skip to content

Commit 9315c53

Browse files
committed
[Matlab] Refactor MetadataMixIn function names
- Refactors all MetadataMixIn function names to CamelCase. - Refactors all affected tests.
1 parent cd5719c commit 9315c53

File tree

8 files changed

+139
-136
lines changed

8 files changed

+139
-136
lines changed

+nix/MetadataMixIn.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
end
1818

1919
methods
20-
function r = open_metadata(obj)
20+
function r = openMetadata(obj)
2121
r = nix.Utils.fetchObj(obj, 'openMetadataSection', @nix.Section);
2222
end
2323

24-
function [] = set_metadata(obj, val)
24+
function [] = setMetadata(obj, val)
2525
if (isempty(val))
2626
fname = strcat(obj.alias, '::setNoneMetadata');
2727
nix_mx(fname, obj.nix_handle, val);

tests/TestBlock.m

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -530,34 +530,35 @@
530530
tmp = f.createSection(secName2, 'nixSection');
531531
b = f.createBlock('testBlock', 'nixBlock');
532532

533-
assert(isempty(b.open_metadata));
534-
assert(isempty(f.blocks{1}.open_metadata));
533+
assert(isempty(b.openMetadata));
534+
assert(isempty(f.blocks{1}.openMetadata));
535535

536-
b.set_metadata(f.sections{1});
537-
assert(strcmp(b.open_metadata.name, secName1));
538-
assert(strcmp(f.blocks{1}.open_metadata.name, secName1));
536+
b.setMetadata(f.sections{1});
537+
assert(strcmp(b.openMetadata.name, secName1));
538+
assert(strcmp(f.blocks{1}.openMetadata.name, secName1));
539539

540-
b.set_metadata(f.sections{2});
541-
assert(strcmp(b.open_metadata.name, secName2));
542-
assert(strcmp(f.blocks{1}.open_metadata.name, secName2));
543-
b.set_metadata('');
544-
assert(isempty(b.open_metadata));
545-
assert(isempty(f.blocks{1}.open_metadata));
540+
b.setMetadata(f.sections{2});
541+
assert(strcmp(b.openMetadata.name, secName2));
542+
assert(strcmp(f.blocks{1}.openMetadata.name, secName2));
543+
b.setMetadata('');
544+
assert(isempty(b.openMetadata));
545+
assert(isempty(f.blocks{1}.openMetadata));
546+
547+
b.setMetadata(f.sections{2});
546548

547-
b.set_metadata(f.sections{2});
548549
clear tmp b f;
549550
f = nix.File(fileName, nix.FileMode.ReadOnly);
550-
assert(strcmp(f.blocks{1}.open_metadata.name, secName2));
551+
assert(strcmp(f.blocks{1}.openMetadata.name, secName2));
551552
end
552553

553554
function [] = testOpenMetadata( varargin )
554555
%% Test: Open metadata
555556
f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
556557
tmp = f.createSection('testSection', 'nixSection');
557558
b = f.createBlock('testBlock', 'nixBlock');
558-
b.set_metadata(f.sections{1});
559+
b.setMetadata(f.sections{1});
559560

560-
assert(strcmp(b.open_metadata.name, 'testSection'));
561+
assert(strcmp(b.openMetadata.name, 'testSection'));
561562
end
562563

563564
%% Test: nix.Block has nix.DataArray by ID or name
@@ -803,7 +804,7 @@
803804
mainSource = b.createSource(mainName, 'nixSource');
804805
subName = 'testSubSection1';
805806
s = f.createSection(subName, 'nixSection');
806-
mainSource.set_metadata(s);
807+
mainSource.setMetadata(s);
807808
subID = s.id;
808809

809810
assert(isempty(f.blocks{1}.filterSources(nix.Filter.metadata, 'Do not exist')));
@@ -873,7 +874,7 @@
873874
mainEntity = b.createGroup(mainName, 'nixGroup');
874875
subName = 'testSubSection1';
875876
s = f.createSection(subName, 'nixSection');
876-
mainEntity.set_metadata(s);
877+
mainEntity.setMetadata(s);
877878
subID = s.id;
878879

879880
assert(isempty(f.blocks{1}.filterGroups(nix.Filter.metadata, 'Do not exist')));
@@ -938,7 +939,7 @@
938939
mainEntity = b.createTag(mainName, 'nixTag', [1 8]);
939940
subName = 'testSubSection1';
940941
s = f.createSection(subName, 'nixSection');
941-
mainEntity.set_metadata(s);
942+
mainEntity.setMetadata(s);
942943
subID = s.id;
943944

944945
assert(isempty(f.blocks{1}.filterTags(nix.Filter.metadata, 'Do not exist')));
@@ -1004,7 +1005,7 @@
10041005
mainEntity = b.createMultiTag(mainName, 'nixMultiTag', d);
10051006
subName = 'testSubSection1';
10061007
s = f.createSection(subName, 'nixSection');
1007-
mainEntity.set_metadata(s);
1008+
mainEntity.setMetadata(s);
10081009
subID = s.id;
10091010

10101011
assert(isempty(f.blocks{1}.filterMultiTags(nix.Filter.metadata, 'Do not exist')));
@@ -1075,7 +1076,7 @@
10751076
mainEntity = b.createDataArray(mainName, 'nixDataArray', nix.DataType.Bool, [2 9]);
10761077
subName = 'testSubSection1';
10771078
s = f.createSection(subName, 'nixSection');
1078-
mainEntity.set_metadata(s);
1079+
mainEntity.setMetadata(s);
10791080
subID = s.id;
10801081

10811082
assert(isempty(f.blocks{1}.filterMultiTags(nix.Filter.metadata, 'Do not exist')));
@@ -1193,7 +1194,7 @@
11931194

11941195
% test nix.Filter.metadata
11951196
sec = f.createSection('testSection', 'nixSection');
1196-
sl43.set_metadata(sec);
1197+
sl43.setMetadata(sec);
11971198
filtered = b.filterFindSources(1, nix.Filter.metadata, sec.id);
11981199
assert(isempty(filtered));
11991200
filtered = b.filterFindSources(4, nix.Filter.metadata, sec.id);

tests/TestDataArray.m

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -128,25 +128,26 @@
128128
b = f.createBlock('testBlock', 'nixBlock');
129129
da = b.createDataArray('testDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
130130

131-
assert(isempty(da.open_metadata));
132-
assert(isempty(f.blocks{1}.dataArrays{1}.open_metadata));
131+
assert(isempty(da.openMetadata));
132+
assert(isempty(f.blocks{1}.dataArrays{1}.openMetadata));
133133

134-
da.set_metadata(f.sections{1});
135-
assert(strcmp(da.open_metadata.name, secName1));
136-
assert(strcmp(f.blocks{1}.dataArrays{1}.open_metadata.name, secName1));
134+
da.setMetadata(f.sections{1});
135+
assert(strcmp(da.openMetadata.name, secName1));
136+
assert(strcmp(f.blocks{1}.dataArrays{1}.openMetadata.name, secName1));
137137

138-
da.set_metadata(f.sections{2});
139-
assert(strcmp(da.open_metadata.name, secName2));
140-
assert(strcmp(f.blocks{1}.dataArrays{1}.open_metadata.name, secName2));
138+
da.setMetadata(f.sections{2});
139+
assert(strcmp(da.openMetadata.name, secName2));
140+
assert(strcmp(f.blocks{1}.dataArrays{1}.openMetadata.name, secName2));
141141

142-
da.set_metadata('');
143-
assert(isempty(da.open_metadata));
144-
assert(isempty(f.blocks{1}.dataArrays{1}.open_metadata));
142+
da.setMetadata('');
143+
assert(isempty(da.openMetadata));
144+
assert(isempty(f.blocks{1}.dataArrays{1}.openMetadata));
145145

146-
da.set_metadata(f.sections{2});
146+
da.setMetadata(f.sections{2});
147+
147148
clear tmp da b f;
148149
f = nix.File(fileName, nix.FileMode.ReadOnly);
149-
assert(strcmp(f.blocks{1}.dataArrays{1}.open_metadata.name, secName2));
150+
assert(strcmp(f.blocks{1}.dataArrays{1}.openMetadata.name, secName2));
150151
end
151152

152153
%% Test: Open metadata
@@ -155,9 +156,9 @@
155156
tmp = f.createSection('testSection', 'nixSection');
156157
b = f.createBlock('testBlock', 'nixBlock');
157158
da = b.createDataArray('testDataArray', 'nixDataArray', nix.DataType.Double, [1 2]);
158-
da.set_metadata(f.sections{1});
159+
da.setMetadata(f.sections{1});
159160

160-
assert(strcmp(da.open_metadata.name, 'testSection'));
161+
assert(strcmp(da.openMetadata.name, 'testSection'));
161162
end
162163

163164
%% Test: List sources
@@ -645,7 +646,7 @@
645646
d.addSource(mainSource);
646647
subName = 'testSubSection1';
647648
s = f.createSection(subName, 'nixSection');
648-
mainSource.set_metadata(s);
649+
mainSource.setMetadata(s);
649650
subID = s.id;
650651

651652
assert(isempty(f.blocks{1}.dataArrays{1}.filterSources(nix.Filter.metadata, 'Do not exist')));

tests/TestGroup.m

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -778,24 +778,25 @@
778778
tmp = f.createSection(secName2, 'nixSection');
779779
b = f.createBlock('testBlock', 'nixBlock');
780780
g = b.createGroup('testGroup', 'nixGroup');
781-
assert(isempty(g.open_metadata));
782-
assert(isempty(f.blocks{1}.groups{1}.open_metadata))
781+
assert(isempty(g.openMetadata));
782+
assert(isempty(f.blocks{1}.groups{1}.openMetadata))
783783

784-
g.set_metadata(f.sections{1});
785-
assert(strcmp(g.open_metadata.name, secName1));
786-
assert(strcmp(f.blocks{1}.groups{1}.open_metadata.name, secName1));
787-
788-
g.set_metadata(f.sections{2});
789-
assert(strcmp(g.open_metadata.name, secName2));
790-
assert(strcmp(f.blocks{1}.groups{1}.open_metadata.name, secName2));
791-
g.set_metadata('');
792-
assert(isempty(g.open_metadata));
793-
assert(isempty(f.blocks{1}.groups{1}.open_metadata));
794-
795-
g.set_metadata(f.sections{2});
784+
g.setMetadata(f.sections{1});
785+
assert(strcmp(g.openMetadata.name, secName1));
786+
assert(strcmp(f.blocks{1}.groups{1}.openMetadata.name, secName1));
787+
788+
g.setMetadata(f.sections{2});
789+
assert(strcmp(g.openMetadata.name, secName2));
790+
assert(strcmp(f.blocks{1}.groups{1}.openMetadata.name, secName2));
791+
g.setMetadata('');
792+
assert(isempty(g.openMetadata));
793+
assert(isempty(f.blocks{1}.groups{1}.openMetadata));
794+
795+
g.setMetadata(f.sections{2});
796+
796797
clear tmp g b f;
797798
f = nix.File(fileName, nix.FileMode.ReadOnly);
798-
assert(strcmp(f.blocks{1}.groups{1}.open_metadata.name, secName2));
799+
assert(strcmp(f.blocks{1}.groups{1}.openMetadata.name, secName2));
799800
end
800801

801802
function [] = testOpenMetadata( varargin )
@@ -804,9 +805,9 @@
804805
tmp = f.createSection('testSection', 'nixSection');
805806
b = f.createBlock('testBlock', 'nixBlock');
806807
g = b.createGroup('testGroup', 'nixGroup');
807-
g.set_metadata(f.sections{1});
808+
g.setMetadata(f.sections{1});
808809

809-
assert(strcmp(g.open_metadata.name, 'testSection'));
810+
assert(strcmp(g.openMetadata.name, 'testSection'));
810811
end
811812

812813
function [] = testOpenDataArrayIdx( varargin )
@@ -941,7 +942,7 @@
941942
g.addSource(mainSource);
942943
subName = 'testSubSection1';
943944
s = f.createSection(subName, 'nixSection');
944-
mainSource.set_metadata(s);
945+
mainSource.setMetadata(s);
945946
subID = s.id;
946947

947948
assert(isempty(f.blocks{1}.groups{1}.filterSources(nix.Filter.metadata, 'Do not exist')));
@@ -1016,7 +1017,7 @@
10161017
g.addTag(main);
10171018
subName = 'testSubSection1';
10181019
s = f.createSection(subName, 'nixSection');
1019-
main.set_metadata(s);
1020+
main.setMetadata(s);
10201021
subID = s.id;
10211022

10221023
assert(isempty(f.blocks{1}.groups{1}.filterTags(nix.Filter.metadata, 'Do not exist')));
@@ -1091,7 +1092,7 @@
10911092
g.addMultiTag(main);
10921093
subName = 'testSubSection1';
10931094
s = f.createSection(subName, 'nixSection');
1094-
main.set_metadata(s);
1095+
main.setMetadata(s);
10951096
subID = s.id;
10961097

10971098
assert(isempty(f.blocks{1}.groups{1}.filterMultiTags(nix.Filter.metadata, 'Do not exist')));
@@ -1165,7 +1166,7 @@
11651166
g.addDataArray(main);
11661167
subName = 'testSubSection1';
11671168
s = f.createSection(subName, 'nixSection');
1168-
main.set_metadata(s);
1169+
main.setMetadata(s);
11691170
subID = s.id;
11701171

11711172
assert(isempty(f.blocks{1}.groups{1}.filterDataArrays(nix.Filter.metadata, 'Do not exist')));

tests/TestMultiTag.m

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -614,25 +614,26 @@
614614
tmp = b.createDataArray('testDataArray', 'nixDataArray', nix.DataType.Double, [1 2 3 4 5 6]);
615615
t = b.createMultiTag('metadataTest', 'nixMultiTag', b.dataArrays{1});
616616

617-
assert(isempty(t.open_metadata));
618-
assert(isempty(f.blocks{1}.multiTags{1}.open_metadata));
617+
assert(isempty(t.openMetadata));
618+
assert(isempty(f.blocks{1}.multiTags{1}.openMetadata));
619619

620-
t.set_metadata(f.sections{1});
621-
assert(strcmp(t.open_metadata.name, secName1));
622-
assert(strcmp(f.blocks{1}.multiTags{1}.open_metadata.name, secName1));
620+
t.setMetadata(f.sections{1});
621+
assert(strcmp(t.openMetadata.name, secName1));
622+
assert(strcmp(f.blocks{1}.multiTags{1}.openMetadata.name, secName1));
623623

624-
t.set_metadata(f.sections{2});
625-
assert(strcmp(t.open_metadata.name, secName2));
626-
assert(strcmp(f.blocks{1}.multiTags{1}.open_metadata.name, secName2));
624+
t.setMetadata(f.sections{2});
625+
assert(strcmp(t.openMetadata.name, secName2));
626+
assert(strcmp(f.blocks{1}.multiTags{1}.openMetadata.name, secName2));
627627

628-
t.set_metadata('');
629-
assert(isempty(t.open_metadata));
630-
assert(isempty(f.blocks{1}.multiTags{1}.open_metadata));
628+
t.setMetadata('');
629+
assert(isempty(t.openMetadata));
630+
assert(isempty(f.blocks{1}.multiTags{1}.openMetadata));
631631

632-
t.set_metadata(f.sections{2});
632+
t.setMetadata(f.sections{2});
633+
633634
clear tmp t b f;
634635
f = nix.File(fileName, nix.FileMode.ReadOnly);
635-
assert(strcmp(f.blocks{1}.multiTags{1}.open_metadata.name, secName2));
636+
assert(strcmp(f.blocks{1}.multiTags{1}.openMetadata.name, secName2));
636637
end
637638

638639
%% Test: Open metadata
@@ -642,9 +643,9 @@
642643
b = f.createBlock('testBlock', 'nixBlock');
643644
tmp = b.createDataArray('testDataArray', 'nixDataArray', nix.DataType.Double, [1 2 3 4 5 6]);
644645
t = b.createMultiTag('metadataTest', 'nixMultiTag', b.dataArrays{1});
645-
t.set_metadata(f.sections{1});
646+
t.setMetadata(f.sections{1});
646647

647-
assert(strcmp(t.open_metadata.name, 'testSection'));
648+
assert(strcmp(t.openMetadata.name, 'testSection'));
648649
end
649650

650651
%% Test: Retrieve reference data by id or name
@@ -1119,7 +1120,7 @@
11191120
t.addSource(mainSource);
11201121
subName = 'testSubSection1';
11211122
s = f.createSection(subName, 'nixSection');
1122-
mainSource.set_metadata(s);
1123+
mainSource.setMetadata(s);
11231124
subID = s.id;
11241125

11251126
assert(isempty(f.blocks{1}.multiTags{1}.filterSources(nix.Filter.metadata, 'Do not exist')));
@@ -1195,7 +1196,7 @@
11951196
t.addReference(main);
11961197
subName = 'testSubSection1';
11971198
s = f.createSection(subName, 'nixSection');
1198-
main.set_metadata(s);
1199+
main.setMetadata(s);
11991200
subID = s.id;
12001201

12011202
assert(isempty(f.blocks{1}.multiTags{1}.filterReferences(nix.Filter.metadata, 'Do not exist')));

0 commit comments

Comments
 (0)