completify: add missing File functions and tests

Author: mpsonntag

+nix/File.m

@@ -24,17 +24,21 @@
         % ----------------
         % Block methods
         % ----------------
-        
-        function retObj = openBlock(obj, id_or_name)
-            retObj = nix.Utils.open_entity(obj, ...
-                'File::openBlock', id_or_name, @nix.Block);
-        end
-        
+
         function newBlock = createBlock(obj, name, type)
             newBlock = nix.Block(nix_mx('File::createBlock', obj.nix_handle, name, type));
             obj.blocksCache.lastUpdate = 0;
         end;
 
+        function hasBlock = hasBlock(obj, id_or_name)
+            hasBlock = nix_mx('File::hasBlock', obj.nix_handle, id_or_name);
+        end;
+
+        function retObj = openBlock(obj, id_or_name)
+            retObj = nix.Utils.open_entity(obj, ...
+                'File::openBlock', id_or_name, @nix.Block);
+        end
+
         function delCheck = deleteBlock(obj, del)
             [delCheck, obj.blocksCache] = nix.Utils.delete_entity(obj, ...
                 del, 'nix.Block', 'File::deleteBlock', obj.blocksCache);
@@ -43,17 +47,21 @@
         % ----------------
         % Section methods
         % ----------------
-        
-        function retObj = openSection(obj, id_or_name)
-            retObj = nix.Utils.open_entity(obj, ...
-                'File::openSection', id_or_name, @nix.Section);
-        end
 
         function newSec = createSection(obj, name, type)
             newSec = nix.Section(nix_mx('File::createSection', obj.nix_handle, name, type));
             obj.sectionsCache.lastUpdate = 0;
         end;
 
+        function hasSec = hasSection(obj, id_or_name)
+            hasSec = nix_mx('File::hasSection', obj.nix_handle, id_or_name);
+        end;
+
+        function retObj = openSection(obj, id_or_name)
+            retObj = nix.Utils.open_entity(obj, ...
+                'File::openSection', id_or_name, @nix.Section);
+        end
+
         function delCheck = deleteSection(obj, del)
             delCheck = nix.Utils.delete_entity(obj, del, 'nix.Section', 'File::deleteSection');
             obj.sectionsCache.lastUpdate = 0;

nix_mx.cc

@@ -97,6 +97,8 @@ void mexFunction(int            nlhs,
             .add("open", nixfile::open)
             .reg("blocks", GETTER(std::vector<nix::Block>, nix::File, blocks))
             .reg("sections", GETTER(std::vector<nix::Section>, nix::File, sections))
+            .reg("hasBlock", GETBYSTR(bool, nix::File, hasBlock))
+            .reg("hasSection", GETBYSTR(bool, nix::File, hasSection))
             .reg("deleteBlock", REMOVER(nix::Block, nix::File, deleteBlock))
             .reg("deleteSection", REMOVER(nix::Section, nix::File, deleteSection))
             .reg("openBlock", GETBYSTR(nix::Block, nix::File, getBlock))

tests/TestFile.m

@@ -14,6 +14,8 @@
     funcs{end+1} = @test_open_block;
     funcs{end+1} = @test_delete_block;
     funcs{end+1} = @test_delete_section;
+    funcs{end+1} = @test_has_block;
+    funcs{end+1} = @test_has_section;
 
 end
 
@@ -129,3 +131,35 @@
     getBlock = test_file.openBlock('I dont exist');
     assert(isempty(getBlock));
 end
+
+%% Test: nix.File has nix.Block by ID or name
+function [] = test_has_block( varargin )
+    fileName = 'testRW.h5';
+    blockName = 'hasBlockTest';
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.Overwrite);
+    b = f.createBlock(blockName, 'nixBlock');
+    bID = b.id;
+
+    assert(~f.hasBlock('I do not exist'));
+    assert(f.hasBlock(blockName));
+
+    clear b f;
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.ReadOnly);
+    assert(f.hasBlock(bID));
+end
+
+%% Test: nix.File has nix.Section by ID or name
+function [] = test_has_section( varargin )
+    fileName = 'testRW.h5';
+    secName = 'hasSectionTest';
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.Overwrite);
+    s = f.createSection(secName, 'nixSection');
+    sID = s.id;
+
+    assert(~f.hasSection('I do not exist'));
+    assert(f.hasSection(secName));
+
+    clear s f;
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.ReadOnly);
+    assert(f.hasSection(sID));
+end