Google Tests Experiment

.github/jobs/android.yml

@@ -19,11 +19,6 @@ jobs:
       parameters:
         vmImage: ${{ parameters.vmImage }}
 
-    - script: |
-        cd Apps/Playground/Android
-        npm install
-      displayName: 'Install JS engine NPMs'
-
     - task: Gradle@2
       inputs:
           workingDirectory: 'Apps/Playground/Android'

.github/jobs/android_tests.yml

@@ -0,0 +1,60 @@
+parameters:
+  name: ''
+  vmImage: ''
+  JSEngine: ''
+  macOSCodename: ''
+
+jobs:
+  - job: ${{ parameters.name }}
+    timeoutInMinutes: 45
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+
+    steps:
+    - script: |
+        git submodule update --init --recursive
+      displayName: 'Checkout dependencies'
+
+    - template: cmake.yml
+      parameters:
+        vmImage: ${{ parameters.vmImage }}
+
+    - script: |
+        echo Install Android image
+        echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-27;default;x86_64'
+        echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+        echo Create AVD
+        $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_API_27 -d pixel -k 'system-images;android-27;default;x86_64'
+      displayName: 'Install Android Emulator'
+
+    - script: |
+        echo Start emulator
+        nohup $ANDROID_HOME/emulator/emulator -avd Pixel_API_27 -gpu host -no-window 2>&1 &
+        echo Wait for emulator
+        $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do echo '.'; sleep 1; done'
+        $ANDROID_HOME/platform-tools/adb devices
+      displayName: 'Start Android Emulator'
+
+    - task: Gradle@3
+      inputs:
+        gradleWrapperFile: 'Apps/UnitTests/Android/gradlew'
+        workingDirectory: 'Apps/UnitTests/Android'
+        options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}}'
+        tasks: 'connectedAndroidTest'
+        jdkVersionOption: 1.11
+      displayName: 'Run Connected Android Test'
+
+    - script: |
+        export results=$(find ./app/build/outputs/androidTest-results -name "*.txt")
+        echo cat "$results"
+        cat "$results"
+      workingDirectory: 'Apps/UnitTests/Android'
+      condition: succeededOrFailed()
+      displayName: 'Dump logcat from Test Results'
+
+    - task: PublishBuildArtifacts@1
+      inputs:
+        pathToPublish: 'Apps/UnitTests/Android/app/build/outputs/androidTest-results/connected'
+        artifactName: 'AndroidTestResults_${{parameters.jsEngine}}'
+      condition: succeededOrFailed()
+      displayName: 'Publish Test Results'

.github/jobs/win32.yml

@@ -59,7 +59,13 @@ jobs:
           cd RelWithDebInfo
           Playground app:///Scripts/validation_native.js 
         displayName: 'Validation Tests'
-
+
+      - script: |
+          cmake --build build${{ variables.solutionName }} --target INSTALL --config RelWithDebInfo
+          cd Install/Test
+          cmake . -DBINARY_DIR=../../build${{ variables.solutionName }} ${{ variables.jsEngineDefine }} && cmake --build . --config RelWithDebInfo
+        displayName: 'Install'
+
       - task: PublishBuildArtifacts@1
         inputs:
           artifactName: '${{ variables.solutionName }} - ${{ parameters.graphics_api }} Rendered Pictures'

Apps/Playground/Android/app/CMakeLists.txt

@@ -23,14 +23,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(BABYLON_NATIVE_PLATFORM "Android")
 set(CMAKE_CXX_STANDARD 17)
 
-if (${ANDROID_JSENGINE_LIBNAME} STREQUAL "jsc")
-    set(NAPI_JAVASCRIPT_ENGINE "JavaScriptCore" CACHE STRING "JavaScript engine for N-API.")
-elseif (${ANDROID_JSENGINE_LIBNAME} STREQUAL "v8android")
-    set(NAPI_JAVASCRIPT_ENGINE "V8" CACHE STRING "JavaScript engine for N-API.")
-else()
-    message(FATAL_ERROR "Unrecognized JS engine: ${ANDROID_JSENGINE_LIBNAME}")
-endif()
-
 add_library(javascript_engine SHARED IMPORTED GLOBAL)
 set_target_properties(javascript_engine PROPERTIES IMPORTED_LOCATION "${ANDROID_JSENGINE_LIBPATH}/${ANDROID_ABI}/lib${ANDROID_JSENGINE_LIBNAME}.so")
 target_include_directories(javascript_engine INTERFACE "${ANDROID_JSENGINE_INCPATH}")

Apps/Playground/Android/app/build.gradle

@@ -1,21 +1,8 @@
 apply plugin: 'com.android.application'
 
-// When no project property is set for Gradle ('-PJSEngine=')
-// default JS engine is set to v8android
-// JSEngine property can be:
-// - jsc for JavaScriptCore
-// - v8android for V8
-
-def jsEngineBaseDir = "${buildDir}/JS"
-def jsEngineIncDir = "${jsEngineBaseDir}/include/V8"
-def jsEngineLibDir = "${rootDir}/app/src/main/jniLibs"
-
-def jsEngineLibName = "v8android"
-if (project.hasProperty("JSEngine")) {
-    jsEngineLibName = project.property("JSEngine")
-    if ("${jsEngineLibName}" == "jsc" ) {
-        jsEngineIncDir = "${jsEngineBaseDir}/include"
-    }
+def jsEngine = "V8"
+if (project.hasProperty("jsEngine")) {
+    jsEngine = project.property("jsEngine")
 }
 
 def graphics_api = "OpenGL"
@@ -36,12 +23,12 @@ def arcore_libpath = "${buildDir}/arcore-native"
 configurations { natives }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.android.babylonnative.playground"
         minSdkVersion "${platformVersion}"
-        targetSdkVersion 28
+        targetSdkVersion 29
         ndkVersion "23.1.7779620"
         if (project.hasProperty("NDK_VERSION")) {
             def NDKVersion = project.property("NDK_VERSION")
@@ -54,9 +41,8 @@ android {
                     "-DENABLE_PCH=OFF",
                     "-DGRAPHICS_API=${graphics_api}",
                     "-DARCORE_LIBPATH=${arcore_libpath}/jni",
-                    "-DANDROID_JSENGINE_LIBPATH=${jsEngineLibDir}",
-                    "-DANDROID_JSENGINE_LIBNAME=${jsEngineLibName}",
-                    "-DANDROID_JSENGINE_INCPATH=${jsEngineIncDir}",
+                    "-DNAPI_JAVASCRIPT_ENGINE=${jsEngine}",
+                    "-DJSRUNTIMEHOST_CORE_APPRUNTIME_V8_INSPECTOR=ON"
                     "-DCMAKE_UNITY_BUILD=${unity_build}"
             }
         }
@@ -162,78 +148,5 @@ task copyFiles {
     }
 }
 
-repositories {
-    mavenLocal()
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../../node_modules/jsc-android/dist"
-    }
-    maven {
-        // Android V8 is installed from npm
-        url "$rootDir/../../node_modules/v8-android/dist"
-    }
-    google()
-    jcenter()
-}
-
-configurations 
-{ 
-    jscAndroid
-    v8Android 
-}
-
-dependencies {
-    jscAndroid 'org.webkit:android-jsc:+'
-    v8Android 'org.chromium:v8-android:+'
-}
-
-// Extracts the shared libraries from aars in the natives configuration.
-// This is done so that NDK builds can access these libraries.
-task extractJSEngineLibraries() {
-    // Always extract, this insures the native libs are updated if the version changes.
-    outputs.upToDateWhen { false }
-    def jsconfig
-    if ("${jsEngineLibName}" == "jsc" ) {
-        jsconfig = configurations.jscAndroid
-    } else {
-        jsconfig = configurations.v8Android
-    }
-    doFirst {
-        jsconfig.files.each { f ->
-            copy {
-                from zipTree(f)
-                into jsEngineLibDir
-                include "jni/**/*"
-                // remove 'jni/'
-                eachFile { fcd ->
-                    fcd.relativePath = new RelativePath(true, fcd.relativePath.segments.drop(1))  
-                }
-                includeEmptyDirs = false
-            }
-        }
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name.contains("external") && !task.name.contains("Clean")) {
-        task.dependsOn(extractJSEngineLibraries)
-    }
-}
-
-task copyFilesJSHeaders {
-    copy
-    {
-        from "${rootDir}/../../node_modules/jsc-android/dist/include"
-        include "*"
-        into "${jsEngineBaseDir}/include/JavaScriptCore"
-    }
-    copy
-    {
-        from "${rootDir}/../../node_modules/v8-android/dist/include"
-        include "**/*"
-        into "${jsEngineIncDir}"
-    }
-}
-
 preBuild.dependsOn(copyFiles)
-preBuild.dependsOn(copyFilesJSHeaders)
+

Apps/Playground/Scripts/config.json

@@ -183,7 +183,7 @@
         },
         {
             "title": "LightFalloff",
-            "playgroundId": "#20OAV9#201",
+            "playgroundId": "#20OAV9#11218",
             "referenceImage": "lightFalloff.png"
         },
         {
@@ -207,7 +207,7 @@
         {
             "title": "Capsule",
             "renderCount": 10,
-            "playgroundId": "#JAFIIU#2",
+            "playgroundId": "#JAFIIU#4",
             "referenceImage": "CreateCapsule.png"
         },
         {

Apps/UnitTests/Android/.gitignore

@@ -0,0 +1,10 @@
+*.iml
+.gradle/
+.idea/
+local.properties
+
+app/.cxx/
+app/build/
+app/src/main/assets
+
+build/

Apps/UnitTests/Android/app/build.gradle

@@ -0,0 +1,110 @@
+plugins {
+    id 'com.android.application'
+}
+
+def jsEngine = "V8"
+if (project.hasProperty("jsEngine")) {
+    jsEngine = project.property("jsEngine")
+}
+
+configurations { natives }
+
+android {
+    namespace 'com.babylonnative.unittests'
+    compileSdk 33
+    ndkVersion = "21.4.7075529"
+
+    defaultConfig {
+        applicationId "com.babylonnative.unittests"
+        minSdk 21
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        externalNativeBuild {
+            cmake {
+                arguments (
+                    "-DANDROID_STL=c++_shared",
+                    "-DNAPI_JAVASCRIPT_ENGINE=${jsEngine}",
+                    "-DJSRUNTIMEHOST_CORE_APPRUNTIME_V8_INSPECTOR=ON",
+                )
+            }
+        }
+
+        if (project.hasProperty("abiFilters")) {
+            ndk {
+                abiFilters project.getProperty("abiFilters")
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            buildStagingDirectory '../../../../Build/Android'
+            version '3.22.1+'
+        }
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    implementation 'com.google.ar:core:1.16.0'
+    natives 'com.google.ar:core:1.16.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.3'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+task copyScripts {
+    doLast {
+        // run copy at execution phase because npm command is not done at configuration phase
+        copy
+        {
+            from "../../../node_modules/chai"
+            include "chai.js"
+            into 'src/main/assets/Scripts'
+        }
+        copy
+        {
+            from "../../../node_modules/mocha"
+            include "mocha.js"
+            into 'src/main/assets/Scripts'
+        }
+        copy
+        {
+            from '../../Scripts'
+            include "*.js"
+            into 'src/main/assets/Scripts'
+        }
+    }
+}
+
+// Run copyScripts task after CMake external build
+// And make sure merging assets into output is performed after the scripts copy
+tasks.whenTaskAdded { task ->
+    if (task.name == 'mergeDebugNativeLibs') {
+        task.finalizedBy(copyScripts)
+    }
+    if (task.name == 'mergeDebugAssets') {
+        task.dependsOn(copyScripts)
+    }
+}

Apps/UnitTests/Android/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile