Skip to content

Commit

Permalink
issue #31: added patch to change default test configuration, directed…
Browse files Browse the repository at this point in the history 
… output of evalc-function calls to logger.info
  • Loading branch information
@dimamih
dimamih committed Feb 16, 2018
1 parent 2056b78 commit f4fda19
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 15 deletions.
10 changes: 6 additions & 4 deletions products/+elltool/+core/+test/+mlunit/EllipsoidBasicSecondTC.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,19 +535,21 @@ function checkScalGRBBF()
'wrongInput:wrongSizes');
end
function self = testDisplay(self)
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
ellEmptArr = self.ellipsoid.empty([0,0,2,0]); %#ok<NASGU>
evalc('display(ellEmptArr)');
logger.info(evalc('display(ellEmptArr)'));
%
centVec = [1;1];
shapeMat = eye(2);
ellObj = self.ellipsoid(centVec,shapeMat);
evalc('display(ellObj)');
logger.info(evalc('display(ellObj)'));
%
ellMat = ellObj.repMat([2,2]); %#ok<NASGU>
evalc('display(ellMat)');
logger.info(evalc('display(ellMat)'));
%
ellArr = ellObj.repMat([2,2,3,4,5]); %#ok<NASGU>
evalc('display(ellArr)');
logger.info(evalc('display(ellArr)'));
end
function self = testProjection(self)
projMat = [1 0 0;0 1 0]';
Expand Down
4 changes: 3 additions & 1 deletion products/+elltool/+core/+test/+mlunit/GenEllipsoidTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ function set_up_param(self)
end
%
function testDisplaySimple(~)
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
ell1=elltool.core.GenEllipsoid([1;1],eye(2));
ell2=elltool.core.GenEllipsoid([1;0],eye(2));
ell3=elltool.core.GenEllipsoid([0;1],eye(2));
ellMat=[ell1,ell2,ell3;ell1,ell2,ell3]; %#ok<NASGU>
evalc('display(ellMat)');
logger.info(evalc('display(ellMat)'));
end
%
function self = testConstructor(self)
Expand Down
6 changes: 4 additions & 2 deletions products/+elltool/+core/+test/+mlunit/HyperplaneTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,13 @@ function tear_down(~)
end
%
function self = testDisplay(self)
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
SInpData = self.auxReadFile(self);
testHyperplane = SInpData.testHyperplane; %#ok<NASGU>
evalc('display(testHyperplane);');
logger.info(evalc('display(testHyperplane);'));
testHyperplaneVec = SInpData.testHyperplaneVec; %#ok<NASGU>
evalc('display(testHyperplaneVec);');
logger.info(evalc('display(testHyperplaneVec);'));
end
%
% function self = testPlot(self)
Expand Down
4 changes: 3 additions & 1 deletion products/+elltool/+demo/+test/+mlunit/ETManualTC.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ function tear_down(self)
end
end
if ~isBad
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
[~, fileName] = fileparts(nameStr);
evalc(['elltool.doc.snip.' fileName]);
logger.info(evalc(['elltool.doc.snip.' fileName]));
end
end
cd(oldFolder);
Expand Down
3 changes: 1 addition & 2 deletions products/+elltool/+linsys/+test/+mlunit/LinSysTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function set_up_param(self)
{'t', '1', 'cos(t)'; '1' '0' 't'; 'sin(t)', 't', '2'}, ...
{'t', 'cos(t)'; 'sin(t)', 't'; 'cos(t)', 'sin(t)'}, ...
UEll, eye(3,5),ell_unitball(5),eye(2,3),ell_unitball(2));
evalc('system.display();');
%evalc('system.display();');
resStr = evalc('display(system)');
isOk = ~isempty(strfind(resStr,'A'));
isOk = ~isempty(strfind(resStr,'B')) && isOk;
Expand Down Expand Up @@ -367,7 +367,6 @@ function compareTestDim(flag, expectedVec)
else
system = elltool.linsys.LinSysDiscrete.empty(2, 0, 5);
end
system.display();
resStr = evalc('system.display()');
isOk = ~isempty(strfind(resStr, ...
'Empty linear system object.'));
Expand Down
4 changes: 3 additions & 1 deletion products/+elltool/+reach/+test/+mlunit/ContinuousReachRegTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ function check(isRegEnabled,isJustCheck,regTol,expErrTag,isNeg)
if isNeg
self.runAndCheckError(evalStr,expErrTag);
else
evalc(evalStr);
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
logger.info(evalc(evalStr));
end
end
end
Expand Down
8 changes: 6 additions & 2 deletions products/+elltool/+reach/+test/+mlunit/DiscreteReachFirstTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ function set_up_param(self, varargin)
end
%
function self = testFirstBasicTest(self)
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
loadFileStr = strcat(self.testDataRootDir,...
'/demo3DiscreteTest.mat');
load(loadFileStr, 'aMat', 'bMat', 'ControlBounds',...
Expand All @@ -38,7 +40,7 @@ function set_up_param(self, varargin)
%timeVec = [0, 3];
reachSetObj = self.reachDiscrete(linSysObj,...
x0Ell, l0Mat, timeVec);
evalc('reachSetObj.display();');
logger.info(evalc('reachSetObj.display();'));
firstCutReachObj =...
reachSetObj.cut([timeVec(1)+1 timeVec(end)-1]);
[~] = reachSetObj.cut(timeVec(1)+2);
Expand All @@ -64,6 +66,8 @@ function set_up_param(self, varargin)
end
%
function self = testSecondBasicTest(self)
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
loadFileStr = strcat(self.testDataRootDir,...
'/distorbDiscreteTest.mat');
load(loadFileStr, 'aMat', 'bMat', 'ControlBounds',...
Expand All @@ -72,7 +76,7 @@ function set_up_param(self, varargin)
ControlBounds, gMat, DistorbBounds,'d');
reachSetObj = self.reachDiscrete(linSysObj,...
x0Ell, l0Mat, timeVec);
evalc('reachSetObj.display();');
logger.info(evalc('reachSetObj.display();'));
firstCutReachObj =...
reachSetObj.cut([timeVec(1)+1 timeVec(end)-1]);
[~] = reachSetObj.cut(timeVec(1)+2);
Expand Down
15 changes: 15 additions & 0 deletions products/+elltool/+test/+configuration/@ConfPatchRepo/patch_006_change_logging_settings.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
function SInput=patch_006_change_logging_settings(~,SInput)
aCVec = sprintf([...
'log4j.rootLogger=DEBUG, stdout, A1\n'...
'log4j.logger.elltool = WARN, stdout\n'...
'log4j.logger.gras = WARN, stdout\n'...
'log4j.logger.modgen = WARN, stdout\n'...
'log4j.logger.smartdb = WARN, stdout\n'...
'log4j.appender.stdout=org.apache.log4j.ConsoleAppender\n'...
'log4j.appender.stdout.layout=org.apache.log4j.PatternLayout\n'...
'log4j.appender.stdout.layout.ConversionPattern=%%5p %%c - %%m\\n \n'...
'log4j.appender.A1=org.apache.log4j.FileAppender\n'...
'log4j.appender.A1.File=${elltool.testrunner.log4j.logfile.dirwithsep}${elltool.testrunner.log4j.logfile.main.name}\n'...
'log4j.appender.A1.layout=org.apache.log4j.PatternLayout\n'...
'log4j.appender.A1.layout.ConversionPattern=%%d %%5p %%c - %%m%%n']);
SInput.logging.log4jSettings = aCVec;
6 changes: 4 additions & 2 deletions products/+gras/+ellapx/+smartdb/+test/+mlunit/ExamplesTC.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ function test_examples(~)
nExamples=numel(exampleNameList);
for iExample=1:nExamples
try
import elltool.logging.Log4jConfigurator;
logger=Log4jConfigurator.getLogger();
exampleName=[examplePkgName,'.',...
exampleNameList{iExample}(1:end-2)];
evalc(exampleName);
exampleNameList{iExample}(1:end-2)];
logger.info(evalc(exampleName));
catch meObj
newMeObj=throwerror('testRunProblem','failed to run %s',...
exampleName');
Expand Down

0 comments on commit f4fda19

Please sign in to comment.