comparison data/model/test/svcore-data-model-test.cpp @ 1529:c1c45c5146bb zoom

Merge from default branch
author Chris Cannam
date Tue, 18 Sep 2018 15:06:58 +0100
parents a7485c1bdba5
children c5092ca1c6e5
comparison
equal deleted inserted replaced
1527:710e6250a401 1529:c1c45c5146bb
10 License, or (at your option) any later version. See the file 10 License, or (at your option) any later version. See the file
11 COPYING included with this distribution for more information. 11 COPYING included with this distribution for more information.
12 */ 12 */
13 13
14 #include "TestFFTModel.h" 14 #include "TestFFTModel.h"
15 #include "TestZoomConstraints.h"
15 16
16 #include <QtTest> 17 #include <QtTest>
17 18
18 #include <iostream> 19 #include <iostream>
19 20
31 TestFFTModel t; 32 TestFFTModel t;
32 if (QTest::qExec(&t, argc, argv) == 0) ++good; 33 if (QTest::qExec(&t, argc, argv) == 0) ++good;
33 else ++bad; 34 else ++bad;
34 } 35 }
35 36
37 {
38 TestZoomConstraints t;
39 if (QTest::qExec(&t, argc, argv) == 0) ++good;
40 else ++bad;
41 }
42
36 if (bad > 0) { 43 if (bad > 0) {
37 SVCERR << "\n********* " << bad << " test suite(s) failed!\n" << endl; 44 SVCERR << "\n********* " << bad << " test suite(s) failed!\n" << endl;
38 return 1; 45 return 1;
39 } else { 46 } else {
40 SVCERR << "All tests passed" << endl; 47 SVCERR << "All tests passed" << endl;