Browse Source
FindMatlab: added unit tests for new functionality.
FindMatlab: added unit tests for new functionality.
Also allowing a way to select which of multiple installed MATLAB versions to use in the test.pull/324/head
Cris Luengo
7 years ago
9 changed files with 191 additions and 9 deletions
-
9Tests/CMakeLists.txt
-
5Tests/FindMatlab/basic_checks/CMakeLists.txt
-
28Tests/FindMatlab/cmake_matlab_unit_tests4.m
-
20Tests/FindMatlab/cmake_matlab_unit_tests5.m
-
4Tests/FindMatlab/components_checks/CMakeLists.txt
-
5Tests/FindMatlab/failure_reports/CMakeLists.txt
-
16Tests/FindMatlab/matlab_wrapper2.cpp
-
29Tests/FindMatlab/matlab_wrapper3.cpp
-
84Tests/FindMatlab/r2018a_check/CMakeLists.txt
@ -0,0 +1,28 @@ |
|||
|
|||
classdef cmake_matlab_unit_tests4 < matlab.unittest.TestCase |
|||
% Testing R2017b and R2018a APIs |
|||
properties |
|||
end |
|||
|
|||
methods (Test) |
|||
function testR2017b(testCase) |
|||
ret = cmake_matlab_mex2a(5+6i); |
|||
testCase.verifyEqual(ret, 8); |
|||
end |
|||
|
|||
function testR2018a(testCase) |
|||
ret = cmake_matlab_mex2b(5+6i); |
|||
v = version; |
|||
n = find(v=='.'); |
|||
v = str2double(v(1:n(2)-1)); |
|||
disp(v) |
|||
if v>= 9.4 % R2018a |
|||
testCase.verifyEqual(ret, 16); |
|||
disp('TESTING version >= 9.4') |
|||
else |
|||
testCase.verifyEqual(ret, 8); |
|||
end |
|||
end |
|||
|
|||
end |
|||
end |
|||
@ -0,0 +1,20 @@ |
|||
|
|||
classdef cmake_matlab_unit_tests5 < matlab.unittest.TestCase |
|||
% C++ API test |
|||
properties |
|||
end |
|||
|
|||
methods (Test) |
|||
function testDummyCall(testCase) |
|||
% very simple call test |
|||
disp('TESTING C++') |
|||
ret = cmake_matlab_mex3(162); |
|||
testCase.verifyEqual(ret, 162); |
|||
end |
|||
|
|||
function testFailTest(testCase) |
|||
testCase.verifyError(@() cmake_matlab_mex3, 'MATLAB:mex:CppMexException'); |
|||
end |
|||
|
|||
end |
|||
end |
|||
@ -0,0 +1,16 @@ |
|||
#include "mex.h"
|
|||
|
|||
// This test uses the new complex-interleaved C API (R2018a and newer)
|
|||
|
|||
// The input should be a complex array (scalar is OK). It returns the number of
|
|||
// bytes in a matrix element. For the old (R2017b) API, this is 8. For the new
|
|||
// (R2018a) API, this is 16.
|
|||
|
|||
void mexFunction(const int nlhs, mxArray* plhs[], const int nrhs, |
|||
const mxArray* prhs[]) |
|||
{ |
|||
if (nrhs != 1 || !mxIsComplex(prhs[0])) { |
|||
mexErrMsgTxt("Incorrect arguments"); |
|||
} |
|||
plhs[0] = mxCreateDoubleScalar(mxGetElementSize(prhs[0])); |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
#include "mex.hpp"
|
|||
#include "mexAdapter.hpp"
|
|||
|
|||
// This test uses the new C++ API (R2018a and newer)
|
|||
|
|||
// The input should be a scalar double array. The output is a copy of that
|
|||
// array.
|
|||
|
|||
using namespace matlab::data; |
|||
using matlab::mex::ArgumentList; |
|||
|
|||
class MexFunction : public matlab::mex::Function |
|||
{ |
|||
public: |
|||
void operator()(ArgumentList outputs, ArgumentList inputs) |
|||
{ |
|||
std::shared_ptr<matlab::engine::MATLABEngine> matlabPtr = getEngine(); |
|||
ArrayFactory factory; |
|||
if (inputs[0].getType() != ArrayType::DOUBLE || |
|||
inputs[0].getType() == ArrayType::COMPLEX_DOUBLE || |
|||
inputs[0].getNumberOfElements() != 1) { |
|||
matlabPtr->feval( |
|||
u"error", 0, |
|||
std::vector<Array>({ factory.createScalar("Incorrect arguments") })); |
|||
} |
|||
double a = inputs[0][0]; |
|||
outputs[0] = factory.createScalar(a); |
|||
} |
|||
}; |
|||
@ -0,0 +1,84 @@ |
|||
|
|||
cmake_minimum_required (VERSION 2.8.12) |
|||
enable_testing() |
|||
project(r2018a_checks) |
|||
|
|||
set(MATLAB_FIND_DEBUG TRUE) |
|||
|
|||
# this test doesn't do much if MATLAB version < R2018a |
|||
|
|||
if(IS_MCR) |
|||
set(RUN_UNIT_TESTS FALSE) |
|||
else() |
|||
set(RUN_UNIT_TESTS TRUE) |
|||
set(components MAIN_PROGRAM) |
|||
endif() |
|||
|
|||
if(NOT "${MCR_ROOT}" STREQUAL "") |
|||
set(Matlab_ROOT_DIR "${MCR_ROOT}") |
|||
if(NOT EXISTS "${MCR_ROOT}") |
|||
message(FATAL_ERROR "MCR does not exist ${MCR_ROOT}") |
|||
endif() |
|||
endif() |
|||
|
|||
find_package(Matlab REQUIRED COMPONENTS ${components}) |
|||
|
|||
set(IS_R2018a 1) |
|||
if(${Matlab_VERSION_STRING} VERSION_LESS "9.4") |
|||
# This is an older version of MATLAB, tests will fail |
|||
set(IS_R2018a 0) |
|||
endif() |
|||
|
|||
matlab_add_mex( |
|||
# target name |
|||
NAME cmake_matlab_test_wrapper2a |
|||
# output name |
|||
OUTPUT_NAME cmake_matlab_mex2a |
|||
SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper2.cpp |
|||
R2017b |
|||
) |
|||
|
|||
matlab_add_mex( |
|||
# target name |
|||
NAME cmake_matlab_test_wrapper2b |
|||
# output name |
|||
OUTPUT_NAME cmake_matlab_mex2b |
|||
SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper2.cpp |
|||
R2018a |
|||
) |
|||
|
|||
if(IS_R2018a) |
|||
matlab_add_mex( |
|||
# target name |
|||
NAME cmake_matlab_test_wrapper3 |
|||
# output name |
|||
OUTPUT_NAME cmake_matlab_mex3 |
|||
SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper3.cpp |
|||
) |
|||
set_target_properties( |
|||
cmake_matlab_test_wrapper3 |
|||
PROPERTIES |
|||
CXX_STANDARD 11 |
|||
CXX_STANDARD_REQUIRED ON |
|||
) |
|||
endif() |
|||
|
|||
if(RUN_UNIT_TESTS) |
|||
# Check that the R2017b and R2018a APIs work. |
|||
matlab_add_unit_test( |
|||
NAME ${PROJECT_NAME}_matlabtest-1 |
|||
TIMEOUT 300 |
|||
UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests4.m |
|||
ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper2a> |
|||
) |
|||
|
|||
# Check that the C++ API works (test run only on R2018a and newer) |
|||
if(IS_R2018a) |
|||
matlab_add_unit_test( |
|||
NAME ${PROJECT_NAME}_matlabtest-3 |
|||
TIMEOUT 300 |
|||
UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests5.m |
|||
ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper3> |
|||
) |
|||
endif() |
|||
endif() |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue