removeCache: refactor MetadataMixin

Author: mpsonntag

+nix/MetadataMixIn.m

@@ -8,32 +8,22 @@
         alias
     end
 
-    properties(Hidden)
-        metadataCache
-    end;
-    
     methods
-        function obj = MetadataMixIn()
-            obj.metadataCache = nix.CacheStruct();
-        end
-        
         function metadata = open_metadata(obj)
-            [obj.metadataCache, metadata] = nix.Utils.fetchObj(...
-                obj.updatedAt, ...
+            metadata = nix.Utils.fetchObj_(...
                 strcat(obj.alias, '::openMetadataSection'), ...
-                obj.nix_handle, obj.metadataCache, @nix.Section);
+                obj.nix_handle, @nix.Section);
         end;
 
         function set_metadata(obj, val)
             if (isempty(val))
-                nix_mx(strcat(obj.alias, '::set_none_metadata'), obj.nix_handle, val);
+                nix_mx(strcat(obj.alias, '::set_none_metadata'), ...
+                    obj.nix_handle, val);
             else
-                obj.metadataCache = nix.Utils.add_entity(obj, val, 'nix.Section', ...
-                    strcat(obj.alias, '::set_metadata'), obj.metadataCache);
+                nix.Utils.add_entity_(obj, val, 'nix.Section', ...
+                    strcat(obj.alias, '::set_metadata'));
             end;
-            obj.metadataCache.lastUpdate = 0;
         end;
     end;
 
 end
-

tests/TestBlock.m

@@ -385,18 +385,32 @@
 
 %% Test: Set metadata
 function [] = test_set_metadata ( varargin )
-    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    tmp = f.createSection('testSection1', 'nixSection');
-    tmp = f.createSection('testSection2', 'nixSection');
+    fileName = fullfile(pwd, 'tests', 'testRW.h5');
+    secName1 = 'testSection1';
+    secName2 = 'testSection2';
+    f = nix.File(fileName, nix.FileMode.Overwrite);
+    tmp = f.createSection(secName1, 'nixSection');
+    tmp = f.createSection(secName2, 'nixSection');
     b = f.createBlock('testBlock', 'nixBlock');
 
     assert(isempty(b.open_metadata));
+    assert(isempty(f.blocks{1}.open_metadata));
+
     b.set_metadata(f.sections{1});
-    assert(strcmp(b.open_metadata.name, 'testSection1'));
+    assert(strcmp(b.open_metadata.name, secName1));
+    assert(strcmp(f.blocks{1}.open_metadata.name, secName1));
+
     b.set_metadata(f.sections{2});
-    assert(strcmp(b.open_metadata.name, 'testSection2'));
+    assert(strcmp(b.open_metadata.name, secName2));
+    assert(strcmp(f.blocks{1}.open_metadata.name, secName2));
     b.set_metadata('');
     assert(isempty(b.open_metadata));
+    assert(isempty(f.blocks{1}.open_metadata));
+
+    b.set_metadata(f.sections{2});
+    clear tmp b f;
+    f = nix.File(fileName, nix.FileMode.ReadOnly);
+	assert(strcmp(f.blocks{1}.open_metadata.name, secName2));
 end
 
 function [] = test_open_metadata( varargin )

tests/TestDataArray.m

@@ -60,19 +60,35 @@
 
 %% Test: Set metadata
 function [] = test_set_metadata ( varargin )
-    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    tmp = f.createSection('testSection1', 'nixSection');
-    tmp = f.createSection('testSection2', 'nixSection');
+    fileName = fullfile(pwd, 'tests', 'testRW.h5');
+    secName1 = 'testSection1';
+    secName2 = 'testSection2';
+    f = nix.File(fileName, nix.FileMode.Overwrite);
+    tmp = f.createSection(secName1, 'nixSection');
+    tmp = f.createSection(secName2, 'nixSection');
+
     b = f.createBlock('testBlock', 'nixBlock');
     da = b.create_data_array('testDataArray', 'nixDataArray', 'double', [1 2]);
 
     assert(isempty(da.open_metadata));
+    assert(isempty(f.blocks{1}.dataArrays{1}.open_metadata));
+
     da.set_metadata(f.sections{1});
-    assert(strcmp(da.open_metadata.name, 'testSection1'));
+    assert(strcmp(da.open_metadata.name, secName1));
+    assert(strcmp(f.blocks{1}.dataArrays{1}.open_metadata.name, secName1));
+
     da.set_metadata(f.sections{2});
-    assert(strcmp(da.open_metadata.name, 'testSection2'));
+    assert(strcmp(da.open_metadata.name, secName2));
+    assert(strcmp(f.blocks{1}.dataArrays{1}.open_metadata.name, secName2));
+
     da.set_metadata('');
     assert(isempty(da.open_metadata));
+    assert(isempty(f.blocks{1}.dataArrays{1}.open_metadata));
+    
+    da.set_metadata(f.sections{2});
+    clear tmp da b f;
+    f = nix.File(fileName, nix.FileMode.ReadOnly);
+    assert(strcmp(f.blocks{1}.dataArrays{1}.open_metadata.name, secName2));    
 end
 
 %% Test: Open metadata

tests/TestMultiTag.m

@@ -365,20 +365,36 @@
 
 %% Test: Set metadata
 function [] = test_set_metadata ( varargin )
-    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    tmp = f.createSection('testSection1', 'nixSection');
-    tmp = f.createSection('testSection2', 'nixSection');
+    fileName = fullfile(pwd, 'tests', 'testRW.h5');
+    secName1 = 'testSection1';
+    secName2 = 'testSection2';
+    f = nix.File(fileName, nix.FileMode.Overwrite);
+    tmp = f.createSection(secName1, 'nixSection');
+    tmp = f.createSection(secName2, 'nixSection');
+
     b = f.createBlock('testBlock', 'nixBlock');
     tmp = b.create_data_array('testDataArray', 'nixDataArray', 'double', [1 2 3 4 5 6]);
     t = b.create_multi_tag('metadataTest', 'nixMultiTag', b.dataArrays{1});
 
     assert(isempty(t.open_metadata));
+    assert(isempty(f.blocks{1}.multiTags{1}.open_metadata));
+
     t.set_metadata(f.sections{1});
-    assert(strcmp(t.open_metadata.name, 'testSection1'));
+    assert(strcmp(t.open_metadata.name, secName1));
+    assert(strcmp(f.blocks{1}.multiTags{1}.open_metadata.name, secName1));
+
     t.set_metadata(f.sections{2});
-    assert(strcmp(t.open_metadata.name, 'testSection2'));
+    assert(strcmp(t.open_metadata.name, secName2));
+    assert(strcmp(f.blocks{1}.multiTags{1}.open_metadata.name, secName2));
+    
     t.set_metadata('');
     assert(isempty(t.open_metadata));
+    assert(isempty(f.blocks{1}.multiTags{1}.open_metadata));
+    
+    t.set_metadata(f.sections{2});
+    clear tmp t b f;
+    f = nix.File(fileName, nix.FileMode.ReadOnly);
+    assert(strcmp(f.blocks{1}.multiTags{1}.open_metadata.name, secName2));
 end
 
 %% Test: Open metadata

tests/TestSource.m

@@ -57,19 +57,34 @@
 
 %% Test: Set metadata
 function [] = test_set_metadata ( varargin )
-    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    fileName = fullfile(pwd, 'tests', 'testRW.h5');
+    secName1 = 'testSection1';
+    secName2 = 'testSection2';
+    f = nix.File(fileName, nix.FileMode.Overwrite);
     tmp = f.createSection('testSection1', 'nixSection');
     tmp = f.createSection('testSection2', 'nixSection');
     b = f.createBlock('testBlock', 'nixBlock');
     s = b.create_source('testSource', 'nixSource');
 
     assert(isempty(s.open_metadata));
+    assert(isempty(f.blocks{1}.sources{1}.open_metadata));
+
     s.set_metadata(f.sections{1});
-    assert(strcmp(s.open_metadata.name, 'testSection1'));
+    assert(strcmp(s.open_metadata.name, secName1));
+    assert(strcmp(f.blocks{1}.sources{1}.open_metadata.name, secName1));
+
     s.set_metadata(f.sections{2});
-    assert(strcmp(s.open_metadata.name, 'testSection2'));
+    assert(strcmp(s.open_metadata.name, secName2));
+    assert(strcmp(f.blocks{1}.sources{1}.open_metadata.name, secName2));
+
     s.set_metadata('');
     assert(isempty(s.open_metadata));
+    assert(isempty(f.blocks{1}.sources{1}.open_metadata));
+
+	s.set_metadata(f.sections{2});
+    clear tmp b f;
+    f = nix.File(fileName, nix.FileMode.ReadOnly);
+    assert(strcmp(f.blocks{1}.sources{1}.open_metadata.name, secName2));
 end
 
 %% Test: Open metadata

tests/TestTag.m

@@ -273,19 +273,35 @@
 
 %% Test: Set metadata
 function [] = test_set_metadata ( varargin )
-    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    tmp = f.createSection('testSection1', 'nixSection');
-    tmp = f.createSection('testSection2', 'nixSection');
+    fileName = fullfile(pwd, 'tests', 'testRW.h5');
+    secName1 = 'testSection1';
+    secName2 = 'testSection2';
+    f = nix.File(fileName, nix.FileMode.Overwrite);
+    tmp = f.createSection(secName1, 'nixSection');
+    tmp = f.createSection(secName2, 'nixSection');
+
     b = f.createBlock('testBlock', 'nixBlock');
     t = b.create_tag('testTag', 'nixTag', [1, 2, 3, 4]);
 
     assert(isempty(t.open_metadata));
+    assert(isempty(f.blocks{1}.tags{1}.open_metadata));
+    
     t.set_metadata(f.sections{1});
-    assert(strcmp(t.open_metadata.name, 'testSection1'));
+    assert(strcmp(t.open_metadata.name, secName1));
+    assert(strcmp(f.blocks{1}.tags{1}.open_metadata.name, secName1));
+    
     t.set_metadata(f.sections{2});
-    assert(strcmp(t.open_metadata.name, 'testSection2'));
+    assert(strcmp(t.open_metadata.name, secName2));
+    assert(strcmp(f.blocks{1}.tags{1}.open_metadata.name, secName2));
+    
     t.set_metadata('');
     assert(isempty(t.open_metadata));
+    assert(isempty(f.blocks{1}.tags{1}.open_metadata));
+    
+    t.set_metadata(f.sections{2});
+    clear tmp b f;
+    f = nix.File(fileName, nix.FileMode.ReadOnly);
+    assert(strcmp(f.blocks{1}.tags{1}.open_metadata.name, secName2));
 end
 
 %% Test: Open metadata