removeCache: refactor Source and SourceTests

Author: mpsonntag

+nix/Source.m

@@ -21,16 +21,15 @@
 
         function s = create_source(obj, name, type)
             s = nix.Source(nix_mx('Source::createSource', obj.nix_handle, name, type));
-            obj.sourcesCache.lastUpdate = 0;
         end;
 
         function hasSource = has_source(obj, id_or_name)
             hasSource = nix_mx('Source::hasSource', obj.nix_handle, id_or_name);
         end;
 
         function delCheck = delete_source(obj, del)
-            [delCheck, obj.sourcesCache] = nix.Utils.delete_entity(obj, ...
-                del, 'nix.Source', 'Source::deleteSource', obj.sourcesCache);
+            delCheck = nix.Utils.delete_entity_(obj, del, ...
+                'nix.Source', 'Source::deleteSource');
         end;
 
         function retObj = open_source(obj, id_or_name)
@@ -39,4 +38,4 @@
         end;
 
     end;
-end
+end

tests/TestSource.m

@@ -15,13 +15,23 @@
 
 %% Test: fetch sources
 function [] = test_fetch_sources( varargin )
-    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    getBlock = test_file.createBlock('sourcetest', 'nixBlock');
-    getSource = getBlock.create_source('sourcetest', 'nixSource');
-    tmp = getSource.create_source('nestedsource1', 'nixSource');
-    tmp = getSource.create_source('nestedsource2', 'nixSource');
+    fileName = fullfile(pwd, 'tests', 'testRW.h5');
+    f = nix.File(fileName, nix.FileMode.Overwrite);
+    b = f.createBlock('sourcetest', 'nixBlock');
+    s = b.create_source('sourcetest', 'nixSource');
+
+    assert(isempty(s.sources));
+    assert(isempty(f.blocks{1}.sources{1}.sources));
+    tmp = s.create_source('nestedsource1', 'nixSource');
+    assert(size(s.sources, 1) == 1);
+    assert(size(f.blocks{1}.sources{1}.sources, 1) == 1);
+    tmp = s.create_source('nestedsource2', 'nixSource');
+    assert(size(s.sources, 1) == 2);
+    assert(size(f.blocks{1}.sources{1}.sources, 1) == 2);
 
-    assert(size(getSource.sources, 1) == 2);
+    clear tmp s b f;
+    f = nix.File(fileName, nix.FileMode.ReadOnly);
+    assert(size(f.blocks{1}.sources{1}.sources, 1) == 2);
 end
 
 %% Test: Open source by ID or name