rkcf
/
wtpp
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Activity

Fix: correct cmake linkage issue, fixes #19 

Refs: #19
pull/20/head
rkcf 2023-02-28 10:30:08 -06:00
parent 06e144f075
commit 010a9d2296
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -28,8 +28,8 @@ add_executable(wavetable_test tests/wavetable_test.cpp)
add_executable(generators_test tests/generators_test.cpp) add_executable(generators_test tests/generators_test.cpp)
target_link_libraries(wtpp_test GTest::gtest_main) target_link_libraries(wtpp_test GTest::gtest_main)
target_link_libraries(wave_test GTest::gtest_main) target_link_libraries(wave_test wave GTest::gtest_main)
target_link_libraries(wavetable_test GTest::gtest_main) target_link_libraries(wavetable_test wave wavetable GTest::gtest_main)
target_link_libraries(generators_test generators GTest::gtest_main) target_link_libraries(generators_test generators GTest::gtest_main)
include(GoogleTest) include(GoogleTest)

3
tests/wave_test.cpp
View File

@ -1,9 +1,6 @@
#include "../src/wave.h" #include "../src/wave.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Initialize index at 0 for wave cycles
uint16_t Wave::m_nid = 0;
TEST(Wave, DefaultConstructor) TEST(Wave, DefaultConstructor)
{ {
Wave w1, w2; Wave w1, w2;

12
tests/wavetable_test.cpp
View File

@ -1,10 +1,6 @@
#include "../src/wavetable.h" #include "../src/wavetable.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Initialize index at 0 for wave cycles
uint16_t Wave::m_nid = 0;
uint16_t Wavetable::m_nid = 0;
TEST(Wavetable, DefaultConstructor) TEST(Wavetable, DefaultConstructor)
{ {
Wavetable w1("PPG"), w2("!PPG"); Wavetable w1("PPG"), w2("!PPG");
@ -13,7 +9,7 @@ TEST(Wavetable, DefaultConstructor)
EXPECT_EQ(w2.getId(), 1); EXPECT_EQ(w2.getId(), 1);
// Check name is correct // Check name is correct
// std::string name = w1.name(); // std::string name = w1.name();
// EXPECT_EQ(name, "PPG"); EXPECT_EQ(w1.name(), "0: PPG");
} }
TEST(Wavetable, CopyConstructor) { TEST(Wavetable, CopyConstructor) {
@ -22,8 +18,7 @@ TEST(Wavetable, CopyConstructor) {
// Check id is correct // Check id is correct
EXPECT_EQ(w2.getId(), 0); EXPECT_EQ(w2.getId(), 0);
// Sample name is correct // Sample name is correct
// std::string name = w2.name(); EXPECT_EQ(w2.name(), "0: PPG");
// EXPECT_EQ(name, "PPG");
} }
TEST(Wavetable, CopyAssignment) { TEST(Wavetable, CopyAssignment) {
@ -32,6 +27,5 @@ TEST(Wavetable, CopyAssignment) {
// Check id is correct // Check id is correct
EXPECT_EQ(w2.getId(), 0); EXPECT_EQ(w2.getId(), 0);
// Check name is correct // Check name is correct
// std::string name = w2.name(); EXPECT_EQ(w2.name(), "0: PPG");
// EXPECT_EQ(name, "PPG");
} }