diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json index 0c8975e..c1c984d 100644 --- a/.wpilib/wpilib_preferences.json +++ b/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2019", - "teamNumber": 0 + "projectYear": "2020", + "teamNumber": 9999 } diff --git a/build.gradle b/build.gradle index 6cef0a9..56d1170 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ plugins { id 'cpp' id 'java' + id 'google-test' id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2' id 'edu.wpi.first.NativeUtils' version '2020.7.4' - id 'edu.wpi.first.GradleJni' version '0.10.1' + id 'edu.wpi.first.GradleJni' version '0.11.0' id 'edu.wpi.first.GradleVsCode' version '0.12.0' } @@ -84,7 +85,34 @@ model { } } - nativeUtils.useRequiredLibrary(it, "driver_shared") + nativeUtils.useRequiredLibrary(it, "driver_shared") + } + } + testSuites { + VendorTest { + sources.cpp { + source { + srcDir 'src/test/native/cpp' + include '**/*.cpp' + } + } + + binaries.all { + lib library: 'VendorDriver', linkage: 'shared' + } + + nativeUtils.useRequiredLibrary(it, "wpilib_executable_shared", "googletest_static") + } + + VendorDriverTest { + sources.cpp { + source { + srcDir 'src/test/driver/cpp' + include '**/*.cpp' + } + } + + nativeUtils.useRequiredLibrary(it, "wpilib_executable_shared", "googletest_static") } } } diff --git a/src/test/driver/cpp/main.cpp b/src/test/driver/cpp/main.cpp new file mode 100644 index 0000000..d0e7d22 --- /dev/null +++ b/src/test/driver/cpp/main.cpp @@ -0,0 +1,6 @@ +#include "gtest/gtest.h" + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/src/test/native/cpp/main.cpp b/src/test/native/cpp/main.cpp new file mode 100644 index 0000000..d0e7d22 --- /dev/null +++ b/src/test/native/cpp/main.cpp @@ -0,0 +1,6 @@ +#include "gtest/gtest.h" + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +}