tests for dimensions added

Author: asobolev

+nix/DataArray.m

@@ -55,19 +55,19 @@
 
         function dim = append_set_dimension(obj)
             func_name = strcat(obj.alias, '::append_set_dimension');
-            dim = nix_mx(func_name, obj.nix_handle);
+            dim = nix.SetDimension(nix_mx(func_name, obj.nix_handle));
             obj.dimsCache.lastUpdate = 0;
         end
 
         function dim = append_sampled_dimension(obj, interval)
             func_name = strcat(obj.alias, '::append_sampled_dimension');
-            dim = nix_mx(func_name, obj.nix_handle, interval);
+            dim = nix.SampledDimension(nix_mx(func_name, obj.nix_handle, interval));
             obj.dimsCache.lastUpdate = 0;
         end
 
         function dim = append_range_dimension(obj, ticks)
             func_name = strcat(obj.alias, '::append_range_dimension');
-            dim = nix_mx(func_name, obj.nix_handle, ticks);
+            dim = nix.RangeDimension(nix_mx(func_name, obj.nix_handle, ticks));
             obj.dimsCache.lastUpdate = 0;
         end
 

+nix/Dynamic.m

@@ -24,7 +24,7 @@ function set_method(obj, val)
                 end
 
                 if (isempty(val))
-                    nix_mx(strcat(obj.alias, '::set_none_', prop), obj.nix_handle, val);
+                    nix_mx(strcat(obj.alias, '::set_none_', prop), obj.nix_handle, 0);
                 else
                     nix_mx(strcat(obj.alias, '::set_', prop), obj.nix_handle, val);
                 end

nix_mx.cc

@@ -272,7 +272,7 @@ void mexFunction(int            nlhs,
             .reg("set_none_label", SETTER(const boost::none_t, nix::SampledDimension, label))
             .reg("set_unit", SETTER(const std::string&, nix::SampledDimension, unit))
             .reg("set_none_unit", SETTER(const boost::none_t, nix::SampledDimension, unit))
-            .reg("set_sampling", SETTER(double, nix::SampledDimension, samplingInterval))
+            .reg("set_samplingInterval", SETTER(double, nix::SampledDimension, samplingInterval))
             .reg("set_offset", SETTER(double, nix::SampledDimension, offset))
             .reg("set_none_offset", SETTER(const boost::none_t, nix::SampledDimension, offset))
             .reg("index_of", &nix::SampledDimension::indexOf)

tests/RunTests.m

@@ -31,9 +31,11 @@
 t8.tests = TestFeature();
 t9.name = 'PROPERTY';
 t9.tests = TestProperty();
+t10.name = 'DIMENSIONS';
+t10.tests = TestDimensions();
 
 % concatenate all test handles
-all_tests = {t1, t2, t3, t4, t5, t6, t7, t8, t9};
+all_tests = {t1, t2, t3, t4, t5, t6, t7, t8, t9, t10};
 
 for i = 1:length(all_tests)
     fprintf([10 'Execute ' all_tests{i}.name ' tests:\n\n']);

tests/TestDimensions.m

@@ -0,0 +1,90 @@
+function funcs = TestDimensions
+%TestDimensions tests for Dimensions
+%   Detailed explanation goes here
+
+    funcs = {};
+    funcs{end+1} = @test_set_dimension;
+    funcs{end+1} = @test_sample_dimension;
+    funcs{end+1} = @test_range_dimension;
+end
+
+function [] = test_set_dimension( varargin )
+%% Test: set dimension
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('daTestBlock', 'test nixBlock');
+    da = b.create_data_array('daTest', 'test nixDataArray', 'double', [1 2]);
+    d1 = da.append_set_dimension();
+
+    assert(strcmp(d1.dimensionType, 'set'));
+    assert(isempty(d1.labels));
+    
+    d1.labels = {'foo', 'bar'};
+    assert(strcmp(d1.labels{1}, 'foo'));
+    assert(strcmp(d1.labels{2}, 'bar'));
+    
+    % fix this in NIX
+    %d1.labels = {};
+    %assert(isempty(d1.labels));
+end
+
+function [] = test_sample_dimension( varargin )
+%% Test: sampled dimension
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('daTestBlock', 'test nixBlock');
+    da = b.create_data_array('daTest', 'test nixDataArray', 'double', [1 2]);
+    d1 = da.append_sampled_dimension(200);
+
+    assert(strcmp(d1.dimensionType, 'sample'));
+    assert(isempty(d1.label));
+    assert(isempty(d1.unit));
+    assert(d1.samplingInterval == 200);
+    assert(isempty(d1.offset));
+    
+    d1.label = 'foo';
+    d1.unit = 'mV';
+    d1.samplingInterval = 325;
+    d1.offset = 500;
+
+    assert(strcmp(d1.label, 'foo'));
+    assert(strcmp(d1.unit, 'mV'));
+    assert(d1.samplingInterval == 325);
+    assert(d1.offset == 500);
+    
+    d1.label = '';
+    d1.unit = '';
+    d1.offset = 0;
+    
+    assert(isempty(d1.label));
+    assert(isempty(d1.unit));
+    assert(d1.samplingInterval == 325);
+    assert(d1.offset == 0);
+end
+
+function [] = test_range_dimension( varargin )
+%% Test: range dimension
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('daTestBlock', 'test nixBlock');
+    da = b.create_data_array('daTest', 'test nixDataArray', 'double', [1 2]);
+    ticks = [1 2 3 4];
+    d1 = da.append_range_dimension(ticks);
+
+    assert(strcmp(d1.dimensionType, 'range'));
+    assert(isempty(d1.label));
+    assert(isempty(d1.unit));
+    assert(isequal(d1.ticks, ticks));
+    
+    new_ticks = [5 6 7 8];
+    d1.label = 'foo';
+    d1.unit = 'mV';
+    d1.ticks = new_ticks;
+    
+    assert(strcmp(d1.label, 'foo'));
+    assert(strcmp(d1.unit, 'mV'));
+    assert(isequal(d1.ticks, new_ticks));
+    
+    d1.label = '';
+    d1.unit = '';
+    
+    assert(isempty(d1.label));
+    assert(isempty(d1.unit));
+end