Move os context tests to os interface tests

Change-Id: I409d988c6c561bca6fc6dcb0ff16583131f0cf5a
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2018-08-27 11:58:31 +02:00
committed by sys_ocldev
parent a807b9a90b
commit deab9a33cd
6 changed files with 28 additions and 80 deletions

View File

@@ -40,7 +40,6 @@ set(IGDRCL_SRCS_tests_os_interface_linux
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_linux.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_linux.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_linux.h
${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_time_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_time_test.cpp
${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux_tests.cpp

View File

@@ -1,34 +0,0 @@
/*
* Copyright (c) 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "runtime/os_interface/os_context.h"
#include "runtime/os_interface/os_interface.h"
#include "gtest/gtest.h"
namespace OCLRT {
TEST(OsContextTest, WhenOsContextIsCreatedThenImplIsAvailable) {
OSInterface osInterface;
auto osContext2 = std::make_unique<OsContext>(osInterface);
EXPECT_NE(nullptr, osContext2->get());
}
} // namespace OCLRT

View File

@@ -20,6 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "runtime/os_interface/os_context.h"
#include "runtime/os_interface/os_interface.h" #include "runtime/os_interface/os_interface.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
@@ -33,4 +34,10 @@ TEST(OsInterfaceTest, GivenLinuxOsInterfaceWhenDeviceHandleQueriedthenZeroIsRetu
OSInterface osInterface; OSInterface osInterface;
EXPECT_EQ(0u, osInterface.getDeviceHandle()); EXPECT_EQ(0u, osInterface.getDeviceHandle());
} }
TEST(OsContextTest, WhenOsContextIsCreatedThenImplIsAvailable) {
OSInterface osInterface;
auto osContext = std::make_unique<OsContext>(osInterface);
EXPECT_NE(nullptr, osContext->get());
}
} // namespace OCLRT } // namespace OCLRT

View File

@@ -35,7 +35,6 @@ set(IGDRCL_SRCS_tests_os_interface_windows
${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/os_context_win_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp

View File

@@ -1,44 +0,0 @@
/*
* Copyright (c) 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "unit_tests/os_interface/windows/wddm_fixture.h"
#include "runtime/os_interface/windows/os_context_win.h"
#include "runtime/os_interface/windows/os_interface.h"
TEST(OsContextTest, givenWddmWhenCreateOsContextBeforeInitWddmThenOsContextIsNotInitialized) {
auto wddm = new WddmMock;
OSInterface osInterface;
osInterface.get()->setWddm(wddm);
auto osContext = std::make_unique<OsContext>(osInterface);
EXPECT_NE(nullptr, osContext->get());
EXPECT_FALSE(osContext->get()->isInitialized());
}
TEST(OsContextTest, givenWddmWhenCreateOsContextAfterInitWddmThenOsContextIsInitialized) {
auto wddm = new WddmMock;
OSInterface osInterface;
osInterface.get()->setWddm(wddm);
wddm->init();
auto osContext = std::make_unique<OsContext>(osInterface);
EXPECT_NE(nullptr, osContext->get());
EXPECT_TRUE(osContext->get()->isInitialized());
}

View File

@@ -20,7 +20,9 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "runtime/os_interface/windows/os_context_win.h"
#include "unit_tests/os_interface/windows/os_interface_win_tests.h" #include "unit_tests/os_interface/windows/os_interface_win_tests.h"
#include "unit_tests/os_interface/windows/wddm_fixture.h"
TEST_F(OsInterfaceTest, givenOsInterfaceWithoutWddmWhenGetHwContextIdIsCalledThenReturnsZero) { TEST_F(OsInterfaceTest, givenOsInterfaceWithoutWddmWhenGetHwContextIdIsCalledThenReturnsZero) {
auto retVal = osInterface->getHwContextId(); auto retVal = osInterface->getHwContextId();
@@ -37,3 +39,22 @@ TEST_F(OsInterfaceTest, GivenWindowsWhenCreateEentIsCalledThenValidEventHandleIs
auto ret = osInterface->get()->closeHandle(ev); auto ret = osInterface->get()->closeHandle(ev);
EXPECT_EQ(TRUE, ret); EXPECT_EQ(TRUE, ret);
} }
TEST(OsContextTest, givenWddmWhenCreateOsContextBeforeInitWddmThenOsContextIsNotInitialized) {
auto wddm = new WddmMock;
OSInterface osInterface;
osInterface.get()->setWddm(wddm);
auto osContext = std::make_unique<OsContext>(osInterface);
EXPECT_NE(nullptr, osContext->get());
EXPECT_FALSE(osContext->get()->isInitialized());
}
TEST(OsContextTest, givenWddmWhenCreateOsContextAfterInitWddmThenOsContextIsInitialized) {
auto wddm = new WddmMock;
OSInterface osInterface;
osInterface.get()->setWddm(wddm);
wddm->init();
auto osContext = std::make_unique<OsContext>(osInterface);
EXPECT_NE(nullptr, osContext->get());
EXPECT_TRUE(osContext->get()->isInitialized());
}