Unit tests

CMakeLists.txt

@@ -149,7 +149,7 @@ macro(_opendspx_add_library identifier)
     set_target_properties(${OPENDSPX_${IDENTIFIER}_TARGET} PROPERTIES EXPORT_NAME ${identifier})
 
     # Add sources
-    file(GLOB_RECURSE _src include/opendspx${identifier}/*.h src/${identifier}/*.h src/${identifier}/*.cpp)
+    file(GLOB_RECURSE _src include/opendspx/${identifier}/*.h src/${identifier}/*.h src/${identifier}/*.cpp)
     target_sources(${OPENDSPX_${IDENTIFIER}_TARGET} PRIVATE ${_src})
 
     # Add features
@@ -162,7 +162,7 @@ macro(_opendspx_add_library identifier)
     target_include_directories(${OPENDSPX_${IDENTIFIER}_TARGET} PUBLIC
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     )
-    target_include_directories(${OPENDSPX_${IDENTIFIER}_TARGET} PRIVATE include/opendspx${identifier})
+    target_include_directories(${OPENDSPX_${IDENTIFIER}_TARGET} PRIVATE include/opendspx/${identifier})
 
     target_link_libraries(${OPENDSPX_${IDENTIFIER}_TARGET} PUBLIC ${OPENDSPX_MODEL_TARGET})
     target_link_libraries(${OPENDSPX_${IDENTIFIER}_TARGET} PRIVATE stdcorelib::stdcorelib)
@@ -202,6 +202,7 @@ if (OPENDSPX_BUILD_CONVERTER)
 endif()
 
 if (OPENDSPX_BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif ()
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023-2024 Team OpenVPI
+   Copyright 2023-present Team OpenVPI
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -17,6 +17,7 @@ Build-time dependencies:
 - `stdcorelib`
 - `zstd` for the serializer module
 - `wolf-midi` for the converter module
+- `boost-test` for the test suite
 
 The project is currently configured for Windows and other CMake-supported platforms.
 
@@ -32,7 +33,7 @@ cmake --build build
 Useful options:
 
 - `OPENDSPX_BUILD_STATIC`: build static libraries instead of shared libraries
-- `OPENDSPX_BUILD_TESTS`: build the test executable
+- `OPENDSPX_BUILD_TESTS`: build the test suite
 - `OPENDSPX_BUILD_INTERPOLATOR`: build the interpolator interface library
 - `OPENDSPX_BUILD_SERIALIZER`: build the serializer library
 - `OPENDSPX_BUILD_CONVERTER`: build the converter library
@@ -59,7 +60,7 @@ The public API provides helpers for:
 Example:
 
 ```cpp
-#include <opendspxinterpolator/interpolator.h>
+#include <opendspx/interpolator/interpolator.h>
 
 using opendspx::Interpolator;
 
@@ -77,7 +78,7 @@ Use `opendspx::Serializer` to convert between `Model` and DSPX data streams.
 ```cpp
 #include <fstream>
 #include <opendspx/model.h>
-#include <opendspxserializer/serializer.h>
+#include <opendspx/serializer/serializer.h>
 
 using namespace opendspx;
 
@@ -100,7 +101,7 @@ Use `opendspx::Converter` to convert between DSPX data and other formats.
 
 ```cpp
 #include <fstream>
-#include <opendspxconverter/midi/midiconverter.h>
+#include <opendspx/converter/midi/midiconverter.h>
 
 using namespace opendspx;
 
@@ -131,12 +132,23 @@ int main() {
 ## Project Structure
 
 - `include/opendspx/`: public model headers
-- `include/opendspxinterpolator/`: interpolator API
-- `include/opendspxserializer/`: serializer API
-- `include/opendspxconverter/`: converter API
+- `include/opendspx/interpolator/`: interpolator API
+- `include/opendspx/serializer/`: serializer API
+- `include/opendspx/converter/`: converter API
 - `src/serializer/`: serializer implementation
 - `src/converter/`: converter implementation, currently focused on MIDI
-- `tests/`: usage tests
+- `tests/auto/`: the regression suite, one directory per module
+
+## Tests
+
+Configure with `-DOPENDSPX_BUILD_TESTS=ON` and point CMake at Boost.Test, then:
+
+```bash
+ctest --test-dir build --output-on-failure --no-tests=error
+```
+
+The whole suite is one binary, so a single case can be run on its own with
+`test_auto --run_test=<suite>/<case>`.
 
 ## License
 

include/opendspx/anchornode.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_ANCHORNODE_H
-#define OPENDSPX_MODEL_ANCHORNODE_H
+#ifndef OPENDSPX_ANCHORNODE_H
+#define OPENDSPX_ANCHORNODE_H
 
 namespace opendspx {
 
@@ -16,4 +16,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_ANCHORNODE_H
+#endif //OPENDSPX_ANCHORNODE_H

include/opendspx/audioclip.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_AUDIOCLIP_H
-#define OPENDSPX_MODEL_AUDIOCLIP_H
+#ifndef OPENDSPX_AUDIOCLIP_H
+#define OPENDSPX_AUDIOCLIP_H
 
 #include <opendspx/clip.h>
 
@@ -18,4 +18,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_AUDIOCLIP_H
+#endif //OPENDSPX_AUDIOCLIP_H

include/opendspx/buscontrol.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_BUSCONTROL_H
-#define OPENDSPX_MODEL_BUSCONTROL_H
+#ifndef OPENDSPX_BUSCONTROL_H
+#define OPENDSPX_BUSCONTROL_H
 
 namespace opendspx {
 
@@ -11,4 +11,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_BUSCONTROL_H
+#endif //OPENDSPX_BUSCONTROL_H

include/opendspx/clip.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_CLIP_H
-#define OPENDSPX_MODEL_CLIP_H
+#ifndef OPENDSPX_CLIP_H
+#define OPENDSPX_CLIP_H
 
 #include <memory>
 #include <string>
@@ -32,4 +32,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_CLIP_H
+#endif //OPENDSPX_CLIP_H

include/opendspx/cliptime.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_CLIPTIME_H
-#define OPENDSPX_MODEL_CLIPTIME_H
+#ifndef OPENDSPX_CLIPTIME_H
+#define OPENDSPX_CLIPTIME_H
 
 namespace opendspx {
 
@@ -12,4 +12,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_CLIPTIME_H
+#endif //OPENDSPX_CLIPTIME_H

include/opendspx/content.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_CONTENT_H
-#define OPENDSPX_MODEL_CONTENT_H
+#ifndef OPENDSPX_CONTENT_H
+#define OPENDSPX_CONTENT_H
 
 #include <vector>
 
@@ -21,4 +21,4 @@ namespace opendspx{
 
 }
 
-#endif //OPENDSPX_MODEL_CONTENT_H
+#endif //OPENDSPX_CONTENT_H

include/opendspx/controlpoint.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_CONTROLPOINT_H
-#define OPENDSPX_MODEL_CONTROLPOINT_H
+#ifndef OPENDSPX_CONTROLPOINT_H
+#define OPENDSPX_CONTROLPOINT_H
 
 namespace opendspx {
 
@@ -10,4 +10,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_CONTROLPOINT_H
+#endif //OPENDSPX_CONTROLPOINT_H

include/opendspxconverter/midi/midiconverter.h → include/opendspx/converter/midi/midiconverter.h

@@ -1,11 +1,11 @@
-#ifndef OPENDSPX_CONVERTER_MIDICONVERTER_H
-#define OPENDSPX_CONVERTER_MIDICONVERTER_H
+#ifndef OPENDSPX_CONVERTER_MIDI_MIDICONVERTER_H
+#define OPENDSPX_CONVERTER_MIDI_MIDICONVERTER_H
 
 #include <iosfwd>
 #include <functional>
 #include <string>
 
-#include <opendspxconverter/opendspxconverterglobal.h>
+#include <opendspx/converter/opendspxconverterglobal.h>
 
 namespace opendspx {
 
@@ -43,4 +43,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_CONVERTER_MIDICONVERTER_H
+#endif //OPENDSPX_CONVERTER_MIDI_MIDICONVERTER_H

include/opendspxconverter/midi/midiintermediatedata.h → include/opendspx/converter/midi/midiintermediatedata.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_CONVERTER_MIDIINTERMEDIATEDATA_H
-#define OPENDSPX_CONVERTER_MIDIINTERMEDIATEDATA_H
+#ifndef OPENDSPX_CONVERTER_MIDI_MIDIINTERMEDIATEDATA_H
+#define OPENDSPX_CONVERTER_MIDI_MIDIINTERMEDIATEDATA_H
 
 #include <algorithm>
 #include <string>
@@ -101,4 +101,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_CONVERTER_MIDIINTERMEDIATEDATA_H
+#endif //OPENDSPX_CONVERTER_MIDI_MIDIINTERMEDIATEDATA_H

include/opendspx/dynamicmixinganchor.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_DYNAMICMIXINGANCHOR_H
-#define OPENDSPX_MODEL_DYNAMICMIXINGANCHOR_H
+#ifndef OPENDSPX_DYNAMICMIXINGANCHOR_H
+#define OPENDSPX_DYNAMICMIXINGANCHOR_H
 
 #include <opendspx/sourcemixingratio.h>
 
@@ -12,4 +12,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_DYNAMICMIXINGANCHOR_H
+#endif //OPENDSPX_DYNAMICMIXINGANCHOR_H

include/opendspx/global.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_GLOBAL_H
-#define OPENDSPX_MODEL_GLOBAL_H
+#ifndef OPENDSPX_GLOBAL_H
+#define OPENDSPX_GLOBAL_H
 
 #include <string>
 
@@ -15,4 +15,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_GLOBAL_H
+#endif //OPENDSPX_GLOBAL_H

include/opendspxinterpolator/parameterinterpolator.h → include/opendspx/interpolator/parameterinterpolator.h

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <opendspx/anchornode.h>
-#include <opendspxinterpolator/interpolator.h>
+#include <opendspx/interpolator/interpolator.h>
 
 namespace opendspx {
 

include/opendspx/label.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_LABEL_H
-#define OPENDSPX_MODEL_LABEL_H
+#ifndef OPENDSPX_LABEL_H
+#define OPENDSPX_LABEL_H
 
 #include <string>
 
@@ -12,4 +12,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_LABEL_H
+#endif //OPENDSPX_LABEL_H

include/opendspx/master.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_MASTER_H
-#define OPENDSPX_MODEL_MASTER_H
+#ifndef OPENDSPX_MASTER_H
+#define OPENDSPX_MASTER_H
 
 #include <opendspx/buscontrol.h>
 
@@ -11,4 +11,4 @@ namespace opendspx{
 
 }
 
-#endif //OPENDSPX_MODEL_MASTER_H
+#endif //OPENDSPX_MASTER_H

include/opendspx/mixedsinger.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_MIXEDSINGER_H
-#define OPENDSPX_MODEL_MIXEDSINGER_H
+#ifndef OPENDSPX_MIXEDSINGER_H
+#define OPENDSPX_MIXEDSINGER_H
 
 #include <utility>
 #include <vector>
@@ -22,4 +22,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_MIXEDSINGER_H
+#endif //OPENDSPX_MIXEDSINGER_H

include/opendspx/model.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_MODEL_H
-#define OPENDSPX_MODEL_MODEL_H
+#ifndef OPENDSPX_MODEL_H
+#define OPENDSPX_MODEL_H
 
 #include <opendspx/content.h>
 
@@ -15,4 +15,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_MODEL_H
+#endif //OPENDSPX_MODEL_H

include/opendspx/note.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_NOTE_H
-#define OPENDSPX_MODEL_NOTE_H
+#ifndef OPENDSPX_NOTE_H
+#define OPENDSPX_NOTE_H
 
 #include <string>
 
@@ -25,4 +25,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_NOTE_H
+#endif //OPENDSPX_NOTE_H

include/opendspx/param.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_PARAM_H
-#define OPENDSPX_MODEL_PARAM_H
+#ifndef OPENDSPX_PARAM_H
+#define OPENDSPX_PARAM_H
 
 #include <vector>
 
@@ -17,4 +17,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_PARAM_H
+#endif //OPENDSPX_PARAM_H

include/opendspx/paramcurve.h

@@ -1,5 +1,5 @@
-#ifndef OPENDSPX_MODEL_PARAMCURVE_H
-#define OPENDSPX_MODEL_PARAMCURVE_H
+#ifndef OPENDSPX_PARAMCURVE_H
+#define OPENDSPX_PARAMCURVE_H
 
 #include <memory>
 
@@ -23,4 +23,4 @@ namespace opendspx {
 
 }
 
-#endif //OPENDSPX_MODEL_PARAMCURVE_H
+#endif //OPENDSPX_PARAMCURVE_H