From 13cc6f0e19b0e474b6721f007f02bae6a26af755 Mon Sep 17 00:00:00 2001 From: Andrei Salavei Date: Tue, 16 Dec 2025 13:17:17 +0100 Subject: [PATCH] Remove iOS Instrumented tests (#5499) Tests moved to the https://github.com/JetBrains/compose-multiplatform-core repository. ## Release Notes N/A --- instrumented-test/README.md | 20 - instrumented-test/build.gradle.kts | 12 - instrumented-test/gradle.properties | 11 - instrumented-test/gradle/libs.versions.toml | 14 - .../gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 - instrumented-test/gradlew | 252 ------- instrumented-test/gradlew.bat | 94 --- .../Launcher.xcodeproj/project.pbxproj | 514 -------------- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/xcschemes/Launcher.xcscheme | 105 --- .../xcschemes/LauncherHost.xcscheme | 91 --- .../launcher/Launcher.xctestplan | 28 - .../launcher/Launcher/Launcher.swift | 13 - .../launcher/LauncherHost/main.swift | 24 - instrumented-test/settings.gradle.kts | 37 - .../ui-instrumented-test/build.gradle.kts | 117 ---- .../ComponentsAccessibilitySemanticTest.kt | 650 ------------------ .../accessibility/LayersAccessibilityTest.kt | 170 ----- .../androidx/compose/test/configuration.kt | 22 - .../test/interaction/BasicInteractionTest.kt | 152 ---- .../test/utils/AccessibilityTestNode.kt | 321 --------- .../compose/test/utils/DpRect+Utils.kt | 60 -- .../androidx/compose/test/utils/OsVersion.kt | 22 - .../test/utils/UIKitInstrumentedTest.kt | 245 ------- .../compose/test/utils/UITouch+Utils.kt | 45 -- .../CMPTestUtils.xcodeproj/project.pbxproj | 311 --------- .../contents.xcworkspacedata | 7 - .../xcschemes/CMPTestUtils.xcscheme | 67 -- .../src/iosMain/objc/CMPTestUtils/HIDEvent.h | 10 - .../src/iosMain/objc/CMPTestUtils/HIDEvent.m | 160 ----- .../iosMain/objc/CMPTestUtils/UITouch+Test.h | 25 - .../iosMain/objc/CMPTestUtils/UITouch+Test.m | 111 --- .../src/nativeInterop/cinterop/test.def | 13 - instrumented-test/ui-xctest/build.gradle.kts | 73 -- instrumented-test/ui-xctest/gradle.properties | 6 - .../compose/xctest/NativeTestObserver.kt | 147 ---- .../compose/xctest/NativeTestRunner.kt | 203 ------ .../androidx/compose/xctest/configuration.kt | 148 ---- .../src/nativeInterop/cinterop/XCTest.def | 14 - 41 files changed, 4336 deletions(-) delete mode 100644 instrumented-test/README.md delete mode 100644 instrumented-test/build.gradle.kts delete mode 100644 instrumented-test/gradle.properties delete mode 100644 instrumented-test/gradle/libs.versions.toml delete mode 100644 instrumented-test/gradle/wrapper/gradle-wrapper.jar delete mode 100644 instrumented-test/gradle/wrapper/gradle-wrapper.properties delete mode 100755 instrumented-test/gradlew delete mode 100644 instrumented-test/gradlew.bat delete mode 100644 instrumented-test/launcher/Launcher.xcodeproj/project.pbxproj delete mode 100644 instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme delete mode 100644 instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/LauncherHost.xcscheme delete mode 100644 instrumented-test/launcher/Launcher.xctestplan delete mode 100644 instrumented-test/launcher/Launcher/Launcher.swift delete mode 100644 instrumented-test/launcher/LauncherHost/main.swift delete mode 100644 instrumented-test/settings.gradle.kts delete mode 100644 instrumented-test/ui-instrumented-test/build.gradle.kts delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/ComponentsAccessibilitySemanticTest.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/LayersAccessibilityTest.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/configuration.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/interaction/BasicInteractionTest.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/AccessibilityTestNode.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/DpRect+Utils.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/OsVersion.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UIKitInstrumentedTest.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UITouch+Utils.kt delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.pbxproj delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/xcshareddata/xcschemes/CMPTestUtils.xcscheme delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.h delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.m delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.h delete mode 100644 instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.m delete mode 100644 instrumented-test/ui-instrumented-test/src/nativeInterop/cinterop/test.def delete mode 100644 instrumented-test/ui-xctest/build.gradle.kts delete mode 100644 instrumented-test/ui-xctest/gradle.properties delete mode 100644 instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestObserver.kt delete mode 100644 instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestRunner.kt delete mode 100644 instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/configuration.kt delete mode 100644 instrumented-test/ui-xctest/src/nativeInterop/cinterop/XCTest.def diff --git a/instrumented-test/README.md b/instrumented-test/README.md deleted file mode 100644 index 2ccb54819f..0000000000 --- a/instrumented-test/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Compose Multiplatform Instrumented Test - -## Overview - -This project is a Compose Multiplatform module that implements instrumented UI tests Kotlin tests that runs as native XCTest with host app on iOS Simulator. - -## Requirements - -- Kotlin >= 2.1.0 -- Compose Multiplatform 1.8.0-alpha02 -- iOS 12+ - -## Testing - -To execute XCTest cases on an iOS Simulator, use: - -```shell -cd launcher -xcodebuild test -scheme Launcher -destination "platform=iOS Simulator,name=iPhone 16 Pro" -``` diff --git a/instrumented-test/build.gradle.kts b/instrumented-test/build.gradle.kts deleted file mode 100644 index 3e980a3b8f..0000000000 --- a/instrumented-test/build.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -plugins { - // this is necessary to avoid the plugins to be loaded multiple times - // in each subproject's classloader - alias(libs.plugins.composeMultiplatform) apply false - alias(libs.plugins.composeCompiler) apply false - alias(libs.plugins.kotlinMultiplatform) apply false -} diff --git a/instrumented-test/gradle.properties b/instrumented-test/gradle.properties deleted file mode 100644 index 924263c828..0000000000 --- a/instrumented-test/gradle.properties +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright 2025 JetBrains s.r.o. and respective authors and developers. -# Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. -# - -#Kotlin -kotlin.code.style=official -kotlin.daemon.jvmargs=-Xmx2048M - -#Gradle -org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 diff --git a/instrumented-test/gradle/libs.versions.toml b/instrumented-test/gradle/libs.versions.toml deleted file mode 100644 index 9e4706da62..0000000000 --- a/instrumented-test/gradle/libs.versions.toml +++ /dev/null @@ -1,14 +0,0 @@ -[versions] -androidx-lifecycle = "2.8.4" -compose-multiplatform = "1.8.0-alpha02" -junit = "4.13.2" -kotlin = "2.1.0" - -[libraries] -androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidx-lifecycle" } -androidx-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } - -[plugins] -composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } -composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } diff --git a/instrumented-test/gradle/wrapper/gradle-wrapper.jar b/instrumented-test/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 2c3521197d7c4586c843d1d3e9090525f1898cde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) diff --git a/instrumented-test/gradle/wrapper/gradle-wrapper.properties b/instrumented-test/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 37f853b1c8..0000000000 --- a/instrumented-test/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/instrumented-test/gradlew b/instrumented-test/gradlew deleted file mode 100755 index f5feea6d6b..0000000000 --- a/instrumented-test/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/instrumented-test/gradlew.bat b/instrumented-test/gradlew.bat deleted file mode 100644 index 9b42019c79..0000000000 --- a/instrumented-test/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/instrumented-test/launcher/Launcher.xcodeproj/project.pbxproj b/instrumented-test/launcher/Launcher.xcodeproj/project.pbxproj deleted file mode 100644 index 799f4092f9..0000000000 --- a/instrumented-test/launcher/Launcher.xcodeproj/project.pbxproj +++ /dev/null @@ -1,514 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 9928B7FF2D32CD78006277AD /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9928B7FE2D32CD75006277AD /* main.swift */; }; - 9928B8042D330AB6006277AD /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9928B8032D330AB6006277AD /* IOKit.framework */; }; - 9928B82C2D3422C1006277AD /* Launcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9928B82B2D3422C1006277AD /* Launcher.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 997DFD082B18E5DC000B56B5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9975AAC12AEABB5600AF155F /* Project object */; - proxyType = 1; - remoteGlobalIDString = 997DFCF92B18E5D3000B56B5; - remoteInfo = CMPUIKitUtilsTestApp; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 9928B7FE2D32CD75006277AD /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; - 9928B8032D330AB6006277AD /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.1.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; }; - 9928B82B2D3422C1006277AD /* Launcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Launcher.swift; sourceTree = ""; }; - 997DFCE32B18D99E000B56B5 /* Launcher.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Launcher.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 997DFCFA2B18E5D3000B56B5 /* LauncherHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LauncherHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 99BE84D22C3467B100E43826 /* Launcher.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Launcher.xctestplan; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 997DFCE02B18D99E000B56B5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9928B8042D330AB6006277AD /* IOKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 997DFCF72B18E5D3000B56B5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 9928B8002D330AAA006277AD /* Frameworks */ = { - isa = PBXGroup; - children = ( - 9928B8032D330AB6006277AD /* IOKit.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 9975AAC02AEABB5600AF155F = { - isa = PBXGroup; - children = ( - 99BE84D22C3467B100E43826 /* Launcher.xctestplan */, - 997DFCE42B18D99E000B56B5 /* Launcher */, - 997DFCFB2B18E5D3000B56B5 /* LauncherHost */, - 9928B8002D330AAA006277AD /* Frameworks */, - 9975AACB2AEABB5600AF155F /* Products */, - ); - sourceTree = ""; - }; - 9975AACB2AEABB5600AF155F /* Products */ = { - isa = PBXGroup; - children = ( - 997DFCE32B18D99E000B56B5 /* Launcher.xctest */, - 997DFCFA2B18E5D3000B56B5 /* LauncherHost.app */, - ); - name = Products; - sourceTree = ""; - }; - 997DFCE42B18D99E000B56B5 /* Launcher */ = { - isa = PBXGroup; - children = ( - 9928B82B2D3422C1006277AD /* Launcher.swift */, - ); - path = Launcher; - sourceTree = ""; - }; - 997DFCFB2B18E5D3000B56B5 /* LauncherHost */ = { - isa = PBXGroup; - children = ( - 9928B7FE2D32CD75006277AD /* main.swift */, - ); - path = LauncherHost; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 997DFCE22B18D99E000B56B5 /* Launcher */ = { - isa = PBXNativeTarget; - buildConfigurationList = 997DFCEC2B18D99E000B56B5 /* Build configuration list for PBXNativeTarget "Launcher" */; - buildPhases = ( - 9928B7EB2D326BB1006277AD /* Build Tests */, - 997DFCDF2B18D99E000B56B5 /* Sources */, - 997DFCE02B18D99E000B56B5 /* Frameworks */, - 997DFCE12B18D99E000B56B5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 997DFD092B18E5DC000B56B5 /* PBXTargetDependency */, - ); - name = Launcher; - productName = CMPUIKitUtilsTests; - productReference = 997DFCE32B18D99E000B56B5 /* Launcher.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 997DFCF92B18E5D3000B56B5 /* LauncherHost */ = { - isa = PBXNativeTarget; - buildConfigurationList = 997DFD052B18E5D4000B56B5 /* Build configuration list for PBXNativeTarget "LauncherHost" */; - buildPhases = ( - 997DFCF62B18E5D3000B56B5 /* Sources */, - 997DFCF72B18E5D3000B56B5 /* Frameworks */, - 997DFCF82B18E5D3000B56B5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = LauncherHost; - productName = CMPUIKitUtilsTestApp; - productReference = 997DFCFA2B18E5D3000B56B5 /* LauncherHost.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 9975AAC12AEABB5600AF155F /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - LastSwiftUpdateCheck = 1500; - LastUpgradeCheck = 1520; - TargetAttributes = { - 997DFCE22B18D99E000B56B5 = { - CreatedOnToolsVersion = 15.0; - LastSwiftMigration = 1610; - TestTargetID = 997DFCF92B18E5D3000B56B5; - }; - 997DFCF92B18E5D3000B56B5 = { - CreatedOnToolsVersion = 15.0; - LastSwiftMigration = 1610; - }; - }; - }; - buildConfigurationList = 9975AAC42AEABB5600AF155F /* Build configuration list for PBXProject "Launcher" */; - compatibilityVersion = "Xcode 12.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 9975AAC02AEABB5600AF155F; - productRefGroup = 9975AACB2AEABB5600AF155F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 997DFCE22B18D99E000B56B5 /* Launcher */, - 997DFCF92B18E5D3000B56B5 /* LauncherHost */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 997DFCE12B18D99E000B56B5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 997DFCF82B18E5D3000B56B5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 9928B7EB2D326BB1006277AD /* Build Tests */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Build Tests"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :ui-instrumented-test:embedAndSignAppleFrameworkForXcode\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 997DFCDF2B18D99E000B56B5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9928B82C2D3422C1006277AD /* Launcher.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 997DFCF62B18E5D3000B56B5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9928B7FF2D32CD78006277AD /* main.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 997DFD092B18E5DC000B56B5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 997DFCF92B18E5D3000B56B5 /* LauncherHost */; - targetProxy = 997DFD082B18E5DC000B56B5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 9975AADA2AEABB5600AF155F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UIRequiresFullScreen = NO; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 9975AADB2AEABB5600AF155F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UIRequiresFullScreen = NO; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 997DFCEA2B18D99E000B56B5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inderited)", - "CMPUIKitUtils/**", - ); - MARKETING_VERSION = 1.0; - OTHER_LDFLAGS = ( - "-L$SRCROOT/../ui-instrumented-test/build/objc/iphonesimulator.xcarchive/Products/usr/local/lib", - "-lCMPTestUtils", - "-ObjC", - ); - PRODUCT_BUNDLE_IDENTIFIER = JetBrains.CMPUIKitUtilsTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LauncherHost.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/LauncherHost"; - }; - name = Debug; - }; - 997DFCEB2B18D99E000B56B5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inderited)", - "CMPUIKitUtils/**", - ); - MARKETING_VERSION = 1.0; - OTHER_LDFLAGS = ( - "-L$SRCROOT/../ui-instrumented-test/build/objc/iphonesimulator.xcarchive/Products/usr/local/lib", - "-lCMPTestUtils", - "-ObjC", - ); - PRODUCT_BUNDLE_IDENTIFIER = JetBrains.CMPUIKitUtilsTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LauncherHost.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/LauncherHost"; - }; - name = Release; - }; - 997DFD062B18E5D4000B56B5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 45226JTYHN; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = JetBrains.CMPUIKitUtilsTestApp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 997DFD072B18E5D4000B56B5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 45226JTYHN; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = JetBrains.CMPUIKitUtilsTestApp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 9975AAC42AEABB5600AF155F /* Build configuration list for PBXProject "Launcher" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9975AADA2AEABB5600AF155F /* Debug */, - 9975AADB2AEABB5600AF155F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 997DFCEC2B18D99E000B56B5 /* Build configuration list for PBXNativeTarget "Launcher" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 997DFCEA2B18D99E000B56B5 /* Debug */, - 997DFCEB2B18D99E000B56B5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 997DFD052B18E5D4000B56B5 /* Build configuration list for PBXNativeTarget "LauncherHost" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 997DFD062B18E5D4000B56B5 /* Debug */, - 997DFD072B18E5D4000B56B5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 9975AAC12AEABB5600AF155F /* Project object */; -} diff --git a/instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 3f484a3623..0000000000 --- a/instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d..0000000000 --- a/instrumented-test/launcher/Launcher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme b/instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme deleted file mode 100644 index 0a36eceb5a..0000000000 --- a/instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/Launcher.xcscheme +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/LauncherHost.xcscheme b/instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/LauncherHost.xcscheme deleted file mode 100644 index 67f224f536..0000000000 --- a/instrumented-test/launcher/Launcher.xcodeproj/xcshareddata/xcschemes/LauncherHost.xcscheme +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/instrumented-test/launcher/Launcher.xctestplan b/instrumented-test/launcher/Launcher.xctestplan deleted file mode 100644 index b193001b1b..0000000000 --- a/instrumented-test/launcher/Launcher.xctestplan +++ /dev/null @@ -1,28 +0,0 @@ -{ - "configurations" : [ - { - "id" : "BD8089FB-4512-49DD-9E9F-FE08E8CF5266", - "name" : "Test Scheme Action", - "options" : { - - } - } - ], - "defaultOptions" : { - "targetForVariableExpansion" : { - "containerPath" : "container:CMPUIKitUtils.xcodeproj", - "identifier" : "997DFCF92B18E5D3000B56B5", - "name" : "CMPUIKitUtilsTestApp" - } - }, - "testTargets" : [ - { - "target" : { - "containerPath" : "container:Launcher.xcodeproj", - "identifier" : "997DFCE22B18D99E000B56B5", - "name" : "Launcher" - } - } - ], - "version" : 1 -} diff --git a/instrumented-test/launcher/Launcher/Launcher.swift b/instrumented-test/launcher/Launcher/Launcher.swift deleted file mode 100644 index e96dd1ec6d..0000000000 --- a/instrumented-test/launcher/Launcher/Launcher.swift +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -import XCTest -import InstrumentedTests - -class TestLauncher: XCTestCase { - override class var defaultTestSuite: XCTestSuite { - ConfigurationKt.testSuite() - } -} diff --git a/instrumented-test/launcher/LauncherHost/main.swift b/instrumented-test/launcher/LauncherHost/main.swift deleted file mode 100644 index c2eeb1f322..0000000000 --- a/instrumented-test/launcher/LauncherHost/main.swift +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -import UIKit - -class AppDelegate: NSObject, UIApplicationDelegate { - - var window: UIWindow? - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { - - print(ProcessInfo.processInfo.environment) - print(ProcessInfo.processInfo.arguments) - window = UIWindow(frame: UIScreen.main.bounds) - window?.rootViewController = UIViewController() - window?.rootViewController?.view.backgroundColor = .orange - window?.makeKeyAndVisible() - return true - } -} - -UIApplicationMain(CommandLine.argc, CommandLine.unsafeArgv, nil, NSStringFromClass(AppDelegate.self)) diff --git a/instrumented-test/settings.gradle.kts b/instrumented-test/settings.gradle.kts deleted file mode 100644 index c956a87435..0000000000 --- a/instrumented-test/settings.gradle.kts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -rootProject.name = "instrumented-test" -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") - -pluginManagement { - repositories { - google { - mavenContent { - includeGroupAndSubgroups("androidx") - includeGroupAndSubgroups("com.android") - includeGroupAndSubgroups("com.google") - } - } - mavenCentral() - gradlePluginPortal() - } -} - -dependencyResolutionManagement { - repositories { - google { - mavenContent { - includeGroupAndSubgroups("androidx") - includeGroupAndSubgroups("com.android") - includeGroupAndSubgroups("com.google") - } - } - mavenCentral() - } -} - -include(":ui-instrumented-test") -include(":ui-xctest") diff --git a/instrumented-test/ui-instrumented-test/build.gradle.kts b/instrumented-test/ui-instrumented-test/build.gradle.kts deleted file mode 100644 index 7316a936f4..0000000000 --- a/instrumented-test/ui-instrumented-test/build.gradle.kts +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests - -plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.composeMultiplatform) - alias(libs.plugins.composeCompiler) -} - -kotlin { - listOf( - iosX64(), - iosArm64(), - iosSimulatorArm64() - ).forEach { iosTarget -> - val frameworkName = "CMPTestUtils" - val buildSchemeName = frameworkName - val objcDir = File(project.projectDir, "src/iosMain/objc") - val frameworkSourcesDir = objcDir - val sdkName: String - val destination: String - val architecture: String - if (iosTarget is KotlinNativeTargetWithSimulatorTests) { - sdkName = "iphonesimulator" - destination = "generic/platform=iOS Simulator" - architecture = if (iosTarget.name == "iosSimulatorArm64") "arm64" else "x86_64" - } else { - sdkName = "iphoneos" - destination = "generic/platform=iOS" - architecture = "arm64" - } - - - val buildDir = project.layout.buildDirectory.dir("objc/${sdkName}.xcarchive").get().asFile.absolutePath - val frameworkPath = File(buildDir,"/Products/usr/local/lib/lib${frameworkName}.a") - val headersPath = File(frameworkSourcesDir, frameworkName) - - val compilerArgs = listOf( - "-include-binary", frameworkPath.absolutePath.toString(), - ) + "-tr" - - iosTarget.compilations.configureEach { - val libTaskName = "${compileTaskProvider.name}ObjCLib" - project.tasks.register(libTaskName, Exec::class.java) { - inputs.dir(frameworkSourcesDir) - .withPropertyName("${frameworkName}-${sdkName}") - .withPathSensitivity(PathSensitivity.RELATIVE) - - outputs.cacheIf { true } - outputs.dir(buildDir) - .withPropertyName("${frameworkName}-${sdkName}-archive") - - workingDir(frameworkSourcesDir) - commandLine("xcodebuild") - args( - "archive", - "-scheme", buildSchemeName, - "-archivePath", buildDir, - "-sdk", sdkName, - "-destination", destination, - "SKIP_INSTALL=NO", - "BUILD_LIBRARY_FOR_DISTRIBUTION=YES", - "VALID_ARCHS=${architecture}", - "MACH_O_TYPE=staticlib" - ) - } - - tasks[compileTaskProvider.name].dependsOn(libTaskName) - - cinterops.register("test") { - val cinteropTask = tasks[interopProcessingTaskName] - - headersPath.listFiles()?.forEach { - if (it.name.endsWith(".h")) { - extraOpts("-header", it.name) - compilerOpts("-I${headersPath}") - } - cinteropTask.inputs.file(it) - } - } - compileTaskProvider.configure { - compilerOptions { - freeCompilerArgs.addAll(compilerArgs) - } - } - } - iosTarget.binaries { - framework { - baseName = "InstrumentedTests" - isStatic = true - linkerOpts( - "-ObjC", - "-framework", "UIKit", - "-framework", "IOKit" - ) - } - } - } - - sourceSets { - commonMain.dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.ui) - implementation(compose.components.resources) - implementation(compose.components.uiToolingPreview) - implementation(libs.androidx.lifecycle.viewmodel) - implementation(libs.androidx.lifecycle.runtime.compose) - api(project(":ui-xctest")) - } - } -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/ComponentsAccessibilitySemanticTest.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/ComponentsAccessibilitySemanticTest.kt deleted file mode 100644 index e6f7b9039b..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/ComponentsAccessibilitySemanticTest.kt +++ /dev/null @@ -1,650 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.ui.accessibility - -import androidx.compose.foundation.Image -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.text.selection.SelectionContainer -import androidx.compose.material.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue -import androidx.compose.test.utils.assertAccessibilityTree -import androidx.compose.test.utils.available -import androidx.compose.test.utils.findNodeWithTag -import androidx.compose.test.utils.runUIKitInstrumentedTest -import androidx.compose.ui.ExperimentalComposeUiApi -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ImageBitmap -import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.role -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.state.ToggleableState -import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.viewinterop.UIKitInteropProperties -import androidx.compose.ui.viewinterop.UIKitView -import platform.UIKit.* -import kotlin.test.* - -class ComponentsAccessibilitySemanticTest { - @OptIn(ExperimentalMaterialApi::class) - @Test - fun testProgressNodesSemantic() = runUIKitInstrumentedTest { - var sliderValue = 0.4f - setContentWithAccessibilityEnabled { - Column { - Slider( - value = sliderValue, - onValueChange = { sliderValue = it } - ) - LinearProgressIndicator(progress = 0.7f) - RangeSlider( - value = 30f..70f, - onValueChange = {}, - valueRange = 0f..100f - ) - } - } - - assertAccessibilityTree { - // Slider - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitAdjustable) - value = "40%" - } - - // LinearProgressIndicator - node { - isAccessibilityElement = true - value = "70%" - traits() - } - - // Range Slider - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitAdjustable) - value = "43%" - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitAdjustable) - value = "57%" - } - } - } - - @Test - fun testSliderAction() = runUIKitInstrumentedTest { - var sliderValue = 0.4f - setContentWithAccessibilityEnabled { - Slider( - value = sliderValue, - onValueChange = { sliderValue = it }, - modifier = Modifier.testTag("Slider") - ) - } - - var oldValue = sliderValue - val sliderNode = findNodeWithTag("Slider") - sliderNode.element?.accessibilityIncrement() - assertTrue(oldValue < sliderValue) - - oldValue = sliderValue - sliderNode.element?.accessibilityDecrement() - assertTrue(oldValue > sliderValue) - } - - @Test - fun testToggleAndCheckboxSemantic() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column { - Switch(false, {}) - Checkbox(false, {}) - TriStateCheckbox(ToggleableState.On, {}) - TriStateCheckbox(ToggleableState.Off, {}) - TriStateCheckbox(ToggleableState.Indeterminate, {}) - } - } - - assertAccessibilityTree { - // Switch - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - if (available(iosMajorVersion = 17)) { - traits(UIAccessibilityTraitToggleButton) - } - } - // Checkbox - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - // ToggleableState - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitSelected - ) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - } - } - - @Test - fun testToggleAndCheckboxAction() = runUIKitInstrumentedTest { - var switch by mutableStateOf(false) - var checkbox by mutableStateOf(false) - var triStateCheckbox by mutableStateOf(ToggleableState.Off) - - setContentWithAccessibilityEnabled { - Column { - Switch( - checked = switch, - onCheckedChange = { switch = it }, - modifier = Modifier.testTag("Switch") - ) - Checkbox( - checked = checkbox, - onCheckedChange = { checkbox = it }, - modifier = Modifier.testTag("Checkbox") - ) - TriStateCheckbox( - state = triStateCheckbox, - onClick = { triStateCheckbox = ToggleableState.On }, - modifier = Modifier.testTag("TriStateCheckbox") - ) - } - } - - findNodeWithTag("Switch").element?.accessibilityActivate() - assertTrue(switch) - waitForIdle() - findNodeWithTag("Switch").element?.accessibilityActivate() - assertFalse(switch) - - findNodeWithTag("Checkbox").element?.accessibilityActivate() - assertTrue(checkbox) - waitForIdle() - findNodeWithTag("Checkbox").element?.accessibilityActivate() - assertFalse(checkbox) - - findNodeWithTag("TriStateCheckbox").element?.accessibilityActivate() - assertEquals(ToggleableState.On, triStateCheckbox) - } - - @Test - fun testRadioButtonSelection() = runUIKitInstrumentedTest { - var selectedIndex by mutableStateOf(0) - - setContentWithAccessibilityEnabled { - Column { - RadioButton(selected = selectedIndex == 0, onClick = { selectedIndex = 0 }) - RadioButton(selected = selectedIndex == 1, onClick = { selectedIndex = 1 }) - RadioButton( - selected = selectedIndex == 2, - onClick = { selectedIndex = 2 }, - Modifier.testTag("RadioButton") - ) - } - } - - assertAccessibilityTree { - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitSelected - ) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - } - - findNodeWithTag("RadioButton").element?.accessibilityActivate() - assertAccessibilityTree { - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitSelected - ) - } - } - - selectedIndex = 0 - assertAccessibilityTree { - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitSelected - ) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - node { - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - } - } - - @Test - fun testImageSemantics() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column { - Image( - ImageBitmap(10, 10), - contentDescription = null, - modifier = Modifier.testTag("Image 1") - ) - Image( - ImageBitmap(10, 10), - contentDescription = null, - modifier = Modifier.testTag("Image 2").semantics { role = Role.Image } - ) - Image( - ImageBitmap(10, 10), - contentDescription = "Abstract Picture", - modifier = Modifier.testTag("Image 3") - ) - } - } - - assertAccessibilityTree { - node { - isAccessibilityElement = false - identifier = "Image 1" - traits() - } - node { - isAccessibilityElement = false - identifier = "Image 2" - traits(UIAccessibilityTraitImage) - } - node { - isAccessibilityElement = true - identifier = "Image 3" - label = "Abstract Picture" - traits(UIAccessibilityTraitImage) - } - } - } - - @Test - fun testTextSemantics() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column { - Text("Static Text", modifier = Modifier.testTag("Text 1")) - Text("Custom Button", modifier = Modifier.testTag("Text 2").clickable { }) - } - } - - assertAccessibilityTree { - node { - isAccessibilityElement = true - identifier = "Text 1" - label = "Static Text" - traits(UIAccessibilityTraitStaticText) - } - node { - isAccessibilityElement = true - identifier = "Text 2" - label = "Custom Button" - traits(UIAccessibilityTraitButton) - } - } - } - - @Test - fun testDisabledSemantics() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column { - Button({}, enabled = false) {} - TextField("", {}, enabled = false) - Slider(value = 0f, onValueChange = {}, enabled = false) - Switch(checked = false, onCheckedChange = {}, enabled = false) - Checkbox(checked = false, onCheckedChange = {}, enabled = false) - TriStateCheckbox(state = ToggleableState.Off, onClick = {}, enabled = false) - } - } - - assertAccessibilityTree { - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitNotEnabled - ) - } - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitNotEnabled - ) - } - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitAdjustable, - UIAccessibilityTraitNotEnabled - ) - } - node { - isAccessibilityElement = true - if (available(iosMajorVersion = 17)) { - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitToggleButton, - UIAccessibilityTraitNotEnabled - ) - } else { - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitNotEnabled - ) - } - } - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitNotEnabled - ) - } - node { - isAccessibilityElement = true - traits( - UIAccessibilityTraitButton, - UIAccessibilityTraitNotEnabled - ) - } - } - } - - @Test - fun testHeadingSemantics() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Scaffold(topBar = { - TopAppBar { - Text("Header", modifier = Modifier.semantics { heading() }) - } - }) { - Column { - Text("Content") - } - } - } - - assertAccessibilityTree { - node { - label = "Header" - isAccessibilityElement = true - traits(UIAccessibilityTraitHeader) - } - node { - label = "Content" - isAccessibilityElement = true - traits(UIAccessibilityTraitStaticText) - } - } - } - - @Test - fun testSelectionContainer() = runUIKitInstrumentedTest { - @Composable - fun LabeledInfo(label: String, data: String) { - Text( - buildAnnotatedString { - append("$label: ") - append(data) - } - ) - } - - setContentWithAccessibilityEnabled { - SelectionContainer { - Column { - Text("Title") - LabeledInfo("Subtitle", "subtitle") - LabeledInfo("Details", "details") - } - } - } - - assertAccessibilityTree { - node { - label = "Title" - isAccessibilityElement = true - traits(UIAccessibilityTraitStaticText) - } - node { - label = "Subtitle: subtitle" - isAccessibilityElement = true - traits(UIAccessibilityTraitStaticText) - } - node { - label = "Details: details" - isAccessibilityElement = true - traits(UIAccessibilityTraitStaticText) - } - } - } - - @Test - fun testVisibleNodes() = runUIKitInstrumentedTest { - var alpha by mutableStateOf(0f) - - setContentWithAccessibilityEnabled { - Text("Hidden", modifier = Modifier.graphicsLayer { - this.alpha = alpha - }) - } - - assertAccessibilityTree { - label = "Hidden" - isAccessibilityElement = false - } - - alpha = 1f - assertAccessibilityTree { - label = "Hidden" - isAccessibilityElement = true - } - } - - @Test - fun testVisibleNodeContainers() = runUIKitInstrumentedTest { - var alpha by mutableStateOf(0f) - - setContentWithAccessibilityEnabled { - Column { - Text("Text 1") - Row(modifier = Modifier.graphicsLayer { - this.alpha = alpha - }) { - Text("Text 2") - Text("Text 3") - } - } - } - - assertAccessibilityTree { - node { - label = "Text 1" - isAccessibilityElement = true - } - node { - label = "Text 2" - isAccessibilityElement = false - } - node { - label = "Text 3" - isAccessibilityElement = false - } - } - - alpha = 1f - assertAccessibilityTree { - node { - label = "Text 1" - isAccessibilityElement = true - } - node { - label = "Text 2" - isAccessibilityElement = true - } - node { - label = "Text 3" - isAccessibilityElement = true - } - } - } - - @Test - fun testAccessibilityContainer() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column(modifier = Modifier.testTag("Container")) { - Text("Text 1") - Text("Text 2") - } - } - - assertAccessibilityTree { - identifier = "Container" - isAccessibilityElement = false - node { - label = "Text 1" - isAccessibilityElement = true - } - node { - label = "Text 2" - isAccessibilityElement = true - } - } - } - - @ExperimentalComposeUiApi - @Test - fun testAccessibilityInterop() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column(modifier = Modifier.testTag("Container")) { - UIKitView( - factory = { - val view = UIView() - view.setIsAccessibilityElement(true) - view.setAccessibilityLabel("Disabled") - view - }, - properties = UIKitInteropProperties(isNativeAccessibilityEnabled = false) - ) - UIKitView( - factory = { - val view = UIView() - view.setIsAccessibilityElement(true) - view.setAccessibilityLabel("Enabled") - view - }, - properties = UIKitInteropProperties(isNativeAccessibilityEnabled = true) - ) - UIKitView( - factory = { - val view = UIView() - view.setIsAccessibilityElement(true) - view.setAccessibilityLabel("Enabled With Tag") - view - }, - properties = UIKitInteropProperties(isNativeAccessibilityEnabled = true), - modifier = Modifier.testTag("Container Tag") - ) - } - } - - assertAccessibilityTree { - identifier = "Container" - isAccessibilityElement = false - node { - label = "Enabled" - isAccessibilityElement = true - } - node { - identifier = "Container Tag" - isAccessibilityElement = false - node { - label = "Enabled With Tag" - isAccessibilityElement = true - } - } - } - } - - @Test - fun testChildrenOfCollapsedNode() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column { - Row(modifier = Modifier.testTag("row").clickable {}) { - Text("Foo", modifier = Modifier.testTag("row_title")) - Text("Bar", modifier = Modifier.testTag("row_subtitle")) - } - } - } - - assertAccessibilityTree { - node { - label = "Foo\nBar" - identifier = "row" - isAccessibilityElement = true - traits(UIAccessibilityTraitButton) - } - node { - label = "Foo" - identifier = "row_title" - isAccessibilityElement = false - traits(UIAccessibilityTraitStaticText) - } - node { - label = "Bar" - identifier = "row_subtitle" - isAccessibilityElement = false - traits(UIAccessibilityTraitStaticText) - } - } - } -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/LayersAccessibilityTest.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/LayersAccessibilityTest.kt deleted file mode 100644 index c15708424d..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/accessibility/LayersAccessibilityTest.kt +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.ui.accessibility - -import androidx.compose.material.Text -import androidx.compose.runtime.mutableStateOf -import androidx.compose.test.utils.assertAccessibilityTree -import androidx.compose.test.utils.runUIKitInstrumentedTest -import androidx.compose.ui.window.Dialog -import androidx.compose.ui.window.Popup -import androidx.compose.ui.window.PopupProperties -import kotlin.test.Test - -class LayersAccessibilityTest { - - @Test - fun testNodesCoveredByPopup() = runUIKitInstrumentedTest { - val topPopup = mutableStateOf(false) - val bottomPopup = mutableStateOf(false) - val topPopupFocusable = mutableStateOf(false) - setContentWithAccessibilityEnabled { - Text("Root") - if (bottomPopup.value) { - Popup { - Text("Popup 1") - } - } - if (topPopup.value) { - Popup(properties = PopupProperties(focusable = topPopupFocusable.value)) { - Text("Popup 2") - } - } - } - - assertAccessibilityTree { - label = "Root" - } - - bottomPopup.value = true - // Non-focusable popup should not hide content under it for accessibility reader - assertAccessibilityTree { - node { - label = "Root" - } - node { - label = "Popup 1" - } - } - - topPopup.value = true - // Non-focusable popup should not hide content under it for accessibility reader - assertAccessibilityTree { - node { - label = "Root" - } - node { - node { - label = "Popup 1" - } - node { - label = "Popup 2" - } - } - } - - topPopupFocusable.value = true - // Popup should react on focusable flag change - assertAccessibilityTree { - label = "Popup 2" - } - - topPopup.value = false - bottomPopup.value = false - assertAccessibilityTree { - label = "Root" - } - } - - @Test - fun testNodesCoveredByDialog() = runUIKitInstrumentedTest { - val showDialog = mutableStateOf(false) - setContentWithAccessibilityEnabled { - Text("Root") - Popup { - Text("Popup") - } - if (showDialog.value) { - Dialog(onDismissRequest = {}) { - Text("Dialog") - } - } - } - - assertAccessibilityTree { - node { - label = "Root" - } - node { - label = "Popup" - } - } - - showDialog.value = true - // Dialog popup should hide content under it for accessibility reader - assertAccessibilityTree { - label = "Dialog" - } - - showDialog.value = false - - assertAccessibilityTree { - node { - label = "Root" - } - node { - label = "Popup" - } - } - } - - @Test - fun testLayersAppearanceOrder() = runUIKitInstrumentedTest { - val bottomLayer = mutableStateOf(false) - val middleLayers = mutableStateOf(false) - setContentWithAccessibilityEnabled { - Text("Root") - if (bottomLayer.value) { - Popup(properties = PopupProperties(focusable = true)) { - Text("Bottom") - } - } - if (middleLayers.value) { - Popup(properties = PopupProperties(focusable = true)) { - Text("Middle 1") - } - // Non-focusable layer - Popup { - Text("Middle 2") - } - } - Popup(properties = PopupProperties(focusable = true)) { - Text("Top") - } - } - - assertAccessibilityTree { - label = "Top" - } - - bottomLayer.value = true - // The last added layer should be on top - assertAccessibilityTree { - label = "Bottom" - } - - middleLayers.value = true - // The last added layers should be on top - assertAccessibilityTree { - node { - label = "Middle 1" - } - node { - label = "Middle 2" - } - } - } -} \ No newline at end of file diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/configuration.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/configuration.kt deleted file mode 100644 index bec2e0ff66..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/configuration.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test - -import kotlinx.cinterop.ExperimentalForeignApi -import androidx.compose.xctest.* -import platform.XCTest.XCTestSuite - -@Suppress("unused") -@OptIn(ExperimentalForeignApi::class) -fun testSuite(): XCTestSuite = setupXCTestSuite( - // Run all test cases from the tests - // BasicInteractionTest::class, - // LayersAccessibilityTest::class, - - // Run test cases from a test - // BasicInteractionTest::testButtonClick, - // LayersAccessibilityTest::testLayersAppearanceOrder -) diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/interaction/BasicInteractionTest.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/interaction/BasicInteractionTest.kt deleted file mode 100644 index f5dc386241..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/interaction/BasicInteractionTest.kt +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test.interaction - -import androidx.compose.foundation.ScrollState -import androidx.compose.foundation.background -import androidx.compose.foundation.combinedClickable -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Button -import androidx.compose.material.Text -import androidx.compose.material.TextField -import androidx.compose.test.utils.assertVisibleInContainer -import androidx.compose.test.utils.findNodeWithLabel -import androidx.compose.test.utils.findNodeWithTag -import androidx.compose.test.utils.runUIKitInstrumentedTest -import androidx.compose.test.utils.toDpRect -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.layout.boundsInWindow -import androidx.compose.ui.layout.onGloballyPositioned -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.unit.* -import kotlin.test.Test -import kotlin.test.assertEquals -import kotlin.test.assertTrue - -class BasicInteractionTest { - /** - * Distance in pixels a touch can wander before we think the user is scrolling. - * https://github.com/JetBrains/compose-multiplatform-core/blob/jb-main/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/platform/Constants.uikit.kt#L22 - */ - private val CUPERTINO_TOUCH_SLOP = 10.dp - - @Test - fun testButtonClick() = runUIKitInstrumentedTest { - var clicks = 0 - setContentWithAccessibilityEnabled { - Box(modifier = Modifier.fillMaxSize()) { - Button( - onClick = { clicks++ }, - modifier = Modifier - .testTag("Button") - .align(Alignment.Center) - ) { - Text("Click me") - } - } - } - - assertEquals(0, clicks) - findNodeWithLabel(label = "Click me") - .tap() - assertEquals(1, clicks) - findNodeWithLabel(label = "Click me") - .tap() - assertEquals(2, clicks) - findNodeWithLabel(label = "Click me") - .tap() - assertEquals(3, clicks) - } - - @Test - fun testScroll() = runUIKitInstrumentedTest { - val state = ScrollState(0) - var boxRect = DpRect(DpOffset.Zero, DpSize.Zero) - setContentWithAccessibilityEnabled { - Column(modifier = Modifier.fillMaxSize().verticalScroll(state)) { - Box( - modifier = Modifier - .fillMaxWidth() - .height(100.dp) - .background(Color.Red) - .testTag("Hidden after scroll box") - ) - Box(modifier = Modifier - .fillMaxWidth() - .height(100.dp) - .background(Color.Green) - .testTag("Box") - .onGloballyPositioned { boxRect = it.boundsInWindow().toDpRect(density) } - ) - Box( - modifier = Modifier - .fillMaxWidth() - .height(screenSize.height) - .background(Color.White) - ) - } - } - - touchDown(screenSize.center) - .dragBy(dy = -(100.dp + CUPERTINO_TOUCH_SLOP)) - - waitForIdle() - - assertEquals(100 * density.density, state.value.toFloat()) - assertEquals(DpRect(DpOffset.Zero, DpSize(screenSize.width, 100.dp)), boxRect) - } - - @Test - fun testDoubleTap() = runUIKitInstrumentedTest { - var doubleClicked = false - setContentWithAccessibilityEnabled { - Column(modifier = Modifier.safeDrawingPadding()) { - Box(modifier = Modifier.size(100.dp).testTag("Clickable").combinedClickable( - onDoubleClick = { doubleClicked = true } - ) {}) - TextField("Hello Long Text", {}, modifier = Modifier.testTag("TextField")) - } - } - - findNodeWithTag("Clickable").doubleTap() - - assertTrue(doubleClicked) - } - - @Test - fun testTextFieldCallout() = runUIKitInstrumentedTest { - setContentWithAccessibilityEnabled { - Column(modifier = Modifier.safeDrawingPadding()) { - TextField("Hello-long-long-long-long-long-text", {}, modifier = Modifier.testTag("TextField")) - } - } - - findNodeWithTag("TextField").doubleTap() - - waitForIdle() - - // Verify elements from context menu present - findNodeWithLabel("Cut").let { - it.assertVisibleInContainer() - assertTrue(it.isAccessibilityElement ?: false) - } - findNodeWithLabel("Copy").let { - it.assertVisibleInContainer() - assertTrue(it.isAccessibilityElement ?: false) - } - findNodeWithLabel("Paste").let { - it.assertVisibleInContainer() - assertTrue(it.isAccessibilityElement ?: false) - } - findNodeWithLabel("Select All").let { - it.assertVisibleInContainer() - assertTrue(it.isAccessibilityElement ?: false) - } - } -} \ No newline at end of file diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/AccessibilityTestNode.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/AccessibilityTestNode.kt deleted file mode 100644 index 4fce65acee..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/AccessibilityTestNode.kt +++ /dev/null @@ -1,321 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test.utils - -import androidx.compose.ui.unit.* -import kotlinx.cinterop.CValue -import kotlin.test.assertEquals -import kotlin.test.fail -import kotlinx.cinterop.ExperimentalForeignApi -import kotlinx.cinterop.useContents -import platform.CoreGraphics.CGRect -import platform.UIKit.* -import platform.darwin.NSIntegerMax -import platform.darwin.NSObject -import kotlin.test.assertTrue - -/** - * Constructs an accessibility tree representation of the UI hierarchy starting from the window. - * - * This function traverses the accessibility elements and their children to build a structured - * node tree with information about accessibility properties, allowing for analysis and testing - * of the accessibility features of the UI. - * - * @return The root node of the accessibility tree representing the current UI hierarchy, - * or null if the tree cannot be constructed. - */ -@OptIn(ExperimentalForeignApi::class) -internal fun UIKitInstrumentedTest.getAccessibilityTree(): AccessibilityTestNode { - fun buildNode(element: NSObject, level: Int): AccessibilityTestNode { - val children = mutableListOf() - val elements = element.accessibilityElements() - - if (elements != null) { - elements.forEach { - children.add(buildNode(it as NSObject, level = level + 1)) - } - } else { - val count = element.accessibilityElementCount() - if (count == NSIntegerMax) { - when { - element is UIView -> { - element.subviews.mapNotNull { - children.add(buildNode(it as UIView, level = level + 1)) - } - } - } - } else if (count > 0) { - (0 until count).mapNotNull { - val child = element.accessibilityElementAtIndex(it) as NSObject - children.add(buildNode(child, level = level + 1)) - } - } else if (element is UIView) { - element.subviews.mapNotNull { - children.add(buildNode(it as UIView, level = level + 1)) - } - } - } - - return AccessibilityTestNode( - isAccessibilityElement = element.isAccessibilityElement, - identifier = (element as? UIAccessibilityElement)?.accessibilityIdentifier, - label = element.accessibilityLabel, - value = element.accessibilityValue, - frame = element.accessibilityFrame.toDpRect(), - children = children, - traits = allAccessibilityTraits.keys.filter { - element.accessibilityTraits and it != 0.toULong() - }, - element = element - ).also { node -> - children.forEach { it.parent = node } - } - } - - return buildNode(appDelegate.window!!, 0) -} - -private val allAccessibilityTraits = mapOf( - UIAccessibilityTraitNone to "UIAccessibilityTraitNone", - UIAccessibilityTraitButton to "UIAccessibilityTraitButton", - UIAccessibilityTraitLink to "UIAccessibilityTraitLink", - UIAccessibilityTraitHeader to "UIAccessibilityTraitHeader", - UIAccessibilityTraitSearchField to "UIAccessibilityTraitSearchField", - UIAccessibilityTraitImage to "UIAccessibilityTraitImage", - UIAccessibilityTraitSelected to "UIAccessibilityTraitSelected", - UIAccessibilityTraitPlaysSound to "UIAccessibilityTraitPlaysSound", - UIAccessibilityTraitKeyboardKey to "UIAccessibilityTraitKeyboardKey", - UIAccessibilityTraitStaticText to "UIAccessibilityTraitStaticText", - UIAccessibilityTraitSummaryElement to "UIAccessibilityTraitSummaryElement", - UIAccessibilityTraitNotEnabled to "UIAccessibilityTraitNotEnabled", - UIAccessibilityTraitUpdatesFrequently to "UIAccessibilityTraitUpdatesFrequently", - UIAccessibilityTraitStartsMediaSession to "UIAccessibilityTraitStartsMediaSession", - UIAccessibilityTraitAdjustable to "UIAccessibilityTraitAdjustable", - UIAccessibilityTraitAllowsDirectInteraction to "UIAccessibilityTraitAllowsDirectInteraction", - UIAccessibilityTraitCausesPageTurn to "UIAccessibilityTraitCausesPageTurn", - UIAccessibilityTraitTabBar to "UIAccessibilityTraitTabBar", - UIAccessibilityTraitToggleButton to "UIAccessibilityTraitToggleButton", - UIAccessibilityTraitSupportsZoom to "UIAccessibilityTraitSupportsZoom" -) - -/** - * Represents a node in an accessibility tree, which is used for testing accessibility features - * within a UI hierarchy. This class captures various accessibility properties of UI components - * and structures them into a tree. - */ -internal data class AccessibilityTestNode( - var isAccessibilityElement: Boolean? = null, - var identifier: String? = null, - var label: String? = null, - var value: String? = null, - var frame: DpRect? = null, - var children: List? = null, - var traits: List? = null, - var element: NSObject? = null, - var parent: AccessibilityTestNode? = null, -) { - fun node(builder: AccessibilityTestNode.() -> Unit) { - children = (children ?: emptyList()) + AccessibilityTestNode().apply(builder) - } - - fun traits(vararg trait: UIAccessibilityTraits) { - traits = (traits ?: emptyList()) + trait - } - - fun validate(actualNode: AccessibilityTestNode?) { - isAccessibilityElement?.let { - assertEquals(it, actualNode?.isAccessibilityElement) - } - identifier?.let { - assertEquals(it, actualNode?.identifier) - } - label?.let { - assertEquals(it, actualNode?.label) - } - value?.let { - assertEquals(it, actualNode?.value) - } - frame?.let { - assertEquals(it, actualNode?.frame) - } - traits?.let { - assertEquals(it.toSet(), actualNode?.traits?.toSet()) - } - children?.let { - assertEquals(it.count(), actualNode?.children?.count()) - it.zip(actualNode?.children ?: emptyList()) { validator, child -> - validator.validate(child) - } - } - } - - val hasAccessibilityComponents: Boolean = identifier != null || - isAccessibilityElement == true || - label != null || - value != null || - traits?.isNotEmpty() == true - - fun printTree(): String { - val builder = StringBuilder() - - fun print(node: AccessibilityTestNode, level: Int) { - val indent = " ".repeat(level) - builder.append(indent) - builder.append(node.label ?: node.identifier ?: "other") - builder.append(" - ${node.frame}") - node.element?.let { - builder.append(" - <${it::class}>") - } - builder.appendLine() - - val fieldIndent = "$indent |" - if (node.isAccessibilityElement == true) { - builder.appendLine("$fieldIndent isAccessibilityElement: true") - } - node.identifier?.let { - builder.appendLine("$fieldIndent accessibilityIdentifier: $it") - } - node.label?.let { builder.appendLine("$fieldIndent accessibilityLabel: $it") } - if (node.traits?.isNotEmpty() == true) { - builder.appendLine("$fieldIndent accessibilityTraits:") - node.traits?.forEach { - builder.appendLine("$fieldIndent - ${allAccessibilityTraits.getValue(it)}") - } - } - node.value?.let { builder.appendLine("$fieldIndent accessibilityValue: $it") } - node.element?.accessibilityCustomActions?.takeIf { it.isNotEmpty() }?.let { - builder.appendLine("$fieldIndent accessibilityCustomActions: $it") - } - - node.children?.forEach { print(it, level + 1) } - } - print(this, level = 0) - - return builder.toString() - } -} - -/** - * Normalizes the accessibility nodes tree by analyzing its properties and children. - * Removes all element that are not accessibility elements or does not work as elements containers. - */ -internal fun AccessibilityTestNode.normalized(): AccessibilityTestNode? { - val normalizedChildren = children?.flatMap { child -> - child.normalized()?.let { - if (it.hasAccessibilityComponents || (it.children?.count() ?: 0) > 1) { - listOf(it) - } else { - it.children - } - } ?: emptyList() - } ?: emptyList() - - return if (hasAccessibilityComponents || normalizedChildren.count() > 1) { - this.copy(children = normalizedChildren) - } else if (normalizedChildren.count() == 1) { - normalizedChildren.single() - } else { - null - } -} - -internal fun AccessibilityTestNode.assertVisibleInContainer() { - var frame = this.frame ?: DpRectZero() - var iterator = parent - while (iterator != null) { - frame = frame.intersect(iterator.frame ?: DpRectZero()) - iterator = iterator.parent - } - - assertTrue( - frame.width >= 1.dp && frame.height >= 1.dp, - "Element with frame ${this.frame} is not visible or has very small size" - ) -} - -/** - * Asserts that the current accessibility tree matches the expected structure defined in the - * provided lambda. The expected structure is defined by configuring an `AccessibilityTestNode`, - * which is then validated against the actual normalized accessibility tree. This function waits - * for the UI to be idle before performing the validation. - * - * @param expected A lambda that allows the caller to specify the expected structure and properties - * of the accessibility tree. - */ -internal fun UIKitInstrumentedTest.assertAccessibilityTree( - expected: AccessibilityTestNode.() -> Unit -) { - val validator = AccessibilityTestNode() - with(validator, expected) - assertAccessibilityTree(validator) -} - -internal fun UIKitInstrumentedTest.findNodeWithTag(tag: String) = findNodeOrNull { - it.identifier == tag -} ?: fail("Unable to find node with identifier: $tag") - -internal fun UIKitInstrumentedTest.findNodeWithLabel(label: String) = findNodeOrNull { - it.label == label -} ?: fail("Unable to find node with label: $label") - -internal fun UIKitInstrumentedTest.firstAccessibleNode() = - findNodeOrNull { it.isAccessibilityElement == true } - ?: fail("Unable to find accessibility element") - -internal fun UIKitInstrumentedTest.findNodeOrNull( - isValid: (AccessibilityTestNode) -> Boolean -): AccessibilityTestNode? { - waitForIdle() - val actualTreeRoot = getAccessibilityTree() - - fun check(node: AccessibilityTestNode): AccessibilityTestNode? { - return if (isValid(node)) { - node - } else { - node.children?.firstNotNullOfOrNull(::check) - } - } - - return check(node = actualTreeRoot) -} - -/** - * Asserts that the current accessibility tree matches the expected structure defined in the - * provided lambda. The expected structure is defined by configuring an `AccessibilityTestNode`, - * which is then validated against the actual normalized accessibility tree. This function waits - * for the UI to be idle before performing the validation. - * - * @param expected The expected accessibility tree structure represented by an instance of - * `AccessibilityTestNode`. - */ -internal fun UIKitInstrumentedTest.assertAccessibilityTree(expected: AccessibilityTestNode) { - waitForIdle() - - val actualTreeRoot = getAccessibilityTree() - val normalizedTree = actualTreeRoot.normalized() - - try { - expected.validate(normalizedTree) - } catch (e: Throwable) { - val message = "Unable to validate accessibility tree. Expected normalized tree:\n\n" + - "${expected.printTree()}\n" + - "Normalized tree:\n\n${normalizedTree?.printTree()}\n" + - "Actual tree:\n\n${actualTreeRoot.printTree()}\n" - println(message) - - throw e - } -} - -@OptIn(ExperimentalForeignApi::class) -internal fun CValue.toDpRect() = useContents { - DpRect( - left = origin.x.dp, - top = origin.y.dp, - right = origin.x.dp + size.width.dp, - bottom = origin.y.dp + size.height.dp, - ) -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/DpRect+Utils.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/DpRect+Utils.kt deleted file mode 100644 index f82e5c0cb8..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/DpRect+Utils.kt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test.utils - -import androidx.compose.ui.geometry.Rect -import androidx.compose.ui.unit.* -import kotlinx.cinterop.CValue -import kotlinx.cinterop.ExperimentalForeignApi -import kotlinx.cinterop.useContents -import platform.CoreGraphics.CGPoint -import platform.CoreGraphics.CGPointMake -import platform.UIKit.UIView - -@OptIn(ExperimentalForeignApi::class) -internal fun DpOffset.toCGPoint(): CValue = CGPointMake(x.value.toDouble(), y.value.toDouble()) - -internal fun DpRect.center(): DpOffset = DpOffset((left + right) / 2, (top + bottom) / 2) - -internal fun DpRect.toRect(density: Density): Rect = Rect( - left = left.value * density.density, - right = right.value * density.density, - top = top.value * density.density, - bottom = bottom.value * density.density -) - -internal fun Rect.toDpRect(density: Density): DpRect = DpRect( - left = left.dp / density.density, - right = right.dp / density.density, - top = top.dp / density.density, - bottom = bottom.dp / density.density -) - -internal fun DpRectZero() = DpRect(0.dp, 0.dp, 0.dp, 0.dp) - -internal fun DpRect.intersect(other: DpRect): DpRect { - if (right < other.left || other.right < left) return DpRectZero() - if (bottom < other.top || other.bottom < top) return DpRectZero() - return DpRect( - left = max(left, other.left), - top = max(top, other.top), - right = min(right, other.right), - bottom = min(bottom, other.bottom) - ) -} - -@OptIn(ExperimentalForeignApi::class) -internal fun CValue.toDpOffset(): DpOffset = useContents { DpOffset(x.dp, y.dp) } - -@OptIn(ExperimentalForeignApi::class) -internal fun UIView.dpRectInWindow() = convertRect(bounds, toView = null).toDpRect() -internal fun List.forEachWithPrevious(block: (T, T) -> Unit) { - var previous: T? = null - for (current in this) { - previous?.let { block(it, current) } - previous = current - } -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/OsVersion.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/OsVersion.kt deleted file mode 100644 index 9b13c2d483..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/OsVersion.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test.utils - -import kotlinx.cinterop.ExperimentalForeignApi -import kotlinx.cinterop.useContents -import platform.Foundation.NSProcessInfo - -@OptIn(ExperimentalForeignApi::class) -internal fun available(iosMajorVersion: Int, iosMinorVersion: Int = 0): Boolean { - return NSProcessInfo.processInfo.operatingSystemVersion.useContents { - when { - majorVersion.toInt() < iosMajorVersion -> false - majorVersion.toInt() > iosMajorVersion -> true - minorVersion.toInt() < iosMinorVersion -> false - else -> true - } - } -} \ No newline at end of file diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UIKitInstrumentedTest.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UIKitInstrumentedTest.kt deleted file mode 100644 index de0058f4e7..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UIKitInstrumentedTest.kt +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test.utils - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.ExperimentalComposeApi -import androidx.compose.ui.platform.AccessibilitySyncOptions -import androidx.compose.ui.uikit.ComposeUIViewControllerConfiguration -import androidx.compose.ui.unit.* -import androidx.compose.ui.window.ComposeUIViewController -import kotlinx.cinterop.* -import platform.Foundation.* -import platform.UIKit.* -import platform.darwin.NSObject -import kotlin.time.Duration -import kotlin.time.Duration.Companion.milliseconds -import kotlin.time.Duration.Companion.seconds -import kotlin.time.TimeSource - -/** - * Sets up the test environment for iOS instrumented tests, runs the given [test][testBlock] - * and then tears down the test environment. Use the methods on [UIKitInstrumentedTest] - * in the test to find compose content and make assertions on it. - * @param [testBlock] The test function. - */ -internal fun runUIKitInstrumentedTest( - testBlock: UIKitInstrumentedTest.() -> Unit -) = with(UIKitInstrumentedTest()) { - try { - testBlock() - } finally { - tearDown() - } -} - -/** - * A class designed for instrumented testing of UIKit-related functionality. It provides methods for setting - * content, simulating user interactions, and managing application lifecycle during testing scenarios. - * - * This class is primarily intended for internal use within a Compose multiplatform environment that integrates - * with UIKit APIs on iOS. - * - * Constructor properties are initialized with the attributes of the main screen and a mock delegate to simulate - * the application setup. - */ -@OptIn(ExperimentalForeignApi::class) -internal class UIKitInstrumentedTest { - private val screen = UIScreen.mainScreen() - val density = Density(density = screen.scale.toFloat()) - val appDelegate = MockAppDelegate() - val screenSize: DpSize = screen.bounds().useContents { DpSize(size.width.dp, size.height.dp) } - lateinit var hostingViewController: UIViewController - private set - - @OptIn(ExperimentalComposeApi::class) - fun setContentWithAccessibilityEnabled(content: @Composable () -> Unit) { - setContent({ accessibilitySyncOptions = AccessibilitySyncOptions.Always }, content) - } - - fun setContent( - configure: ComposeUIViewControllerConfiguration.() -> Unit = {}, - content: @Composable () -> Unit - ) { - // TODO: Use ComposeHostingViewController when moving to compose-multiplatform-core repo - hostingViewController = ComposeUIViewController( - configure = { - enforceStrictPlistSanityCheck = false - configure() - }, - content = content - ) - - appDelegate.setUpWindow(hostingViewController) - waitForIdle() - } - - fun tearDown() { - appDelegate.cleanUp() - } - - private val isIdle: Boolean - get() { - return false - // TODO: Uncomment. Use proper isIdle implementation when moving to compose-multiplatform-core repo - // val hadSnapshotChanges = Snapshot.current.hasPendingChanges() - // val isApplyObserverNotificationPending = Snapshot.isApplyObserverNotificationPending - // - // val containerInvalidations = hostingViewController.performSelector(NSSelectorFromString("hasInvalidations")) as Boolean - // - // return !hadSnapshotChanges && !isApplyObserverNotificationPending && !containerInvalidations - } - - - fun waitForIdle(timeoutMillis: Long = 500) { - // TODO: Properly implement `waitForIdle` when moving to compose-multiplatform-core repo - try { - waitUntil(timeoutMillis = timeoutMillis) { isIdle } - } catch (e: Throwable) { - // Do nothing - } - } - - fun delay(timeoutMillis: Long) { - val runLoop = NSRunLoop.currentRunLoop() - runLoop.runUntilDate(NSDate.dateWithTimeIntervalSinceNow(timeoutMillis.toDouble() / 1000.0)) - } - - fun waitUntil( - conditionDescription: String? = null, - timeoutMillis: Long = 5_000, - condition: () -> Boolean - ) { - val runLoop = NSRunLoop.currentRunLoop() - val endTime = TimeSource.Monotonic.markNow() + timeoutMillis.milliseconds - while (!condition()) { - if (TimeSource.Monotonic.markNow() > endTime) { - throw AssertionError(conditionDescription ?: "Timeout ${timeoutMillis}ms reached.") - } - runLoop.runUntilDate(NSDate.dateWithTimeIntervalSinceNow(0.005)) - } - } - - // Touches: - - /** - * Simulates a touch-down event at the specified position on the screen. - * - * @param position The position on the root hosting controller. - * @return A UITouch object representing the touch interaction. - */ - fun touchDown(position: DpOffset): UITouch { - val positionOnWindow = hostingViewController.view.convertPoint( - point = position.toCGPoint(), - toView = appDelegate.window() - ) - - return appDelegate.window()!!.touchDown(positionOnWindow.toDpOffset()) - } - - /** - * Simulates a tap gesture at the specified position on the screen. - * - * @param position The position on the root hosting controller. - */ - fun tap(position: DpOffset): UITouch { - return touchDown(position).up() - } - - /** - * Simulates a tap gesture for a given AccessibilityTestNode. - */ - fun AccessibilityTestNode.tap(): UITouch { - val frame = frame ?: error("Internal error. Frame is missing.") - return tap(frame.center()) - } - - fun AccessibilityTestNode.doubleTap(): UITouch { - val frame = frame ?: error("Internal error. Frame is missing.") - tap(frame.center()) - delay(50) - return tap(frame.center()) - } - - /** - * Simulates a drag gesture on the screen, moving the touch from its current location to a specified position - * over a given duration. - * - * @param location The target position of the drag in DpOffset. - * @param duration The duration of the drag gesture, defaulting to 0.5 seconds. - * @return The same UITouch instance after completing the drag gesture. - */ - fun UITouch.dragTo(location: DpOffset, duration: Duration = 0.5.seconds): UITouch { - val startLocation = locationInView(appDelegate.window()!!).toDpOffset() - val endLocation = hostingViewController.view.convertPoint( - point = location.toCGPoint(), - toView = appDelegate.window() - ).toDpOffset() - - val startTime = TimeSource.Monotonic.markNow() - while (TimeSource.Monotonic.markNow() <= startTime + duration) { - val progress = ((TimeSource.Monotonic.markNow() - startTime) / duration).coerceIn(0.0, 1.0) - val touchLocation = lerp(startLocation, endLocation, progress.toFloat()) - - this.moveToLocationOnWindow(touchLocation) - NSRunLoop.currentRunLoop().runUntilDate(NSDate.dateWithTimeIntervalSinceNow(1.0 / 60)) - } - this.moveToLocationOnWindow(endLocation) - return this - } - - /** - * Simulates a drag gesture on the screen, moving the touch from its current location by a specified offset - * over a given duration. - * - * @param offset The offset by which the touch is moved, specified as a DpOffset. - * @param duration The duration of the drag gesture, defaulting to 0.5 seconds. - * @return The same UITouch instance after completing the drag gesture. - */ - fun UITouch.dragBy(offset: DpOffset, duration: Duration = 0.5.seconds): UITouch { - return dragTo(location + offset, duration) - } - - /** - * Simulates a drag gesture on the screen, moving the touch from its current location by specified x and y offsets - * over a given duration. - * - * @param dx The horizontal offset by which the touch is moved, specified as a Dp. Defaults to 0.dp. - * @param dy The vertical offset by which the touch is moved, specified as a Dp. Defaults to 0.dp. - * @param duration The duration of the drag gesture, specified as a Duration. Defaults to 0.5 seconds. - * @return The same UITouch instance after completing the drag gesture. - */ - fun UITouch.dragBy(dx: Dp = 0.dp, dy: Dp = 0.dp, duration: Duration = 0.5.seconds): UITouch { - return dragBy(DpOffset(dx, dy), duration) - } - - val UITouch.location: DpOffset get() { - return locationInView(hostingViewController.view).toDpOffset() - } -} - -@OptIn(ExperimentalForeignApi::class) -internal class MockAppDelegate: NSObject(), UIApplicationDelegateProtocol { - private var _window: UIWindow? = null - override fun window(): UIWindow? = _window - - fun setUpWindow(viewController: UIViewController) { - UIApplication.sharedApplication().setDelegate(this) - - _window = UIWindow(frame = UIScreen.mainScreen.bounds) - _window?.backgroundColor = UIColor.systemBackgroundColor - - _window?.rootViewController = viewController - _window?.makeKeyAndVisible() - } - - fun cleanUp() { - _window = null - val window = UIWindow(frame = UIScreen.mainScreen.bounds) - window.rootViewController = UIViewController() - window.makeKeyAndVisible() - } -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UITouch+Utils.kt b/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UITouch+Utils.kt deleted file mode 100644 index c70a14440f..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/kotlin/androidx/compose/test/utils/UITouch+Utils.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -package androidx.compose.test.utils - -import androidx.compose.ui.unit.DpOffset -import kotlinx.cinterop.ExperimentalForeignApi -import platform.UIKit.UITouch -import platform.UIKit.UITouchPhase -import platform.UIKit.UIWindow - -@OptIn(ExperimentalForeignApi::class) -internal fun UIWindow.touchDown(location: DpOffset): UITouch { - return UITouch.touchAtPoint( - point = location.toCGPoint(), - inWindow = this, - tapCount = 1L, - fromEdge = false - ).also { - it.send() - } -} - -@OptIn(ExperimentalForeignApi::class) -internal fun UITouch.moveToLocationOnWindow(location: DpOffset) { - setLocationInWindow(location.toCGPoint()) - setPhase(UITouchPhase.UITouchPhaseMoved) - send() -} - -@OptIn(ExperimentalForeignApi::class) -internal fun UITouch.hold(): UITouch { - setPhase(UITouchPhase.UITouchPhaseStationary) - send() - return this -} - -@OptIn(ExperimentalForeignApi::class) -internal fun UITouch.up(): UITouch { - setPhase(UITouchPhase.UITouchPhaseEnded) - send() - return this -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.pbxproj b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.pbxproj deleted file mode 100644 index c3d8fcdd63..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.pbxproj +++ /dev/null @@ -1,311 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 63; - objects = { - -/* Begin PBXBuildFile section */ - 999869392D479FAB0096554D /* HIDEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 999869362D479FAB0096554D /* HIDEvent.m */; }; - 9998693A2D479FAB0096554D /* UITouch+Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 999869382D479FAB0096554D /* UITouch+Test.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 995A49382D3023CC0091FB9B /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 995A493A2D3023CC0091FB9B /* libCMPTestUtils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCMPTestUtils.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 999869352D479FAB0096554D /* HIDEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HIDEvent.h; sourceTree = ""; }; - 999869362D479FAB0096554D /* HIDEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HIDEvent.m; sourceTree = ""; }; - 999869372D479FAB0096554D /* UITouch+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITouch+Test.h"; sourceTree = ""; }; - 999869382D479FAB0096554D /* UITouch+Test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITouch+Test.m"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 995A49372D3023CC0091FB9B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 995A49032D301B510091FB9B = { - isa = PBXGroup; - children = ( - 9998693B2D479FC80096554D /* CMPTestUtils */, - 995A490E2D301B510091FB9B /* Products */, - ); - sourceTree = ""; - wrapsLines = 1; - }; - 995A490E2D301B510091FB9B /* Products */ = { - isa = PBXGroup; - children = ( - 995A493A2D3023CC0091FB9B /* libCMPTestUtils.a */, - ); - name = Products; - sourceTree = ""; - }; - 9998693B2D479FC80096554D /* CMPTestUtils */ = { - isa = PBXGroup; - children = ( - 999869352D479FAB0096554D /* HIDEvent.h */, - 999869362D479FAB0096554D /* HIDEvent.m */, - 999869372D479FAB0096554D /* UITouch+Test.h */, - 999869382D479FAB0096554D /* UITouch+Test.m */, - ); - path = CMPTestUtils; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 995A49392D3023CC0091FB9B /* CMPTestUtils */ = { - isa = PBXNativeTarget; - buildConfigurationList = 995A49412D3023CC0091FB9B /* Build configuration list for PBXNativeTarget "CMPTestUtils" */; - buildPhases = ( - 995A49362D3023CC0091FB9B /* Sources */, - 995A49372D3023CC0091FB9B /* Frameworks */, - 995A49382D3023CC0091FB9B /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CMPTestUtils; - packageProductDependencies = ( - ); - productName = CMPTestUtils; - productReference = 995A493A2D3023CC0091FB9B /* libCMPTestUtils.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 995A49042D301B510091FB9B /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - LastUpgradeCheck = 1610; - TargetAttributes = { - 995A49392D3023CC0091FB9B = { - CreatedOnToolsVersion = 16.1; - }; - }; - }; - buildConfigurationList = 995A49072D301B510091FB9B /* Build configuration list for PBXProject "CMPTestUtils" */; - compatibilityVersion = "Xcode 14.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 995A49032D301B510091FB9B; - minimizedProjectReferenceProxies = 1; - productRefGroup = 995A490E2D301B510091FB9B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 995A49392D3023CC0091FB9B /* CMPTestUtils */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 995A49362D3023CC0091FB9B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 999869392D479FAB0096554D /* HIDEvent.m in Sources */, - 9998693A2D479FAB0096554D /* UITouch+Test.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 995A49182D301B510091FB9B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 995A49192D301B510091FB9B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 995A49422D3023CC0091FB9B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 995A49432D3023CC0091FB9B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 995A49072D301B510091FB9B /* Build configuration list for PBXProject "CMPTestUtils" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 995A49182D301B510091FB9B /* Debug */, - 995A49192D301B510091FB9B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 995A49412D3023CC0091FB9B /* Build configuration list for PBXNativeTarget "CMPTestUtils" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 995A49422D3023CC0091FB9B /* Debug */, - 995A49432D3023CC0091FB9B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 995A49042D301B510091FB9B /* Project object */; -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a625..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/xcshareddata/xcschemes/CMPTestUtils.xcscheme b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/xcshareddata/xcschemes/CMPTestUtils.xcscheme deleted file mode 100644 index 635accdd8a..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils.xcodeproj/xcshareddata/xcschemes/CMPTestUtils.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.h b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.h deleted file mode 100644 index 09ad41ee3f..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -#import - -typedef struct __IOHIDEvent * IOHIDEventPtr; - -IOHIDEventPtr HIDEventWithTouches(NSArray *touches) CF_RETURNS_RETAINED; diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.m b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.m deleted file mode 100644 index 00e823a8dd..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/HIDEvent.m +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -#import -#import "HIDEvent.h" -#import - -typedef enum : uint32_t { - kIOHIDEventTypeNULL, - kIOHIDEventTypeVendorDefined, - kIOHIDEventTypeButton, - kIOHIDEventTypeKeyboard, - kIOHIDEventTypeTranslation, - kIOHIDEventTypeRotation, - kIOHIDEventTypeScroll, - kIOHIDEventTypeScale, - kIOHIDEventTypeZoom, - kIOHIDEventTypeVelocity, - kIOHIDEventTypeOrientation, - kIOHIDEventTypeDigitizer, -} IOHIDEventType; - -typedef enum : uint32_t { - kIOHIDDigitizerEventRange = 1<<0, - kIOHIDDigitizerEventTouch = 1<<1, - kIOHIDDigitizerEventPosition = 1<<2, -} IOHIDDigitizerEventMask; - -typedef enum : uint32_t { - kIOHIDEventFieldDigitizerX = kIOHIDEventTypeDigitizer << 16, - kIOHIDEventFieldDigitizerY, - kIOHIDEventFieldDigitizerZ, - kIOHIDEventFieldDigitizerButtonMask, - kIOHIDEventFieldDigitizerType, - kIOHIDEventFieldDigitizerIndex, - kIOHIDEventFieldDigitizerIdentity, - kIOHIDEventFieldDigitizerEventMask, - kIOHIDEventFieldDigitizerRange, - kIOHIDEventFieldDigitizerTouch, - kIOHIDEventFieldDigitizerPressure, - kIOHIDEventFieldDigitizerAuxiliaryPressure, - kIOHIDEventFieldDigitizerTwist, - kIOHIDEventFieldDigitizerTiltX, - kIOHIDEventFieldDigitizerTiltY, - kIOHIDEventFieldDigitizerAltitude, - kIOHIDEventFieldDigitizerAzimuth, - kIOHIDEventFieldDigitizerQuality, - kIOHIDEventFieldDigitizerDensity, - kIOHIDEventFieldDigitizerIrregularity, - kIOHIDEventFieldDigitizerMajorRadius, - kIOHIDEventFieldDigitizerMinorRadius, - kIOHIDEventFieldDigitizerCollection, - kIOHIDEventFieldDigitizerCollectionChord, - kIOHIDEventFieldDigitizerChildEventMask, - kIOHIDEventFieldDigitizerIsDisplayIntegrated, -} IOHIDEventFieldDigitizer; - -typedef enum : uint32_t { - kIOHIDDigitizerTransducerTypeStylus = 0, - kIOHIDDigitizerTransducerTypePuck, - kIOHIDDigitizerTransducerTypeFinger, - kIOHIDDigitizerTransducerTypeHand -} IOHIDDigitizerTransducerType; - -void IOHIDEventAppendEvent(IOHIDEventPtr event, IOHIDEventPtr child); -void IOHIDEventSetIntegerValue(IOHIDEventPtr event, IOHIDEventFieldDigitizer fieldDigitizer, int value); -void IOHIDEventSetSenderID(IOHIDEventPtr event, uint64_t sender); - -IOHIDEventPtr IOHIDEventCreateDigitizerEvent(CFAllocatorRef allocator, - AbsoluteTime time, - IOHIDDigitizerTransducerType type, - uint32_t index, - uint32_t identity, - uint32_t eventMask, - uint32_t buttonMask, - double x, - double y, - double z, - double tipPressure, - double barrelPressure, - Boolean range, - Boolean touch, - UInt32 options); - -IOHIDEventPtr IOHIDEventCreateDigitizerFingerEventWithQuality(CFAllocatorRef allocator, - AbsoluteTime time, - uint32_t index, - uint32_t identity, - IOHIDDigitizerEventMask eventMask, - double x, - double y, - double z, - double tipPressure, - double twist, - double minorRadius, - double majorRadius, - double quality, - double density, - double irregularity, - Boolean range, - Boolean touch, - UInt32 options); - -IOHIDEventPtr HIDEventWithTouches(NSArray *touches) { - uint64_t absolute_time = mach_absolute_time(); - - AbsoluteTime time; - time.hi = absolute_time >> 32; - time.lo = (UInt32)absolute_time; - - IOHIDEventPtr event = IOHIDEventCreateDigitizerEvent(kCFAllocatorDefault, - time, - kIOHIDDigitizerTransducerTypeHand, - 0, - 0, - kIOHIDDigitizerEventTouch, - 0, - 0, - 0, - 0, - 0, - 0, - false, - true, - 0); - - IOHIDEventSetIntegerValue(event, kIOHIDEventFieldDigitizerIsDisplayIntegrated, true); - - for (UITouch *touch in touches) { - IOHIDDigitizerEventMask eventMask = (touch.phase == UITouchPhaseMoved) ? kIOHIDDigitizerEventPosition : (kIOHIDDigitizerEventRange | kIOHIDDigitizerEventTouch); - Boolean rangeAndTouch = touch.phase != UITouchPhaseEnded; - CGPoint touchLocation = [touch locationInView:touch.window]; - IOHIDEventPtr touchEvent = IOHIDEventCreateDigitizerFingerEventWithQuality(kCFAllocatorDefault, - time, - (uint32_t)[touches indexOfObject:touch] + 1, - 2, - eventMask, - touchLocation.x, - touchLocation.y, - 0.0, - 0, - 0, - 5.0, - 5.0, - 1.0, - 1.0, - 1.0, - rangeAndTouch, - rangeAndTouch, - 0); - - IOHIDEventSetIntegerValue(touchEvent, kIOHIDEventFieldDigitizerIsDisplayIntegrated, 1); - IOHIDEventAppendEvent(event, touchEvent); - CFRelease(touchEvent); - } - - return event; -} diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.h b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.h deleted file mode 100644 index 668cd4cfe7..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface UITouch (CMPTest) - -+ (instancetype)touchAtPoint:(CGPoint)point - inWindow:(UIWindow *)window - tapCount:(NSInteger)tapCount - fromEdge:(BOOL)fromEdge; - -@property (assign) UITouchPhase phase; -@property (assign) CGPoint locationInWindow; - -- (void)send; -- (void)updateTimestamp; - -@end - -NS_ASSUME_NONNULL_END diff --git a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.m b/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.m deleted file mode 100644 index 739e1ee57f..0000000000 --- a/instrumented-test/ui-instrumented-test/src/iosMain/objc/CMPTestUtils/UITouch+Test.m +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -#import "UITouch+Test.h" -#import -#import "HIDEvent.h" - -@interface UIEvent (CMPTestPrivate) - -- (void)_addTouch:(UITouch *)touch forDelayedDelivery:(BOOL)arg2; -- (void)_clearTouches; -- (void)_setHIDEvent:(IOHIDEventPtr)event; - -@end - -@interface UIApplication (CMPTestPrivate) - -- (UIEvent *)_touchesEvent; - -@end - -typedef struct { - unsigned int _firstTouchForView:1; - unsigned int _isTap:1; - unsigned int _isDelayed:1; - unsigned int _sentTouchesEnded:1; - unsigned int _abandonForwardingRecord:1; -} UITouchFlags; - -@interface UITouch (CMPTestPrivate) - -- (void)setWindow:(UIWindow *)window; -- (void)setView:(UIView *)view; -- (void)setTapCount:(NSInteger)tapCount; -- (void)setIsTap:(BOOL)isTap; -- (void)setTimestamp:(NSTimeInterval)timestamp; -- (void)setGestureView:(UIView *)view; -- (void)_setLocationInWindow:(CGPoint)location resetPrevious:(BOOL)resetPrevious; -- (void)_setIsFirstTouchForView:(BOOL)firstTouchForView; -- (void)_setIsTapToClick:(BOOL)tapToClick; - -- (void)_setHidEvent:(IOHIDEventPtr)event; -- (void)_setEdgeType:(NSInteger)edgeType; - -- (void)setPhase:(UITouchPhase)touchPhase; -- (UITouchPhase)phase; - -@end - -@implementation UITouch (CMPTest) - -+ (instancetype)touchAtPoint:(CGPoint)point - inWindow:(UIWindow *)window - tapCount:(NSInteger)tapCount - fromEdge:(BOOL)fromEdge { - return [[UITouch alloc] initAtPoint:point inWindow:window tapCount:tapCount fromEdge:fromEdge]; -} - -- (id)initAtPoint:(CGPoint)point inWindow:(UIWindow *)window tapCount:(NSInteger)tapCount fromEdge:(BOOL)fromEdge { - self = [super init]; - if (self) { - UIView *hitTestView = [window hitTest:point withEvent:nil]; - - [self setWindow:window]; - [self setView:hitTestView]; - [self setTapCount:tapCount]; - [self _setLocationInWindow:point resetPrevious:YES]; - [self setPhase:UITouchPhaseBegan]; - [self _setEdgeType:fromEdge ? 4 : 0]; - [self _setIsFirstTouchForView:YES]; - - [self updateTimestamp]; - - if ([self respondsToSelector:@selector(setGestureView:)]) { - [self setGestureView:hitTestView]; - } - - IOHIDEventPtr event = HIDEventWithTouches(@[self]); - [self _setHidEvent:event]; - CFRelease(event); - } - - return self; -} - -- (void)setLocationInWindow:(CGPoint)locationInWIndow { - [self _setLocationInWindow:locationInWIndow resetPrevious:NO]; -} - -- (CGPoint)locationInWindow { - return [self locationInView:self.view.window]; -} - -- (void)updateTimestamp { - [self setTimestamp:[[NSProcessInfo processInfo] systemUptime]]; -} - -- (void)send { - UIEvent *event = [[UIApplication sharedApplication] _touchesEvent]; - IOHIDEventPtr hidEvent = HIDEventWithTouches(@[self]); - [event _setHIDEvent:hidEvent]; - - [self updateTimestamp]; - [event _addTouch:self forDelayedDelivery:NO]; - - [[UIApplication sharedApplication] sendEvent:event]; -} - -@end diff --git a/instrumented-test/ui-instrumented-test/src/nativeInterop/cinterop/test.def b/instrumented-test/ui-instrumented-test/src/nativeInterop/cinterop/test.def deleted file mode 100644 index 290118f745..0000000000 --- a/instrumented-test/ui-instrumented-test/src/nativeInterop/cinterop/test.def +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright 2025 JetBrains s.r.o. and respective authors and developers. -# Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. -# - -package = androidx.compose.test.utils -language = Objective-C -compilerOpts = -D_Float16=short -headerFilter = UI* - -linkerOpts = -framework UIKit -framework IOKit - -foreignExceptionMode = objc-wrap diff --git a/instrumented-test/ui-xctest/build.gradle.kts b/instrumented-test/ui-xctest/build.gradle.kts deleted file mode 100644 index ab4eaf6d2d..0000000000 --- a/instrumented-test/ui-xctest/build.gradle.kts +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget -import org.jetbrains.kotlin.konan.target.* - -description = "XCTest wrapper of Native kotlin.test" - -plugins { - alias(libs.plugins.kotlinMultiplatform) -} - -repositories { - mavenCentral() -} - -fun frameworksPath(target: KonanTarget): String { - fun getSdkPlatformPath(platform: String) = - ProcessBuilder("xcrun", "--sdk", platform, "--show-sdk-platform-path").execute() - val path = when (target) { - KonanTarget.MACOS_ARM64, KonanTarget.MACOS_X64 -> getSdkPlatformPath("macosx") - KonanTarget.IOS_SIMULATOR_ARM64, KonanTarget.IOS_X64 -> getSdkPlatformPath("iphonesimulator") - KonanTarget.IOS_ARM64 -> getSdkPlatformPath("iphoneos") - else -> error("Target $this is not supported") - } - return "${path}/Developer/Library/Frameworks/" -} - -val nativeTargets = mutableListOf() - -val hostManager = HostManager() -fun MutableList.addIfEnabledOnHost(target: KotlinNativeTarget) { - if (hostManager.isEnabled(target.konanTarget)) add(target) -} - -kotlin { - with(nativeTargets) { - addIfEnabledOnHost(macosX64()) - addIfEnabledOnHost(macosArm64()) - addIfEnabledOnHost(iosX64()) - addIfEnabledOnHost(iosArm64()) - addIfEnabledOnHost(iosSimulatorArm64()) - - forEach { - it.compilations.all { - cinterops { - register("XCTest") { - val path = frameworksPath(it.konanTarget) - compilerOpts("-iframework", path) - } - } - compileTaskProvider.configure { - compilerOptions { - freeCompilerArgs.add("-Xdont-warn-on-error-suppression") - } - } - } - } - } - sourceSets.all { - languageSettings.apply { - optIn("kotlinx.cinterop.BetaInteropApi") - optIn("kotlinx.cinterop.ExperimentalForeignApi") - optIn("kotlin.experimental.ExperimentalNativeApi") - } - } -} - -private fun ProcessBuilder.execute(): String { - return start().inputStream.bufferedReader().readLine() -} diff --git a/instrumented-test/ui-xctest/gradle.properties b/instrumented-test/ui-xctest/gradle.properties deleted file mode 100644 index 7f46ba53fd..0000000000 --- a/instrumented-test/ui-xctest/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright 2025 JetBrains s.r.o. and respective authors and developers. -# Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. -# - -kotlin.mpp.enableCInteropCommonization=true diff --git a/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestObserver.kt b/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestObserver.kt deleted file mode 100644 index 3773159394..0000000000 --- a/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestObserver.kt +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") - -package androidx.compose.xctest - -import kotlin.native.internal.test.* -import kotlin.time.* -import kotlin.time.Duration -import kotlin.time.DurationUnit -import platform.Foundation.NSError -import platform.darwin.NSObject -import platform.XCTest.* - -/** - * Test execution observation. - * - * This is a bridge between XCTest execution and reporting that brings an ability to get results test-by-test. - * It logs tests and notifies listeners set with [testSettings]. - * See also [XCTestObservation on Apple documentation](https://developer.apple.com/documentation/xctest/xctestobservation) - * - * @see TestSettings - */ -internal class NativeTestObserver(private val testSettings: TestSettings) : NSObject(), XCTestObservationProtocol { - private val listeners = testSettings.listeners - private val logger = testSettings.logger - - private inline fun sendToListeners(event: TestListener.() -> Unit) { - logger.event() - listeners.forEach(event) - } - - private fun XCTest.getTestDuration(): Duration = - testRun?.totalDuration - ?.toDuration(DurationUnit.SECONDS) - ?: Duration.ZERO - - /** - * Failed test case execution. - * - * Records test failures sending them to test listeners. - */ - override fun testCase(testCase: XCTestCase, didRecordIssue: XCTIssue) { - if (testCase is XCTestCaseWrapper) { - val duration = testCase.getTestDuration() - val error = didRecordIssue.associatedError as NSError - val throwable = if (error is NSErrorWithKotlinException) { - error.kotlinException - } else { - Throwable(didRecordIssue.compactDescription) - } - sendToListeners { fail(testCase.testCase, throwable, duration.inWholeMilliseconds) } - } - } - - /** - * Records expected failures as failed test as soon as such expectations should be processed in the test. - */ - override fun testCase(testCase: XCTestCase, didRecordExpectedFailure: XCTExpectedFailure) { - logger.log("TestCase: $testCase got expected failure: ${didRecordExpectedFailure.failureReason}") - this.testCase(testCase, didRecordExpectedFailure.issue) - } - - /** - * Test case finish notification. - * Both successful and failed executions get this notification. - */ - override fun testCaseDidFinish(testCase: XCTestCase) { - val duration = testCase.getTestDuration() - if (testCase.testRun?.hasSucceeded == true) { - if (testCase is XCTestCaseWrapper) { - val test = testCase.testCase - if (!testCase.ignored) { - sendToListeners { pass(test, duration.inWholeMilliseconds) } - } - } - } - } - - /** - * Test case start notification. - */ - override fun testCaseWillStart(testCase: XCTestCase) { - if (testCase is XCTestCaseWrapper) { - val test = testCase.testCase - if (testCase.ignored) { - sendToListeners { ignore(test) } - } else { - sendToListeners { start(test) } - } - } - } - - /** - * Test suite failure notification. - * - * Logs the failure of the test suite execution. - */ - override fun testSuite(testSuite: XCTestSuite, didRecordIssue: XCTIssue) { - logger.log("TestSuite ${testSuite.name} recorded issue: ${didRecordIssue.compactDescription}") - } - - /** - * Test suite expected failure. - * - * Logs the failure of the test suite execution. - * Treat expected failures as ordinary unexpected one. - */ - override fun testSuite(testSuite: XCTestSuite, didRecordExpectedFailure: XCTExpectedFailure) { - logger.log("TestSuite ${testSuite.name} got expected failure: ${didRecordExpectedFailure.failureReason}") - this.testSuite(testSuite, didRecordExpectedFailure.issue) - } - - /** - * Test suite finish notification. - */ - override fun testSuiteDidFinish(testSuite: XCTestSuite) { - val duration = testSuite.getTestDuration().inWholeMilliseconds - if (testSuite is XCTestSuiteWrapper) { - sendToListeners { finishSuite(testSuite.testSuite, duration) } - } else if (testSuite.name == TOP_LEVEL_SUITE) { - sendToListeners { - finishIteration(testSettings, 0, duration) // test iterations are not supported - finishTesting(testSettings, duration) - } - } - } - - /** - * Test suite start notification. - */ - override fun testSuiteWillStart(testSuite: XCTestSuite) { - if (testSuite is XCTestSuiteWrapper) { - sendToListeners { startSuite(testSuite.testSuite) } - } else if (testSuite.name == TOP_LEVEL_SUITE) { - sendToListeners { - startTesting(testSettings) - startIteration(testSettings, 0, testSettings.testSuites) // test iterations are not supported - } - } - } - - override fun debugDescription() = "Native test listener with test settings $testSettings" -} diff --git a/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestRunner.kt b/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestRunner.kt deleted file mode 100644 index 02595b7cff..0000000000 --- a/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/NativeTestRunner.kt +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") - -package androidx.compose.xctest - -import kotlinx.cinterop.* -import kotlin.native.internal.test.* -import platform.Foundation.* -import platform.Foundation.NSError -import platform.Foundation.NSInvocation -import platform.Foundation.NSString -import platform.Foundation.NSMethodSignature -import platform.UniformTypeIdentifiers.UTTypeSourceCode -import platform.XCTest.* -import platform.objc.* - -/** - * An XCTest equivalent of the K/N TestCase. - * - * Wraps the [TestCase] that runs it with a special bridge method created by adding it to a class. - * The idea is to make XCTest invoke them by the created invocation and show the selector as a test name. - * This selector is created as `class.method` that is than naturally represented in XCTest reports including XCode. - */ -internal class XCTestCaseWrapper(val testCase: TestCase) : XCTestCase(dummyInvocation()) { - // Sets XCTest to continue running after failure to match Kotlin Test - override fun continueAfterFailure(): Boolean = true - - val ignored = testCase.ignored || testCase.suite.ignored - - private val fullTestName = testCase.fullName - - init { - // Set custom test name - val newClass = NSClassFromString(testCase.suite.name) - ?: objc_allocateClassPair(XCTestCaseWrapper.`class`(), testCase.suite.name, 0UL)!!.also { - objc_registerClassPair(it) - } - - object_setClass(this, newClass) - val testName = if (ignored) { - "[ignored] ${testCase.name}" - } else { - testCase.name - } - - val selector = NSSelectorFromString(testName) - createRunMethod(selector) - setInvocation(methodSignatureForSelector(selector)?.let { signature -> - @Suppress("CAST_NEVER_SUCCEEDS") - val invocation = NSInvocation.invocationWithMethodSignature(signature as NSMethodSignature) - invocation.setSelector(selector) - invocation.setTarget(this) - invocation - }) - } - - /** - * Creates and adds method to the metaclass with implementation block - * that gets an XCTestCase instance as self to be run. - */ - private fun createRunMethod(selector: COpaquePointer?) { - val result = class_addMethod( - cls = this.`class`(), - name = selector, - imp = imp_implementationWithBlock(::run), - types = "v@:" // Obj-C type encodings: v (returns void), @ (id self), : (SEL sel) - ) - check(result) { - "Internal error: was unable to add method with selector $selector" - } - } - - @ObjCAction - private fun run() { - if (ignored) { - // FIXME: to skip the test XCTSkip() should be used. - // But it is not possible to do that due to the KT-43719 and not implemented exception importing. - // For example, _XCTSkipHandler(testName, 0U, "Test $testName is ignored") fails with 'Uncaught Kotlin exception'. - // So, just don't run the test. It will be seen as passed in XCode, but K/N TestListener correctly processes that. - return - } - try { - testCase.doRun() - } catch (throwable: Throwable) { - val stackTrace = throwable.getStackTrace() - val failedStackLine = stackTrace.first { - // try to filter out kotlin.Exceptions and kotlin.test.Assertion inits to poin to the failed stack and line - !it.contains("kfun:kotlin.") - } - // Find path and line number to create source location - val matchResult = Regex("^\\d+ +.* \\((.*):(\\d+):.*\\)$").find(failedStackLine) - val sourceLocation = if (matchResult != null) { - val (file, line) = matchResult.destructured - XCTSourceCodeLocation(file, line.toLong()) - } else { - // No debug info to get the path. Still have to record location - XCTSourceCodeLocation(testCase.suite.name, 0L) - } - - // Make a stacktrace attachment, encoding it as source code. - // This makes it appear as an attachment in the XCode test results for the failed test. - @Suppress("CAST_NEVER_SUCCEEDS") - val stackAsPayload = (stackTrace.joinToString("\n") as? NSString)?.dataUsingEncoding(NSUTF8StringEncoding) - val stackTraceAttachment = XCTAttachment.attachmentWithUniformTypeIdentifier( - identifier = UTTypeSourceCode.identifier, - name = "Kotlin stacktrace (full)", - payload = stackAsPayload, - userInfo = null - ) - - val type = when (throwable) { - is AssertionError -> XCTIssueTypeAssertionFailure - else -> XCTIssueTypeUncaughtException - } - - // Finally, create and record an issue with all gathered data - val issue = XCTIssue( - type = type, - compactDescription = "$throwable in $fullTestName", - detailedDescription = buildString { - appendLine("Test '$fullTestName' from '${testCase.suite.name}' failed with $throwable") - throwable.cause?.let { appendLine("(caused by ${throwable.cause})") } - }, - sourceCodeContext = XCTSourceCodeContext( - callStackAddresses = throwable.getStackTraceAddresses(), - location = sourceLocation - ), - // pass the error through the XCTest to the NativeTestObserver - associatedError = NSErrorWithKotlinException(throwable), - attachments = listOf(stackTraceAttachment) - ) - testRun?.recordIssue(issue) ?: error("TestRun for the test $fullTestName not found") - } - } - - override fun setUp() { - if (!ignored) testCase.doBefore() - } - - override fun tearDown() { - if (!ignored) testCase.doAfter() - } - - override fun description(): String = buildString { - append(fullTestName) - if (ignored) append("(ignored)") - } - - override fun name(): String { - return testCase.name - } - - companion object : XCTestCaseMeta() { - /** - * This method is invoked by the XCTest when it discovered XCTestCase instance - * that contains test method. - * - * This method should not be called with the current idea and assumptions. - */ - override fun testCaseWithInvocation(invocation: NSInvocation?): XCTestCase { - error( - """ - This should not happen by default. - Got invocation: ${invocation?.description} - with selector @sel(${NSStringFromSelector(invocation?.selector)}) - """.trimIndent() - ) - } - - private fun dummyInvocation(): NSInvocation { - return NSInvocation.invocationWithMethodSignature( - NSMethodSignature.signatureWithObjCTypes("v@:".cstr.getPointer(Arena())) as NSMethodSignature - ) - } - } -} - -/** - * This is a NSError-wrapper of Kotlin exception used to pass it through the XCTIssue - * to the XCTestObservation protocol implementation [NativeTestObserver]. - * See [NativeTestObserver.testCase] for the usage. - */ -internal class NSErrorWithKotlinException(val kotlinException: Throwable) : NSError(NSCocoaErrorDomain, NSValidationErrorMinimum, null) - -/** - * XCTest equivalent of K/N TestSuite. - */ -internal class XCTestSuiteWrapper(val testSuite: TestSuite) : XCTestSuite(testSuite.name) { - private val ignoredSuite: Boolean - get() = testSuite.ignored || testSuite.testCases.all { it.value.ignored } - - override fun setUp() { - if (!ignoredSuite) testSuite.doBeforeClass() - } - - override fun tearDown() { - if (!ignoredSuite) testSuite.doAfterClass() - } -} diff --git a/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/configuration.kt b/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/configuration.kt deleted file mode 100644 index 1a2c9827f4..0000000000 --- a/instrumented-test/ui-xctest/src/iosMain/kotlin/androidx/compose/xctest/configuration.kt +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2025 JetBrains s.r.o. and respective authors and developers. - * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. - */ - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") - -package androidx.compose.xctest - -import platform.Foundation.* -import platform.XCTest.XCTest -import platform.XCTest.XCTestObservationCenter -import platform.XCTest.XCTestSuite -import kotlin.native.internal.test.* -import kotlin.reflect.KClass -import kotlin.reflect.KFunction -import kotlin.reflect.KFunction1 - - -// Top level suite name used to hold all Native tests -internal const val TOP_LEVEL_SUITE = "Kotlin/Native test suite" - -// Name of the key that contains arguments used to set [TestSettings] -private const val TEST_ARGUMENTS_KEY = "KotlinNativeTestArgs" - -/** - * Stores current settings with the filtered test suites, loggers, and listeners. - * Test settings should be initialized by the setup method. - */ -private lateinit var testSettings: TestSettings - -@Suppress("unused") -fun setupXCTestSuite(vararg tests: KClass<*>): XCTestSuite = - setupXCTestSuite(tests = tests.toSet(), testCases = null) - -@Suppress("unused") -inline fun setupXCTestSuite(vararg tests: KFunction1): XCTestSuite = - setupXCTestSuite(tests = null, testCases = mapOf(Class::class.qualifiedName to tests.toSet())) - -/** - * This is an entry-point of XCTestSuites and XCTestCases generation. - * Function returns the XCTest's top level TestSuite that holds all the test cases - * with K/N tests. - * This test suite can be run by either native launcher compiled to bundle or - * by the other test suite (e.g. compiled as a framework). - */ -fun setupXCTestSuite(tests: Set>? = null, testCases: Map>>? = null): XCTestSuite { - val nativeTestSuite = XCTestSuite.testSuiteWithName(TOP_LEVEL_SUITE) - - // Initialize settings with the given args - val args = testArguments(TEST_ARGUMENTS_KEY) - - testSettings = TestProcessor(GeneratedSuites.suites, args).process() - - check(::testSettings.isInitialized) { - "Test settings wasn't set. Check provided arguments and test suites" - } - - // Set test observer that will log test execution - XCTestObservationCenter.sharedTestObservationCenter.addTestObserver( - NativeTestObserver( - testSettings - ) - ) - - if (testSettings.runTests) { - val includeAllTests = tests == null && testCases == null - val testSuiteNames = tests?.map { it.qualifiedName }.orEmpty() + testCases?.keys.orEmpty() - fun includeTestSuite(testSuite: TestSuite) = - includeAllTests || testSuiteNames.contains(testSuite.name) - - // Generate and add tests to the main suite - testSettings.testSuites.generate( - addTestSuite = { testSuite -> - includeTestSuite(testSuite) - }, - addTestCase = { testCase -> - includeTestSuite(testCase.suite) && - (testCases == null || - testCases[testCase.suite.name]?.firstOrNull { it.name == testCase.name } != null) - } - ).forEach { - nativeTestSuite.addTest(it) - } - - if (includeAllTests) { - // Tests created (self-check) - @Suppress("UNCHECKED_CAST") - check(testSettings.testSuites.size == (nativeTestSuite.tests as List).size) { - "The amount of generated XCTest suites should be equal to Kotlin test suites" - } - } - } - - return nativeTestSuite -} - -/** - * Gets test arguments from the Info.plist using the provided key to create test settings. - * - * @param key a key used in the `Info.plist` file or as environment variable to pass test arguments - */ -@Suppress("UNCHECKED_CAST") -private fun testArguments(key: String): Array { - (NSProcessInfo.processInfo.arguments as? List)?.let { - // Drop the first element containing executable name. - // See https://developer.apple.com/documentation/foundation/nsprocessinfo/1415596-arguments - // Then filter only relevant to the runner arguments. - val args = it.drop(1) - .filter { argument -> - argument.startsWith("--gtest_") || argument.startsWith("--ktest_") || - argument == "--help" || argument == "-h" - }.toTypedArray() - if (args.isNotEmpty()) return args - } - - (NSProcessInfo.processInfo.environment[key] as? String)?.let { - return it.split(" ").toTypedArray() - } - - // As we don't know which bundle we are, iterate through all of them - NSBundle.allBundles - .mapNotNull { (it as? NSBundle)?.infoDictionary?.get(key) as? String } - .singleOrNull() - ?.let { - return it.split(" ").toTypedArray() - } - - return emptyArray() -} - -internal val TestCase.fullName get() = "${suite.name}.$name" - -private fun Collection.generate( - addTestSuite: (TestSuite) -> Boolean, - addTestCase: (TestCase) -> Boolean -): List { - return this.filter(addTestSuite).map { suite -> - val xcSuite = XCTestSuiteWrapper(suite) - suite.testCases.values.filter(addTestCase).map { testCase -> - XCTestCaseWrapper(testCase) - }.forEach { - // add test to its test suite wrapper - xcSuite.addTest(it) - } - xcSuite - } -} diff --git a/instrumented-test/ui-xctest/src/nativeInterop/cinterop/XCTest.def b/instrumented-test/ui-xctest/src/nativeInterop/cinterop/XCTest.def deleted file mode 100644 index 729c4a0542..0000000000 --- a/instrumented-test/ui-xctest/src/nativeInterop/cinterop/XCTest.def +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright 2025 JetBrains s.r.o. and respective authors and developers. -# Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. -# - -depends = Foundation darwin posix -language = Objective-C -package = platform.XCTest -modules = XCTest - -compilerOpts = -framework XCTest -linkerOpts = -framework XCTest - -foreignExceptionMode = objc-wrap