Skip to content

testUtils plugin #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 6, 2021
Merged

testUtils plugin #908

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9d36af8
testUtils plugin
CedricGuillemetMS Oct 5, 2021
830b339
other platforms
CedricGuillemetMS Oct 5, 2021
d8ebb8b
more fixes
CedricGuillemetMS Oct 5, 2021
f9f97a2
fixes
CedricGuillemetMS Oct 5, 2021
d215abc
fixes
CedricGuillemetMS Oct 5, 2021
44beaff
platform data abstraction
CedricGuillemetMS Oct 5, 2021
3586948
typo
CedricGuillemetMS Oct 5, 2021
f787fef
Apple build
CedricGuillemet Oct 5, 2021
9cfaab8
conflicts
CedricGuillemet Oct 5, 2021
db8c8d6
android build
CedricGuillemetMS Oct 5, 2021
23bee1e
Merge branch 'testUtilsPlugin' of https://github.com/CedricGuillemet/…
CedricGuillemetMS Oct 5, 2021
ba619b3
uwp build
CedricGuillemetMS Oct 5, 2021
7b3714f
ios build
CedricGuillemet Oct 5, 2021
f3c7025
removed empty space
CedricGuillemetMS Oct 6, 2021
c5e21d9
Merge branch 'testUtilsPlugin' of https://github.com/CedricGuillemet/…
CedricGuillemetMS Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Apps/ValidationTests/Android/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ add_subdirectory(${BABYLON_NATIVE_VALIDATIONTESTS_DIR}/../../ ${BABYLON_NATIVE_V
add_library(BabylonNativeJNI SHARED
src/main/cpp/BabylonNativeJNI.cpp)

target_include_directories(BabylonNativeJNI
PRIVATE
${BABYLON_NATIVE_VALIDATIONTESTS_DIR}/Shared)

add_definitions(-DANDROID_STL=c++_shared)

target_link_libraries(BabylonNativeJNI
Expand All @@ -65,7 +61,8 @@ target_link_libraries(BabylonNativeJNI
Window
ScriptLoader
bgfx
XMLHttpRequest)
XMLHttpRequest
TestUtils)

configure_file(
"${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so"
Expand Down
4 changes: 2 additions & 2 deletions Apps/ValidationTests/Android/app/src/main/cpp/BabylonNativeJNI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include <Babylon/Plugins/NativeEngine.h>
#include <Babylon/Plugins/NativeOptimizations.h>
#include <Babylon/Plugins/NativeXr.h>
#include <Babylon/Plugins/TestUtils.h>
#include <Babylon/Polyfills/Console.h>
#include <Babylon/Polyfills/Window.h>
#include <Babylon/Polyfills/XMLHttpRequest.h>
#include <TestUtils.h>

namespace
{
Expand Down Expand Up @@ -103,7 +103,7 @@ extern "C"

Babylon::Polyfills::XMLHttpRequest::Initialize(env);

Babylon::TestUtils::CreateInstance(env, window);
Babylon::Plugins::TestUtils::Initialize(env, window);
Copy link
Contributor

@darraghjburke darraghjburke Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: extra space

});

g_scriptLoader = std::make_unique<Babylon::ScriptLoader>(*g_runtime);
Expand Down
9 changes: 3 additions & 6 deletions Apps/ValidationTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ if(WINDOWS_STORE)
set_property(SOURCE ${APPX_ASSETS} PROPERTY VS_DEPLOYMENT_CONTENT 1)
set_property(SOURCE ${APPX_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets")
set(SOURCES
"Shared/TestUtils.h"
${APPX_FILES}
${APPX_ASSETS}
"UWP/App.cpp"
Expand All @@ -42,7 +41,6 @@ if(WINDOWS_STORE)
add_executable(ValidationTests WIN32 ${REFERENCE_IMAGES} ${BABYLON_SCRIPTS} ${SCRIPTS} ${SOURCES} ${RESOURCE_FILES})
elseif(WIN32)
set(SOURCES
"Shared/TestUtils.h"
"Win32/App.cpp"
"Win32/App.h"
"Win32/App.ico"
Expand All @@ -66,8 +64,7 @@ elseif(APPLE)
"iOS/AppDelegate.swift"
"iOS/ViewController.swift"
"iOS/LibNativeBridge.h"
"iOS/LibNativeBridge.mm"
"Shared/TestUtils.h")
"iOS/LibNativeBridge.mm")
set_source_files_properties(${SCRIPTS} ${BABYLON_SCRIPTS} PROPERTIES MACOSX_PACKAGE_LOCATION "Scripts")
set_source_files_properties(${REFERENCE_IMAGES} PROPERTIES MACOSX_PACKAGE_LOCATION "ReferenceImages")
else()
Expand All @@ -79,8 +76,7 @@ elseif(APPLE)
"macOS/AppDelegate.mm"
"macOS/AppDelegate.h"
"macOS/ViewController.mm"
"macOS/ViewController.h"
"Shared/TestUtils.h")
"macOS/ViewController.h")
set_source_files_properties(${SCRIPTS} ${BABYLON_SCRIPTS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/Scripts")
set_source_files_properties(${REFERENCE_IMAGES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/ReferenceImages")
endif()
Expand Down Expand Up @@ -124,6 +120,7 @@ target_link_to_dependencies(ValidationTests
PRIVATE Window
PRIVATE ScriptLoader
PRIVATE Canvas
PRIVATE TestUtils
${ADDITIONAL_LIBRARIES}
PRIVATE XMLHttpRequest)

Expand Down
260 changes: 0 additions & 260 deletions Apps/ValidationTests/Shared/TestUtils.h
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions Apps/ValidationTests/UWP/App.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <Babylon/Plugins/NativeEngine.h>
#include <Babylon/Plugins/NativeOptimizations.h>
#include <Babylon/Plugins/NativeXr.h>
#include <Babylon/Plugins/TestUtils.h>
#include <Babylon/Polyfills/Console.h>
#include <Babylon/Polyfills/Window.h>
#include <Babylon/Polyfills/Canvas.h>
Expand All @@ -15,8 +16,6 @@

#include <winrt/windows.ui.core.h>

#include <Shared/TestUtils.h>

using namespace Windows::ApplicationModel;
using namespace Windows::ApplicationModel::Core;
using namespace Windows::ApplicationModel::Activation;
Expand Down Expand Up @@ -218,7 +217,7 @@ void App::RestartRuntime(Windows::Foundation::Rect bounds)

Babylon::Plugins::NativeXr::Initialize(env);

Babylon::TestUtils::CreateInstance(env, windowPtr);
Babylon::Plugins::TestUtils::Initialize(env, windowPtr);
});

Babylon::ScriptLoader loader{*m_runtime};
Expand Down
Loading