Remove AudioDevice and ControlPanel from fixtures

Author: medengineer

Plugins/LfpViewer/Tests/LfpDisplayNodeTests.cpp

@@ -319,7 +319,7 @@ TEST_F (LfpDisplayNodeTests, VisualIntegrityTest)
     Rectangle<int> canvasSnapshot (x, y, width, height);
     ExpectedImage expected (numChannels, sampleRate * 2); //2 seconds to match canvas timebase
 
-    tester->startAcquisition (false);
+    processor->startAcquisition ();
     canvas->beginAnimation();
 
     //Add 5 10Hz waves with +-125uV amplitude
@@ -367,16 +367,16 @@ TEST_F (LfpDisplayNodeTests, VisualIntegrityTest)
     missCount = getImageDifferencePixelCount (expectedImage, canvasImage);
     EXPECT_LE (float (missCount) / float (width * height), errorThreshold);
 
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 }
 
 TEST_F (LfpDisplayNodeTests, DataIntegrityTest)
 {
     int numSamples = 100;
-    tester->startAcquisition (false);
+    processor->startAcquisition ();
 
     auto inputBuffer = createBuffer (1000.0, 20.0, numChannels, numSamples);
     writeBlock (inputBuffer);
 
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 }

Tests/Processors/DataThreadTests.cpp

@@ -115,11 +115,11 @@ class DataThreadTests : public testing::Test
 
 TEST_F(DataThreadTests, DataIntegrity)
 {
-    tester->startAcquisition(false);
+    processor->startAcquisition();
 
     int numSamples = 100;
     auto inputBuffer = createBuffer(1000.0, 20.0, 5, numSamples);
     writeBlock(inputBuffer);
 
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 }

Tests/Processors/RecordNodeTests.cpp

@@ -220,14 +220,14 @@ class RecordNodeTests :  public testing::Test {
 
 TEST_F(RecordNodeTests, TestInputOutput_Continuous_Single) {
     int numSamples = 100;
-    tester->startAcquisition(true);
+    processor->startAcquisition();
 
     auto inputBuffer = createBuffer(1000.0, 20.0, numChannels, numSamples);
     writeBlock(inputBuffer);
 
     // The record node always flushes its pending writes when stopping acquisition, so we don't need to sleep before
     // stopping.
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 
     std::vector<int16_t> persistedData;
     loadContinuousDatFile(&persistedData);
@@ -245,7 +245,7 @@ TEST_F(RecordNodeTests, TestInputOutput_Continuous_Single) {
 }
 
 TEST_F(RecordNodeTests, TestInputOutput_Continuous_Multiple) {
-    tester->startAcquisition(true);
+    processor->startAcquisition();
 
     int numSamplesPerBlock = 100;
     int numBlocks = 8;
@@ -256,7 +256,7 @@ TEST_F(RecordNodeTests, TestInputOutput_Continuous_Multiple) {
         inputBuffers.push_back(inputBuffer);
     }
 
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 
     std::vector<int16_t> persistedData;
     loadContinuousDatFile(&persistedData);
@@ -277,8 +277,8 @@ TEST_F(RecordNodeTests, TestInputOutput_Continuous_Multiple) {
 }
 
 TEST_F(RecordNodeTests, TestEmpty) {
-    tester->startAcquisition(true);
-    tester->stopAcquisition();
+    processor->startAcquisition();
+    processor->stopAcquisition();
 
     std::vector<int16_t> persistedData;
     loadContinuousDatFile(&persistedData);
@@ -287,7 +287,7 @@ TEST_F(RecordNodeTests, TestEmpty) {
 
 TEST_F(RecordNodeTests, TestClipsProperly) {
     int numSamples = 100;
-    tester->startAcquisition(true);
+    processor->startAcquisition();
 
     // The min value is actually -32767, not -32768 like the "true" min
     std::vector<AudioBuffer<float>> inputBuffers;
@@ -301,7 +301,7 @@ TEST_F(RecordNodeTests, TestClipsProperly) {
     writeBlock(inputBuffer);
     inputBuffers.push_back(inputBuffer);
 
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 
     std::vector<int16_t> persistedData;
     loadContinuousDatFile(&persistedData);
@@ -341,10 +341,10 @@ class CustomBitVolts_RecordNodeTests : public RecordNodeTests {
 
 TEST_F(CustomBitVolts_RecordNodeTests, Test_RespectsBitVolts) {
     int numSamples = 100;
-    tester->startAcquisition(true);
+    processor->startAcquisition();
     auto inputBuffer = createBuffer(1000.0, 20.0, numChannels, numSamples);
     writeBlock(inputBuffer);
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 
     std::vector<int16_t> persistedData;
     loadContinuousDatFile(&persistedData);
@@ -370,7 +370,7 @@ TEST_F(CustomBitVolts_RecordNodeTests, Test_RespectsBitVolts) {
 }
 
 TEST_F(RecordNodeTests, Test_PersistsSampleNumbersAndTimestamps) {
-    tester->startAcquisition(true);
+    processor->startAcquisition();
 
     int numSamples = 5;
     for (int i = 0; i < 3; i++) {
@@ -417,7 +417,7 @@ TEST_F(RecordNodeTests, Test_PersistsSampleNumbersAndTimestamps) {
 }
 
 TEST_F(RecordNodeTests, Test_PersistsStructureOeBin) {
-    tester->startAcquisition(true);
+    processor->startAcquisition();
 
     int numSamples = 5;
     for (int i = 0; i < 3; i++) {
@@ -479,7 +479,7 @@ TEST_F(RecordNodeTests, Test_PersistsEvents) {
     processor->setRecordEvents(true);
     processor->updateSettings();
 
-    tester->startAcquisition(true);
+    processor->startAcquisition();
     int numSamples = 5;
 
     auto streamId = processor->getDataStreams()[0]->getStreamId();
@@ -492,7 +492,7 @@ TEST_F(RecordNodeTests, Test_PersistsEvents) {
         true);
     auto inputBuffer = createBuffer(1000.0, 20.0, numChannels, numSamples);
     writeBlock(inputBuffer, eventPtr.get());
-    tester->stopAcquisition();
+    processor->stopAcquisition();
 
     std::filesystem::path sampleNumbersPath;
     ASSERT_TRUE(eventsPathFor("sample_numbers.npy", &sampleNumbersPath));

Tests/Processors/SourceNodeTests.cpp

@@ -127,11 +127,11 @@ This test verifies that given a Data Thread, the Source Node will perform this w
 */
 TEST_F(SourceNodeTests, DataAcquisition)
 {
-    tester->startAcquisition(false);
+    tester->getSourceNode()->startAcquisition();
 
     int numSamples = 100;
     auto inputBuffer = createBuffer(1000.0, 20.0, 5, numSamples);
     writeBlock(inputBuffer);
 
-    tester->stopAcquisition();
+    tester->getSourceNode()->stopAcquisition();
 }

Tests/TestHelpers/include/TestFixtures.h

@@ -79,9 +79,9 @@ class ProcessorTester
         LookAndFeel::setDefaultLookAndFeel (customLookAndFeel.get());
 
         // All of these sets the global state in AccessClass in their constructors
-        audioComponent = std::make_unique<AudioComponent>();
+        //audioComponent = std::make_unique<AudioComponent>();
         processorGraph = std::make_unique<ProcessorGraph> (true);
-        controlPanel = std::make_unique<ControlPanel> (processorGraph.get(), audioComponent.get(), true);
+        //controlPanel = std::make_unique<ControlPanel> (processorGraph.get(), audioComponent.get(), true);
 
         SourceNode* snTemp = sourceNodeBuilder.buildSourceNode();
         sourceNodeId = nextProcessorId++;
@@ -97,12 +97,12 @@ class ProcessorTester
         sn->initialize (false);
         sn->setDestNode (nullptr);
 
-        controlPanel->updateRecordEngineList();
+        //controlPanel->updateRecordEngineList();
 
         // Refresh everything
         processorGraph->updateSettings (sn);
 
-        controlPanel->colourChanged();
+        //controlPanel->colourChanged();
     }
 
     virtual ~ProcessorTester()