add tests

BoysTownOrg · Jul 18, 2019 · 2286340 · 2286340
1 parent e2b9d91
commit 2286340
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/src/av-speech-in-noise/Model.h b/src/av-speech-in-noise/Model.h
@@ -95,6 +95,7 @@ namespace av_speech_in_noise {
         int startingSnr_dB;
         int ceilingSnr_dB;
         int floorSnr_dB;
+        int trackBumpLimit;
     };
 
     struct FixedLevelTest {

diff --git a/src/google-tests/PresenterTests.cpp b/src/google-tests/PresenterTests.cpp
@@ -256,6 +256,14 @@ namespace av_speech_in_noise::tests::presentation {
         assertPassesFloorSNR(confirmingAdaptiveOpenSetTest);
     }
 
+    TEST_F(PresenterTests, confirmingAdaptiveClosedSetTestPassesTrackBumpLimit) {
+        assertPassesTrackBumpLimit(confirmingAdaptiveClosedSetTest);
+    }
+
+    TEST_F(PresenterTests, confirmingAdaptiveOpenSetTestPassesTrackBumpLimit) {
+        assertPassesTrackBumpLimit(confirmingAdaptiveOpenSetTest);
+    }
+
     TEST_F(PresenterTests, confirmingAdaptiveClosedSetTestPassesFullScaleLevel) {
         assertPassesFullScaleLevel(confirmingAdaptiveClosedSetTest);
     }

diff --git a/src/google-tests/PresenterTests.h b/src/google-tests/PresenterTests.h
@@ -657,6 +657,7 @@ namespace av_speech_in_noise::tests::presentation {
     public:
         virtual int ceilingSnr_dB(ModelStub &) = 0;
         virtual int floorSnr_dB(ModelStub &) = 0;
+        virtual int trackBumpLimit(ModelStub &) = 0;
         virtual std::string trackSettingsFile(ModelStub &) = 0;
     };
 
@@ -729,6 +730,10 @@ namespace av_speech_in_noise::tests::presentation {
         std::string trackSettingsFile(ModelStub &m) override {
             return adaptiveTest(m).trackSettingsFile;
         }
+
+        int trackBumpLimit(ModelStub &m) override {
+            return adaptiveTest(m).trackBumpLimit;
+        }
     };
 
     void setMethod(ViewStub::TestSetupViewStub *view, Method m) {
@@ -795,6 +800,10 @@ namespace av_speech_in_noise::tests::presentation {
         std::string trackSettingsFile(ModelStub &m) override {
             return confirmingAdaptiveTest.trackSettingsFile(m);
         }
+
+        int trackBumpLimit(ModelStub &m) override {
+            return confirmingAdaptiveTest.trackBumpLimit(m);
+        }
     };
 
     class ConfirmingAdaptiveOpenSetTest : public ConfirmingAdaptiveTest_ {
@@ -857,6 +866,10 @@ namespace av_speech_in_noise::tests::presentation {
         std::string trackSettingsFile(ModelStub &m) override {
             return confirmingAdaptiveTest.trackSettingsFile(m);
         }
+
+        int trackBumpLimit(ModelStub &m) override {
+            return confirmingAdaptiveTest.trackBumpLimit(m);
+        }
     };
 
     class ConfirmingFixedLevelTest : public ConfirmingTestSetup {
@@ -1691,6 +1704,14 @@ namespace av_speech_in_noise::tests::presentation {
             );
         }
 
+        void assertPassesTrackBumpLimit(ConfirmingAdaptiveTest_ &useCase) {
+            run(useCase);
+            assertEqual(
+                Presenter::trackBumpLimit,
+                useCase.trackBumpLimit(model)
+            );
+        }
+
         void assertPassesTrackSettingsFile(ConfirmingAdaptiveTest_ &useCase) {
             setupView.setTrackSettingsFile("e");
             run(useCase);

diff --git a/src/presentation/Presenter.cpp b/src/presentation/Presenter.cpp
@@ -13,6 +13,7 @@ namespace av_speech_in_noise {
     int Presenter::fullScaleLevel_dB_SPL = 119;
     int Presenter::ceilingSnr_dB = 20;
     int Presenter::floorSnr_dB = -40;
+    int Presenter::trackBumpLimit = 10;
 
     Presenter::Presenter(
         Model *model,
@@ -295,6 +296,7 @@ namespace av_speech_in_noise {
         p.information = testInformation();
         p.ceilingSnr_dB = ceilingSnr_dB;
         p.floorSnr_dB = floorSnr_dB;
+        p.trackBumpLimit = trackBumpLimit;
         p.trackSettingsFile = view->trackSettingsFile();
         p.common = commonTest();
         return p;

diff --git a/src/presentation/Presenter.h b/src/presentation/Presenter.h
@@ -292,6 +292,7 @@ namespace av_speech_in_noise {
         static int fullScaleLevel_dB_SPL;
         static int ceilingSnr_dB;
         static int floorSnr_dB;
+        static int trackBumpLimit;
 
     private:
         void proceedToNextTrialAfter(