diff --git a/matlab/src/matlab/+arrow/+internal/+proxy/validate.m b/matlab/src/matlab/+arrow/+internal/+proxy/validate.m index 1b2b3649e42c3..0aeb6074fcb09 100644 --- a/matlab/src/matlab/+arrow/+internal/+proxy/validate.m +++ b/matlab/src/matlab/+arrow/+internal/+proxy/validate.m @@ -18,12 +18,13 @@ function validate(proxy, expectedName) % proxy.Name and expectedName are not equal. arguments proxy(1, 1) libmexclass.proxy.Proxy - expectedName(1, 1) string + expectedName(1, 1) string {mustBeNonmissing, mustBeNonzeroLengthText} end if proxy.Name ~= expectedName errid = "arrow:proxy:ProxyNameMismatch"; - msg = "Proxy class name is " + proxyName + ", but expected " + expectedProxyName; + msg = compose("The Name property of the Proxy provided is ""%s"", " + ... + "but expected it to be ""%s"".", proxy.Name, expectedName); error(errid, msg); end end diff --git a/matlab/test/arrow/internal/proxy/tValidate.m b/matlab/test/arrow/internal/proxy/tValidate.m new file mode 100644 index 0000000000000..268c71f745f8e --- /dev/null +++ b/matlab/test/arrow/internal/proxy/tValidate.m @@ -0,0 +1,42 @@ +%TVALIDATE Unit tests for arrow.internal.proxy.validate + +% Licensed to the Apache Software Foundation (ASF) under one or more +% contributor license agreements. See the NOTICE file distributed with +% this work for additional information regarding copyright ownership. +% The ASF licenses this file to you under the Apache License, Version +% 2.0 (the "License"); you may not use this file except in compliance +% with the License. You may obtain a copy of the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, +% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +% implied. See the License for the specific language governing +% permissions and limitations under the License. + +classdef tValidate < matlab.unittest.TestCase + + methods(Test) + function ProxyNameMatches(testCase) + % Verify arrow.internal.proxy.validate() does not throw an + % error if the Name property of the Proxy provided matches + % the expected proxy name. + import arrow.internal.proxy.validate + a = arrow.array(1); + fcn = @() validate(a.Proxy, a.Proxy.Name); + testCase.verifyWarningFree(fcn); + end + + function ProxyNameMismatchError(testCase) + % Verify arrow.internal.proxy.validate() throws an error + % whose identifier is "arrow:proxy:ProxyNameMismatch" if the + % Name property of the Proxy provided does not match the + % expected proxy name. + import arrow.internal.proxy.validate + a = arrow.array(1); + fcn = @() validate(a.Proxy, "NotAProxyName"); + testCase.verifyError(fcn, "arrow:proxy:ProxyNameMismatch"); + end + end +end \ No newline at end of file