Skip to content

Commit 9859372

Browse files
committed
[Matlab] Refactor Feature function names
- Refactors all Feature function names to CamelCase. - Refactors all affected tests.
1 parent c5cb907 commit 9859372

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

+nix/Feature.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
nix_mx(fname, obj.nix_handle, linkType);
3939
end
4040

41-
function r = open_data(obj)
41+
function r = openData(obj)
4242
fname = strcat(obj.alias, '::openData');
4343
h = nix_mx(fname, obj.nix_handle);
4444
r = nix.Utils.createEntity(h, @nix.DataArray);
4545
end
4646

47-
function [] = set_data(obj, setData)
48-
id = nix.Utils.parseEntityId(setData, 'nix.DataArray');
47+
function [] = setData(obj, data)
48+
id = nix.Utils.parseEntityId(data, 'nix.DataArray');
4949
fname = strcat(obj.alias, '::setData');
5050
nix_mx(fname, obj.nix_handle, id);
5151
end

tests/TestFeature.m

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,28 @@
77
% LICENSE file in the root of the Project.
88

99
function funcs = TestFeature
10-
%TESTTag tests for Tag
11-
% Detailed explanation goes here
10+
% TESTFEATURE tests for Feature
1211

1312
funcs = {};
14-
funcs{end+1} = @test_open_data;
15-
funcs{end+1} = @test_get_set_link_type;
16-
funcs{end+1} = @test_set_data;
13+
funcs{end+1} = @testOpenData;
14+
funcs{end+1} = @testHandleLinkType;
15+
funcs{end+1} = @testSetData;
1716
end
1817

1918
%% Test: Open data from feature
20-
function [] = test_open_data ( varargin )
19+
function [] = testOpenData ( varargin )
2120
f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
2221
b = f.createBlock('featureTest', 'nixBlock');
2322
tmp = b.createDataArray('featureTestDataArray', 'nixDataArray', nix.DataType.Double, [1 2 3 4 5 6]);
2423
t = b.createTag('featureTest', 'nixTag', [1, 2]);
2524
tmp = t.addFeature(b.dataArrays{1}, nix.LinkType.Tagged);
2625

27-
getFeature = t.features{1};
28-
assert(~isempty(getFeature.open_data));
26+
feat = t.features{1};
27+
assert(~isempty(feat.openData));
2928
end
3029

3130
%% Test: Get and set nix.LinkType
32-
function [] = test_get_set_link_type ( varargin )
31+
function [] = testHandleLinkType ( varargin )
3332
fileName = 'testRW.h5';
3433
f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.Overwrite);
3534
b = f.createBlock('featureTest', 'nixBlock');
@@ -65,7 +64,7 @@
6564
end
6665

6766
%% Test: Set data by entity, ID and name
68-
function [] = test_set_data ( varargin )
67+
function [] = testSetData ( varargin )
6968
fileName = 'testRW.h5';
7069
daName1 = 'featTestDA1';
7170
daName2 = 'featTestDA2';
@@ -82,14 +81,14 @@
8281
t = b.createTag('featureTest', 'nixTag', [1, 2]);
8382
feat = t.addFeature(b.dataArrays{1}, nix.LinkType.Tagged);
8483

85-
assert(strcmp(feat.open_data.name, daName1));
86-
feat.set_data(da2);
87-
assert(strcmp(f.blocks{1}.tags{1}.features{1}.open_data.name, daName2));
88-
feat.set_data(da3.id);
89-
assert(strcmp(f.blocks{1}.tags{1}.features{1}.open_data.name, daName3));
90-
feat.set_data(da4.name);
84+
assert(strcmp(feat.openData.name, daName1));
85+
feat.setData(da2);
86+
assert(strcmp(f.blocks{1}.tags{1}.features{1}.openData.name, daName2));
87+
feat.setData(da3.id);
88+
assert(strcmp(f.blocks{1}.tags{1}.features{1}.openData.name, daName3));
89+
feat.setData(da4.name);
9190

9291
clear feat t da4 da3 da2 da1 b f;
9392
f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.ReadOnly);
94-
assert(strcmp(f.blocks{1}.tags{1}.features{1}.open_data.name, daName4));
93+
assert(strcmp(f.blocks{1}.tags{1}.features{1}.openData.name, daName4));
9594
end

0 commit comments

Comments
 (0)