Minor fixes (#85)

- Remove UWP tests to avoid confusion since they don't work
- Clean up the shared test code a bit
- Add SetConsoleOutputCP to Win32 test to get Unicode console output

Author: bghgary

CMakeLists.txt

@@ -128,6 +128,6 @@ endif()
 add_subdirectory(Core)
 add_subdirectory(Polyfills)
 
-if(JSRUNTIMEHOST_TESTS)
+if(JSRUNTIMEHOST_TESTS AND NOT WINDOWS_STORE)
     add_subdirectory(Tests)
 endif()

Tests/UnitTests/CMakeLists.txt

@@ -30,23 +30,6 @@ if(APPLE)
         set(SOURCES ${SOURCES}
             macOS/App.mm)
     endif()
-elseif(WINDOWS_STORE)
-    set(APPX_FILES "UWP/Package.appxmanifest" "UWP/TemporaryKey.pfx")
-    set_property(SOURCE ${APPX_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
-    set(APPX_ASSETS
-        "UWP/Assets/LockScreenLogo.scale-200.png"
-        "UWP/Assets/SplashScreen.scale-200.png"
-        "UWP/Assets/Square44x44Logo.scale-200.png"
-        "UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png"
-        "UWP/Assets/Square150x150Logo.scale-200.png"
-        "UWP/Assets/StoreLogo.png"
-        "UWP/Assets/Wide310x150Logo.scale-200.png")
-    set_property(SOURCE ${APPX_ASSETS} PROPERTY VS_DEPLOYMENT_CONTENT 1)
-    set_property(SOURCE ${APPX_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets")
-    set(SOURCES ${SOURCES}
-        ${APPX_FILES}
-        ${APPX_ASSETS}
-        UWP/App.cpp)
 elseif(WIN32)
     set(SOURCES ${SOURCES}
         Win32/App.cpp)
@@ -58,11 +41,6 @@ endif()
 add_executable(UnitTests ${SOURCES} ${SCRIPTS} ${EXTERNAL_SCRIPTS})
 target_compile_definitions(UnitTests PRIVATE JSRUNTIMEHOST_PLATFORM="${JSRUNTIMEHOST_PLATFORM}")
 
-if(WINDOWS_STORE)
-    target_compile_options(UnitTests PRIVATE /ZW)
-    target_compile_options(UnitTests PRIVATE /await)
-endif()
-
 target_link_libraries(UnitTests
     PRIVATE AppRuntime
     PRIVATE Console

Tests/UnitTests/Shared/Shared.cpp

@@ -1,28 +1,32 @@
 #include "Shared.h"
 #include <Babylon/AppRuntime.h>
 #include <Babylon/ScriptLoader.h>
+#include <Babylon/Polyfills/AbortController.h>
+#include <Babylon/Polyfills/Console.h>
 #include <Babylon/Polyfills/Scheduling.h>
-#include <Babylon/Polyfills/XMLHttpRequest.h>
 #include <Babylon/Polyfills/URL.h>
-#include <Babylon/Polyfills/AbortController.h>
 #include <Babylon/Polyfills/WebSocket.h>
+#include <Babylon/Polyfills/XMLHttpRequest.h>
 #include <gtest/gtest.h>
 #include <future>
 #include <iostream>
 
-const char* EnumToString(Babylon::Polyfills::Console::LogLevel logLevel)
+namespace
 {
-    switch (logLevel)
+    const char* EnumToString(Babylon::Polyfills::Console::LogLevel logLevel)
     {
-        case Babylon::Polyfills::Console::LogLevel::Log:
-            return "log";
-        case Babylon::Polyfills::Console::LogLevel::Warn:
-            return "warn";
-        case Babylon::Polyfills::Console::LogLevel::Error:
-            return "error";
+        switch (logLevel)
+        {
+            case Babylon::Polyfills::Console::LogLevel::Log:
+                return "log";
+            case Babylon::Polyfills::Console::LogLevel::Warn:
+                return "warn";
+            case Babylon::Polyfills::Console::LogLevel::Error:
+                return "error";
+        }
+
+        return "unknown";
     }
-
-    return "unknown";
 }
 
 TEST(JavaScript, All)
@@ -61,11 +65,13 @@ TEST(JavaScript, All)
         Babylon::Polyfills::WebSocket::Initialize(env);
         Babylon::Polyfills::XMLHttpRequest::Initialize(env);
 
-        env.Global().Set("setExitCode", Napi::Function::New(env, [&exitCodePromise](const Napi::CallbackInfo& info)
-        {
-            Napi::Env env = info.Env();
-            exitCodePromise.set_value(info[0].As<Napi::Number>().Int32Value());
-        }, "setExitCode"));
+        auto setExitCodeCallback = Napi::Function::New(
+            env, [&exitCodePromise](const Napi::CallbackInfo& info) {
+                Napi::Env env = info.Env();
+                exitCodePromise.set_value(info[0].As<Napi::Number>().Int32Value());
+            },
+            "setExitCode");
+        env.Global().Set("setExitCode", setExitCodeCallback);
 
         env.Global().Set("hostPlatform", Napi::Value::From(env, JSRUNTIMEHOST_PLATFORM));
     });
@@ -87,8 +93,7 @@ TEST(Console, Log)
     Babylon::AppRuntime runtime{};
 
     runtime.Dispatch([](Napi::Env env) mutable {
-        Babylon::Polyfills::Console::Initialize(env, [](const char* message, Babylon::Polyfills::Console::LogLevel logLevel)
-        {
+        Babylon::Polyfills::Console::Initialize(env, [](const char* message, Babylon::Polyfills::Console::LogLevel logLevel) {
             const char* test = "foo bar";
             if (strcmp(message, test) != 0)
             {

Tests/UnitTests/Shared/Shared.h

@@ -1,7 +1,3 @@
 #pragma once
 
-#include <Babylon/Polyfills/Console.h>
-
-const char* EnumToString(Babylon::Polyfills::Console::LogLevel logLevel);
-
 int RunTests();