changeset 1263:abfc498c52bc 3.0-integration

Test fixes
author Chris Cannam
date Tue, 15 Nov 2016 16:54:02 +0000
parents c4f873749ab5
children a99641535e02
files base/test/TestOurRealTime.h base/test/TestVampRealTime.h data/fileio/test/AudioFileReaderTest.h
diffstat 3 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/base/test/TestOurRealTime.h	Tue Nov 15 16:12:48 2016 +0000
+++ b/base/test/TestOurRealTime.h	Tue Nov 15 16:54:02 2016 +0000
@@ -324,24 +324,17 @@
             for (int j = 0; j < m; ++j) {
                 int rate = rates[j];
 
-                cerr << "frame = " << frame << ", rate = " << rate << endl;
-                
                 RealTime rt = RealTime::frame2RealTime(frame, rate);
                 QCOMPARE(rt.sec, realTimes[j][i].sec);
                 QCOMPARE(rt.nsec, realTimes[j][i].nsec);
 
-                cerr << "rt = " << rt << endl;
-                cerr << "rate = " << rate << endl;
-
                 frame_type conv = RealTime::realTime2Frame(rt, rate);
-                cerr << "conv = " << conv << endl;
                 
                 rt = RealTime::frame2RealTime(-frame, rate);
                 frame_type negconv = RealTime::realTime2Frame(rt, rate);
-                cerr << "negconv = " << negconv << endl;
 
                 if (rate > ONE_BILLION) {
-                    // We no longer have enough precision in RealTime
+                    // We don't have enough precision in RealTime
                     // for this absurd sample rate, so a round trip
                     // conversion may round
                     QVERIFY(abs(frame - conv) < 2);
--- a/base/test/TestVampRealTime.h	Tue Nov 15 16:12:48 2016 +0000
+++ b/base/test/TestVampRealTime.h	Tue Nov 15 16:54:02 2016 +0000
@@ -298,24 +298,17 @@
             for (int j = 0; j < m; ++j) {
                 int rate = rates[j];
 
-                cerr << "frame = " << frame << ", rate = " << rate << endl;
-                
                 RealTime rt = RealTime::frame2RealTime(frame, rate);
                 QCOMPARE(rt.sec, realTimes[j][i].sec);
                 QCOMPARE(rt.nsec, realTimes[j][i].nsec);
 
-                cerr << "rt = " << rt << endl;
-                cerr << "rate = " << rate << endl;
-
                 frame_type conv = RealTime::realTime2Frame(rt, rate);
-                cerr << "conv = " << conv << endl;
                 
                 rt = RealTime::frame2RealTime(-frame, rate);
                 frame_type negconv = RealTime::realTime2Frame(rt, rate);
-                cerr << "negconv = " << negconv << endl;
 
                 if (rate > ONE_BILLION) {
-                    // We no longer have enough precision in RealTime
+                    // We don't have enough precision in RealTime
                     // for this absurd sample rate, so a round trip
                     // conversion may round
                     QVERIFY(abs(frame - conv) < 2);
--- a/data/fileio/test/AudioFileReaderTest.h	Tue Nov 15 16:12:48 2016 +0000
+++ b/data/fileio/test/AudioFileReaderTest.h	Tue Nov 15 16:54:02 2016 +0000
@@ -31,7 +31,7 @@
 
 using namespace std;
 
-static QString audioDir = "testfiles";
+static QString audioDir = "svcore/data/fileio/test/testfiles";
 
 class AudioFileReaderTest : public QObject
 {