[c++/m] Add Section referringMultiTags(Block)

Author: mpsonntag

+nix/Section.m

@@ -164,9 +164,8 @@
             ret = obj.referring_util(@nix.Tag, 'Tags', varargin{:});
         end
 
-        function ret = referring_multi_tags(obj)
-            ret = nix.Utils.fetchObjList('Section::referringMultiTags', ...
-                obj.nix_handle, @nix.MultiTag);
+        function ret = referring_multi_tags(obj, varargin)
+            ret = obj.referring_util(@nix.MultiTag, 'MultiTags', varargin{:});
         end
 
         function ret = referring_sources(obj, varargin)

nix_mx.cc

@@ -358,6 +358,7 @@ void mexFunction(int            nlhs,
         methods->add("Section::createPropertyWithValue", nixsection::createPropertyWithValue);
         methods->add("Section::referringBlockSources", nixsection::referringBlockSources);
         methods->add("Section::referringBlockTags", nixsection::referringBlockTags);
+        methods->add("Section::referringBlockMultiTags", nixsection::referringBlockMultiTags);
 
         classdef<nix::Feature>("Feature", methods)
             .desc(&nixfeature::describe)

src/nixsection.cc

@@ -93,4 +93,10 @@ namespace nixsection {
         output.set(0, currSec.referringTags(currBlock));
     }
 
+    void referringBlockMultiTags(const extractor &input, infusor &output) {
+        nix::Section currSec = input.entity<nix::Section>(1);
+        nix::Block currBlock = input.entity<nix::Block>(2);
+        output.set(0, currSec.referringMultiTags(currBlock));
+    }
+
 } // namespace nixsection

src/nixsection.h

@@ -25,6 +25,8 @@ namespace nixsection {
 
     void referringBlockTags(const extractor &input, infusor &output);
 
+    void referringBlockMultiTags(const extractor &input, infusor &output);
+
 } // namespace nixsection
 
 #endif

tests/TestSection.m

@@ -31,6 +31,7 @@
     funcs{end+1} = @test_referring_tags;
     funcs{end+1} = @test_referring_block_tags;
     funcs{end+1} = @test_referring_multi_tags;
+    funcs{end+1} = @test_referring_block_multi_tags;
     funcs{end+1} = @test_referring_sources;
     funcs{end+1} = @test_referring_block_sources;
     funcs{end+1} = @test_referring_blocks;
@@ -407,7 +408,6 @@
     assert(strcmp(testTag{1}.name, testName));
 end
 
-
 %% Test: referring multi tags
 function [] = test_referring_multi_tags( varargin )
     f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
@@ -432,6 +432,43 @@
     assert(isempty(s.referring_multi_tags));
 end
 
+%% Test: referring block multi tags
+function [] = test_referring_block_multi_tags( varargin )
+    err = 'Provide either empty arguments or a single Block entity';
+    testName = 'testMultiTag1';
+
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b1 = f.create_block('testBlock1', 'nixBlock');
+    d = b1.create_data_array('testDataArray1', 'nixDataArray', nix.DataType.Double, [1 2]);
+    t1 = b1.create_multi_tag(testName, 'nixMultiTag', d);
+    b2 = f.create_block('testBlock2', 'nixBlock');
+    d = b2.create_data_array('testDataArray2', 'nixDataArray', nix.DataType.Double, [1 2]);
+    t2 = b2.create_multi_tag('testMultiTag2', 'nixMultiTag', d);
+    s = f.create_section('testSection', 'nixSection');
+
+    t1.set_metadata(s);
+    t2.set_metadata(s);
+
+    % test multiple arguments fail
+    try
+        s.referring_multi_tags('a', 'b');
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % test non block entity argument fail
+    try
+        s.referring_multi_tags(s);
+    catch ME
+        assert(strcmp(ME.message, err));
+    end
+
+    % test return only tags from block 1
+    testTag = s.referring_multi_tags(b1);
+    assert(size(testTag, 2) == 1);
+    assert(strcmp(testTag{1}.name, testName));
+end
+
 %% Test: referring sources
 function [] = test_referring_sources( varargin )
     f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);