Clean up some tests.

test/audio/CMakeLists.txt

@@ -1,10 +1,22 @@
-set(AUDIO_UNIT_TEST_FILES 
-        audio/TestAudioWriter.cpp
-        audio/TestMidiReader.cpp
-    PARENT_SCOPE
-    )
-    
-set(AUDIO_UNIT_TEST_DEPENDENCIES 
-        audio
-    PARENT_SCOPE
-    )
+set(MODULE_NAME audio)
+
+set(UNIT_TESTS
+        ${MODULE_NAME}/unit/TestAudioWriter.cpp
+        ${MODULE_NAME}/unit/TestMidiReader.cpp
+)
+
+if(UNIX)
+set(INTEGETATION_TESTS
+        ${MODULE_NAME}/integration/TestAlsaInterface.cpp
+)
+else()
+set(INTEGETATION_TESTS
+        ${MODULE_NAME}/integration/TestWasapiInterface.cpp
+)
+endif()
+
+set(AUDIO_UNIT_TEST_FILES ${UNIT_TESTS} PARENT_SCOPE) 
+set(AUDIO_INTEGRATION_TEST_FILES ${INTEGETATION_TESTS} PARENT_SCOPE) 
+  
+set(AUDIO_UNIT_TEST_DEPENDENCIES ${MODULE_NAME} PARENT_SCOPE)  
+set(AUDIO_INTEGRATION_TEST_DEPENDENCIES ${MODULE_NAME} PARENT_SCOPE)

test/audio/TestAudioWriter.cpp

@@ -1,34 +0,0 @@
-#include "AudioSample.h"
-#include "AudioSynth.h"
-#include "AudioWriter.h"
-#include "WasapiInterface.h"
-
-#include "TestFramework.h"
-
-#include <memory>
-#include <string>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <iostream>
-
-TEST_CASE(TestWriteWav, "audio")
-{
-    AudioWriter writer;
-    writer.SetPath("test.wav");
-
-    AudioSynth synth;
-    auto sample = synth.GetSineWave(240, 5);
-
-    writer.Write(sample);
-};
-
-TEST_CASE(TestAudioRender, "audio")
-{
-
-#ifdef _WIN32
-        WasapiInterface audio_interface;
-        auto device = AudioDevice::Create();
-        audio_interface.Play(device);
-#endif
-};

test/audio/TestMidiReader.cpp

@@ -1,16 +0,0 @@
-#include "MidiReader.h"
-
-#include "TestFramework.h"
-
-#include <memory>
-#include <string>
-#include <iostream>
-
-TEST_CASE(TestReadMidi, "audio")
-{
-    MidiReader reader;
-    reader.Read("/home/jmsgrogan/Downloads/test.mid");
-
-    auto document = reader.GetDocument();
-    // std::cout << document->Serialize() << std::endl;
-};

test/audio/integration/TestWasapiInterface.cpp

@@ -0,0 +1,13 @@
+#include "TestFramework.h"
+#include "TestUtils.h"
+
+#include "AudioSample.h"
+#include "AudioSynth.h"
+#include "WasapiInterface.h"
+
+TEST_CASE(TestWasapiInterface, "audio")
+{
+    WasapiInterface audio_interface;
+    auto device = AudioDevice::Create();
+    audio_interface.Play(device);
+};

test/audio/unit/TestAudioWriter.cpp

@@ -0,0 +1,17 @@
+#include "TestFramework.h"
+#include "TestUtils.h"
+
+#include "AudioSample.h"
+#include "AudioSynth.h"
+#include "AudioWriter.h"
+
+TEST_CASE(TestAudioWriterWav, "audio")
+{
+    AudioWriter writer;
+    writer.setPath(TestUtils::getTestOutputDir() / "TestAudioWriterWav.wav");
+
+    AudioSynth synth;
+    const auto sample = synth.getSineWave(240, 5);
+
+    writer.write(sample);
+};

test/audio/unit/TestMidiReader.cpp

@@ -0,0 +1,12 @@
+#include "MidiReader.h"
+
+#include "TestFramework.h"
+#include "TestUtils.h"
+
+TEST_CASE(TestReadMidi, "audio")
+{
+    MidiReader reader;
+    reader.read(TestUtils::getTestDataDir() / "test.mid");
+
+    auto document = reader.getDocument();
+};