Squashed '@TIFFStack/' changes from e80689f..1eb6076

1eb6076 * Implemented (errors) when trying to concatenate `TIFFStacks` * Pulled in changes to `subsref` from @epaxon * Added a few unit tests

git-subtree-dir: @tiffstack
git-subtree-split: 1eb607635b0f07939ba3f021cdcd29a98d518bed

Author: DylanMuir

TIFFStack.m

@@ -419,7 +419,7 @@ function diagnostic(oStack)
 
 %% --- Overloaded subsref
 
-      function [tfData] = subsref(oStack, S)
+      function [varargout] = subsref(oStack, S)
          switch S(1).type
             case '()'
                % - Test for valid subscripts
@@ -545,7 +545,7 @@ function diagnostic(oStack)
 
                % - Catch empty refs
                if (prod(vnRetDataSize) == 0)
-                  tfData = zeros(vnRetDataSize);
+                  [varargout{1:nargout}] = zeros(vnRetDataSize);
                   return;
                end
 
@@ -598,6 +598,8 @@ function diagnostic(oStack)
                   tfData = reshape(tfData, vnRetDataSize);
                end
 
+               [varargout{1:nargout}] = tfData;
+               
             otherwise
                error('TIFFStack:InvalidReferencing', ...
                      '*** TIFFStack: Only ''()'' referencing is supported by TIFFStacks.');
@@ -623,8 +625,8 @@ function diagnostic(oStack)
       end
 
 
-%% --- Overloaded numel, size, permute, ipermute, ctranspose, transpose
-      function [n] = numel(oStack)
+%% --- Overloaded numel, size, permute, ipermute, ctranspose, transpose, cat, horzcat, vertcat
+      function [n] = numel(oStack, varargin)
          n = prod(size(oStack)); %#ok<PSIZE>
       end
 
@@ -705,6 +707,22 @@ function diagnostic(oStack)
          oStack = permute(oStack, [2 1]);
       end
 
+      % cat - METHOD Overloaded cat, horzcat, vertcat functions
+      function [varargout] = cat(varargin) %#ok<STOUT>
+         error('TIFFStack:Concatenation', ...
+            '*** TIFFStack: Concatenation is not supported by TIFFStack.');
+      end
+      
+      function [varargout] = horzcat(varargin) %#ok<STOUT>
+         error('TIFFStack:Concatenation', ...
+            '*** TIFFStack: Concatenation is not supported by TIFFStack.');
+      end
+      
+      function [varargout] = vertcat(varargin) %#ok<STOUT>
+         error('TIFFStack:Concatenation', ...
+            '*** TIFFStack: Concatenation is not supported by TIFFStack.');
+      end      
+      
 %% --- Overloaded end
 
       function nLength = end(oStack, nEndDim, nTotalRefDims)

private/TS_UnitTest.m

@@ -109,12 +109,33 @@ function TS_UnitTest(strFilename)
    s = load(strMatFile);
    TSUT_TestReferencing(tsStack, s.tsStack, 'Serialised/Deserialised stack');
 
+   %% - Test error conditions
+   TSUT_assertFail('TIFFStack:Concatenation', '[tsStack tsStack];');
+   TSUT_assertFail('TIFFStack:Concatenation', '[tsStack; tsStack];');
+   TSUT_assertFail('TIFFStack:Concatenation', 'cat(1, tsStack, tsStack);');
+   TSUT_assertFail('TIFFStack:InvalidReferencing', 'tsStack{1}');
+   TSUT_assertFail('TIFFStack:InvalidReferencing', 'tsStack.diagnostic();');
+   TSUT_assertFail('TIFFStack:DimensionMustBePositiveInteger', 'size(tsStack, 0);');
+   TSUT_assertFail('TIFFStack:InvalidArgument', 'tsStack.bInvert = 2;');
+   
    %% - Success if we reach here with no errors
    disp('--- TS_UnitTest: Unit tests for ''TIFFStack'' passed.');
 end
 
 
 function TSUT_TestReferencing(tsStack, tfStack, strTestName)
+   % - Test stack sizes
+   assert(isequal(size(tsStack), size(tfStack)), ...
+          'TIFFStack:UnitTestFailed', 'The result of calling ''size'' was not equal between the two stacks.');
+   assert(isequal(size(tsStack, 1), size(tfStack, 1)), ...
+          'TIFFStack:UnitTestFailed', 'The result of calling ''size'' was not equal between the two stacks.');
+   assert(isequal(size(tsStack, 2), size(tfStack, 2)), ...
+          'TIFFStack:UnitTestFailed', 'The result of calling ''size'' was not equal between the two stacks.');
+   assert(isequal(size(tsStack, 3), size(tfStack, 3)), ...
+          'TIFFStack:UnitTestFailed', 'The result of calling ''size'' was not equal between the two stacks.');
+   assert(isequal(size(tsStack, 4), size(tfStack, 4)), ...
+          'TIFFStack:UnitTestFailed', 'The result of calling ''size'' was not equal between the two stacks.');
+
    % - Test referencing entire stack
    TSUT_compareRef(':');
    TSUT_compareRef(':', ':');
@@ -245,6 +266,30 @@ function TSUT_testInvalidRef(strErrorID, varargin)
    end
 end
 
+% - Function to test errors with invalid references
+function TSUT_assertFail(strErrorID, strCommand)
+try
+   % - Evalulate command in called workspace
+   evalin('caller', strCommand);
+   
+catch mErr
+   % - Check whether the correct error was reported
+   if ~isequal(mErr.identifier, strErrorID)
+      mUTErr = MException('TIFFStack:UnitTestFailed', 'Incorrect error raised during error test with command [%s]. Desired error [%s], raised error [%s].', ...
+         strCommand, strErrorID, mErr.identifier);
+      mErr = mErr.addCause(mUTErr);
+      rethrow(mErr);
+   end
+   return;
+end
+
+% - We should never get here, so raise an error
+error('TIFFStack:UnitTestFailed:ErrorNotThrown', ...
+   'An error should have occurred but did not, with subs %s, during test [%s]. Desired error [%s].', ...
+   TSUT_subs2str(varargin), strTestName, strErrorID);
+end
+
+
 function strSubs = TSUT_subs2str(varargin)
    cSubsStr = cellfun(@num2str, varargin{:}, 'UniformOutput', false);
    strSubs = ['(' ...