Refactor WinMLAPI Tests to build both google and taef test based on p…

…reprocessor definition (#2829) * Add winml macro wrappers on top of google test macros * change test methods to disabled * Add custom winml macros for both taef and google tests * PR comments * Refactor winml api tests * Move additional gtest specific macro definition into googleTestMacros.h
microsoft · Jan 15, 2020 · dcdebb4 · dcdebb4
1 parent dbe7d97
commit dcdebb4
Show file tree

Hide file tree

Showing 11 changed files with 723 additions and 512 deletions.
diff --git a/cmake/winml_unittests.cmake b/cmake/winml_unittests.cmake
@@ -69,6 +69,7 @@ add_winml_test(
   SOURCES ${winml_test_api_src}
   LIBS winml_test_common
 )
+target_compile_definitions(winml_test_api PRIVATE BUILD_GOOGLE_TEST)
 target_precompiled_header(winml_test_api testPch.h)
 
 if (onnxruntime_USE_DML)

diff --git a/winml/test/api/APITest.h b/winml/test/api/APITest.h
@@ -5,37 +5,25 @@
 //-----------------------------------------------------------------------------
 
 #pragma once
+#include "fileHelpers.h"
+namespace APITest {
+static void LoadModel(const std::wstring& modelPath,
+                      winrt::Windows::AI::MachineLearning::LearningModel& learningModel) {
+  std::wstring fullPath = FileHelpers::GetModulePath() + modelPath;
+  learningModel = winrt::Windows::AI::MachineLearning::LearningModel::LoadFromFilePath(fullPath);
+};
 
-#include <gtest/gtest.h>
-
-class APITest : public ::testing::Test
-{
-protected:
-    void LoadModel(const std::wstring& modelPath)
-    {
-        std::wstring fullPath = FileHelpers::GetModulePath() + modelPath;
-        m_model = winrt::Windows::AI::MachineLearning::LearningModel::LoadFromFilePath(fullPath);
-    }
-
-    winrt::Windows::AI::MachineLearning::LearningModel m_model = nullptr;
-    winrt::Windows::AI::MachineLearning::LearningModelDevice m_device = nullptr;
-    winrt::Windows::AI::MachineLearning::LearningModelSession m_session = nullptr;
-
-    uint64_t GetAdapterIdQuadPart()
-    {
-        LARGE_INTEGER id;
-        id.LowPart = m_device.AdapterId().LowPart;
-        id.HighPart = m_device.AdapterId().HighPart;
-        return id.QuadPart;
-    };
-
-    _LUID GetAdapterIdAsLUID()
-    {
-        _LUID id;
-        id.LowPart = m_device.AdapterId().LowPart;
-        id.HighPart = m_device.AdapterId().HighPart;
-        return id;
-    }
-
-    bool m_runGPUTests = true;
+static uint64_t GetAdapterIdQuadPart(winrt::Windows::AI::MachineLearning::LearningModelDevice& device) {
+  LARGE_INTEGER id;
+  id.LowPart = device.AdapterId().LowPart;
+  id.HighPart = device.AdapterId().HighPart;
+  return id.QuadPart;
 };
+
+static _LUID GetAdapterIdAsLUID(winrt::Windows::AI::MachineLearning::LearningModelDevice& device) {
+  _LUID id;
+  id.LowPart = device.AdapterId().LowPart;
+  id.HighPart = device.AdapterId().HighPart;
+  return id;
+}
+};  // namespace APITest