Merge pull request #14 from european-central-bank/frequency

Frequency fixes
european-central-bank · Nov 25, 2021 · 87986a5 · 87986a5
2 parents 71de4c0 + bc01a8a
commit 87986a5
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 6 deletions.
diff --git a/resources/project/Root.type.Files/tests.type.File/tApp.m.type.File.xml b/resources/project/Root.type.Files/tests.type.File/tApp.m.type.File.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="test" />
+    </Category>
+</Info>
diff --git a/tbx/app/BEARapp.mlappinstall b/tbx/app/BEARapp.mlappinstall
diff --git a/tbx/app/BEARapp.prj b/tbx/app/BEARapp.prj
@@ -1,5 +1,5 @@
 <deployment-project plugin="plugin.apptool" plugin-version="1.0">
-  <configuration build-checksum="267656668" file="C:\Users\ebenetce\MATLAB\BEAR-toolbox\tbx\app\BEARapp.prj" location="C:\Users\ebenetce\MATLAB\BEAR-toolbox\tbx\app" name="BEARapp" target="target.mlapps" target-name="Package App">
+  <configuration build-checksum="2771206578" file="C:\Users\ebenetce\MATLAB\BEAR-toolbox\tbx\app\BEARapp.prj" location="C:\Users\ebenetce\MATLAB\BEAR-toolbox\tbx\app" name="BEARapp" target="target.mlapps" target-name="Package App">
     <param.appname>BEARapp</param.appname>
     <param.authnamewatermark>Alistair Dieppe and Björn van Roye</param.authnamewatermark>
     <param.email>alistair.dieppe@ecb.europa.eu</param.email>

diff --git a/tbx/app/BEARapp20a.mlapp b/tbx/app/BEARapp20a.mlapp
diff --git a/tbx/app/BEARapp21a.mlapp b/tbx/app/BEARapp21a.mlapp
diff --git a/tests/runQuickTests.m b/tests/runQuickTests.m
@@ -9,7 +9,8 @@
 suite4 = TestSuite.fromFile('tUtils.m');
 suite5 = TestSuite.fromFile('tFAVAR.m');
 suite6 = TestSuite.fromFile('tNewInterface.m');
-suite = [suite1, suite2, suite3, suite4, suite5, suite6];
+suite7 = TestSuite.fromFile('tApp.m');
+suite = [suite1, suite2, suite3, suite4, suite5, suite7];
 
 runner = TestRunner.withTextOutput;
 runner.addPlugin(CodeCoveragePlugin.forFolder(bearroot(), 'IncludingSubfolders', true))

diff --git a/tests/tApp.m b/tests/tApp.m
@@ -0,0 +1,49 @@
+classdef tApp < matlab.uitest.TestCase
+
+    properties
+        App
+    end
+
+    methods (TestMethodSetup)
+
+        function loadApp(tc)
+            tc.App = BEARapp20a();
+            addTeardown(tc, @() delete(tc.App));
+        end
+
+    end
+
+    methods (Test)
+
+        function tFrequency(tc)
+
+            tc.choose(tc.App.frequency_cp, 'monthly');
+            tc.press(tc.App.QuickExporttoWorkspaceButton)
+            opts = evalin('base', 'opts');
+            tc.verifyEqual(opts.frequency, 3);
+
+            tc.choose(tc.App.frequency_cp, 'quarterly');
+            tc.press(tc.App.QuickExporttoWorkspaceButton)
+            opts = evalin('base', 'opts');
+            tc.verifyEqual(opts.frequency, 2);
+
+            tc.choose(tc.App.frequency_cp, 'yearly');
+            tc.press(tc.App.QuickExporttoWorkspaceButton)
+            opts = evalin('base', 'opts');
+            tc.verifyEqual(opts.frequency, 1);
+
+            tc.choose(tc.App.frequency_cp, 'weekly');
+            tc.press(tc.App.QuickExporttoWorkspaceButton)
+            opts = evalin('base', 'opts');
+            tc.verifyEqual(opts.frequency, 4);
+
+            tc.choose(tc.App.frequency_cp, 'daily');
+            tc.press(tc.App.QuickExporttoWorkspaceButton)
+            opts = evalin('base', 'opts');
+            tc.verifyEqual(opts.frequency, 5);
+
+        end
+
+    end
+
+end
diff --git a/tests/tFAVAR.m b/tests/tFAVAR.m
@@ -1,6 +1,6 @@
 classdef tFAVAR < matlab.unittest.TestCase
 
-    methods(Test)
+    methods(Test, TestTags = {'Git'})
 
         function tNonFavar(tc)
             s = BEARsettings(7, 'ExcelFile', 'data.xlsx');

diff --git a/tests/tPanelSettings.m b/tests/tPanelSettings.m
@@ -1,7 +1,7 @@
 classdef tPanelSettings < matlab.unittest.TestCase
 
 
-    methods (Test)
+    methods (Test, TestTags = {'Git'})
         function tPanelIRFt56(tc)
             opts = BEARsettings(4, 'ExcelFile', 'data.xlsx');
 

diff --git a/tests/tSettings.m b/tests/tSettings.m
@@ -1,6 +1,6 @@
 classdef tSettings < matlab.unittest.TestCase
 
-    methods(Test)
+    methods(Test, TestTags = {'Git'})
 
         function tDefaults(tc)
             s = BEARsettings(1);

diff --git a/tests/tUtils.m b/tests/tUtils.m
@@ -1,6 +1,6 @@
 classdef tUtils < matlab.unittest.TestCase
 
-    methods(Test)
+    methods(Test, TestTags = {'Git'})
 
         function tfixstring(tc)
             str = '  a s dsds   sd asrt          as 2893 ~@           ';