Fix failing tests

Author: ehennestad

+tests/+unit/+schema/DataTypesTest.m

@@ -363,7 +363,7 @@ function testSubgroupUntypedDatasetWithWrongType(testCase)
             subGroup.set('untyped_text_data', 2);
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
 
         function testSubgroupTypedDatasetWithCorrectType(testCase)
@@ -379,7 +379,7 @@ function testSubgroupTypedDatasetWithWrongType(testCase)
             subGroup.set('any_data', types.hdmf_common.VectorData('data', 1)); 
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
 
         function testSubgroupConstrainedDatasetWithCorrectType(testCase)
@@ -397,7 +397,7 @@ function testSubgroupConstrainedDatasetWithWrongType(testCase)
             subGroup.set('constrained', types.dt.AnyData('data', 1)); 
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
 
         function testSubgroupAttributeWithCorrectType(testCase)
@@ -413,7 +413,7 @@ function testSubgroupAttributeWithWrongType(testCase)
             subGroup.set('description', 1); 
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
 
         function testSubgroupLinkWithCorrectType(testCase)
@@ -431,7 +431,7 @@ function testSubgroupLinkWithWrongType(testCase)
             subGroup.set('subgroup_link', types.untyped.SoftLink(invalidLinkedDataset));
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
 
         function testNestedSubgroupWithCorrectType(testCase)
@@ -446,7 +446,7 @@ function testNestedSubgroupWithWrongType(testCase)
             subGroup.set('nested_subgroup', types.core.TimeSeries);
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
 
         function testNestedConstrainedSubgroupWithCorrectType(testCase)
@@ -461,7 +461,7 @@ function testNestedConstrainedSubgroupWithWrongType(testCase)
             subGroup.set('nested_constrained_subgroup', types.hdmf_common.DynamicTable()); 
             testCase.verifyWarning(...
                 @() types.dt.NestedDataTypeContainer('subgroup', subGroup), ...
-                'NWB:Set:FailedValidation')
+                'NWB:Set:InvalidEntry')
         end
     end
 end

+tests/+unit/untypedSetTest.m

@@ -14,7 +14,7 @@ function testCreateSetWithFunctionInput(testCase)
             % Verify a function that validates the input
             set = types.untyped.Set(@(key, value) assert(strcmp(key, 'test')));
             try
-                set.validateEntry('test', 1)
+                set.validateEntry('test', 1);
             catch
                 testCase.verifyFail('Expected validation to pass')
             end

+types/+untyped/Set.m

@@ -52,10 +52,23 @@
 
         function value = validateEntry(obj, name, value)
             if ~isempty(obj.ValidationFunction)
+                MECause = [];
                 try
                     value = obj.ValidationFunction(name, value);
                 catch MECause
-                    ME = MException('NWB:Set:InvalidEntry', ...
+                    if strcmp(MECause.identifier, 'MATLAB:maxlhs')
+                        MECause = []; % Reset MECause
+                        % Validation function does not provide output. Call
+                        % again expecting no output
+                        try
+                            obj.ValidationFunction(name, value);
+                        catch MECause
+                            % pass, handled below
+                        end
+                    end
+                end
+                if ~isempty(MECause)
+                   ME = MException('NWB:Set:InvalidEntry', ...
                         'Entry of Constrained Set with name `%s` is invalid.\n', name);
                     ME = ME.addCause(MECause);
                     throw(ME)