From 67564255d6965c212ae249b2e9d78b1d4cfd5cda Mon Sep 17 00:00:00 2001
From: Dmitrii Denisov <dmitrii.denisov@jetbrains.com>
Date: Fri, 17 Oct 2025 11:14:57 +0000
Subject: [PATCH] AT-3334 Gateway tests failing after adding Compose UI support
 to Remote Driver framework

cleanup dependencies

fix tests #2

fix tests

Move ComposeXpathDataModelExtension to new package

AT-3334 Gateway tests failing after adding Compose UI support to Remote Driver framework

- Add `remote-driver.compose` module


Merge-request: IJ-MR-178847
Merged-by: Dmitrii Denisov <dmitrii.denisov@jetbrains.com>

(cherry picked from commit 90ea2158f9e3928ed16c072c765f4c7b0803e2e7)

IJ-CR-178721

GitOrigin-RevId: f538bfa6782ab8c3f78ea2077a8d1c984b0da963
---
 .idea/modules.xml                             |  1 +
 build/bazel-generated-file-list.txt           |  1 +
 .../core/plugin-content.yaml                  |  1 +
 .../core/resources/META-INF/plugin.xml        |  1 +
 .../remote-driver.compose/BUILD.bazel         | 26 +++++++++++++++++++
 ...erformanceTesting.remoteDriver.compose.iml | 19 ++++++++++++++
 ...erformanceTesting.remoteDriver.compose.xml | 11 ++++++++
 .../remote-driver.compose/src/.keep           |  0
 .../ComposeXpathDataModelExtension.kt         |  3 ++-
 .../remote-driver/BUILD.bazel                 |  1 -
 ...tellij.performanceTesting.remoteDriver.iml |  1 -
 ...tellij.performanceTesting.remoteDriver.xml |  5 ----
 12 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 plugins/performanceTesting/remote-driver.compose/BUILD.bazel
 create mode 100644 plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml
 create mode 100644 plugins/performanceTesting/remote-driver.compose/resources/intellij.performanceTesting.remoteDriver.compose.xml
 create mode 100644 plugins/performanceTesting/remote-driver.compose/src/.keep
 rename plugins/performanceTesting/{remote-driver/src/com/jetbrains/performancePlugin/remotedriver/xpath => remote-driver.compose/src/com/intellij/performanceTesting/remoteDriver/compose}/ComposeXpathDataModelExtension.kt (98%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index bc317ee1b841..07c6a799a5d0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -956,6 +956,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 77280b489abb..f12160dea16d 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -1323,6 +1323,7 @@ plugins/performanceTesting/core
 plugins/performanceTesting/event-bus
 plugins/performanceTesting/frontend
 plugins/performanceTesting/remote-driver
+plugins/performanceTesting/remote-driver.compose
 plugins/performanceTesting/scripts-ui
 plugins/performanceTesting/vcs
 plugins/properties
diff --git a/plugins/performanceTesting/core/plugin-content.yaml b/plugins/performanceTesting/core/plugin-content.yaml
index 3ec21ce9332f..ad7b263073c1 100644
--- a/plugins/performanceTesting/core/plugin-content.yaml
+++ b/plugins/performanceTesting/core/plugin-content.yaml
@@ -21,6 +21,7 @@
   - name: intellij.performanceTesting
   contentModules:
   - name: intellij.performanceTesting.remoteDriver
+  - name: intellij.performanceTesting.remoteDriver.compose
   - name: intellij.performanceTesting.vcs
   - name: intellij.tools.ide.starter.bus
   - name: intellij.driver.model
diff --git a/plugins/performanceTesting/core/resources/META-INF/plugin.xml b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
index 0168bd152cf4..ba4d729d2d15 100644
--- a/plugins/performanceTesting/core/resources/META-INF/plugin.xml
+++ b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
@@ -15,6 +15,7 @@
 
   <content namespace="jetbrains">
     <module name="intellij.performanceTesting.remoteDriver"/>
+    <module name="intellij.performanceTesting.remoteDriver.compose"/>
     <module name="intellij.performanceTesting.vcs"/>
     <module name="intellij.performanceTesting.frontend"/>
     <module name="intellij.tools.ide.starter.bus" loading="embedded"/>
diff --git a/plugins/performanceTesting/remote-driver.compose/BUILD.bazel b/plugins/performanceTesting/remote-driver.compose/BUILD.bazel
new file mode 100644
index 000000000000..79d118939450
--- /dev/null
+++ b/plugins/performanceTesting/remote-driver.compose/BUILD.bazel
@@ -0,0 +1,26 @@
+### auto-generated section `build intellij.performanceTesting.remoteDriver.compose` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "remote-driver.compose_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "remote-driver.compose",
+  module_name = "intellij.performanceTesting.remoteDriver.compose",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
+  resources = [":remote-driver.compose_resources"],
+  deps = [
+    "@lib//:kotlin-stdlib",
+    "//plugins/performanceTesting/core:performanceTesting",
+    "//platform/remote-driver/model",
+    "//platform/platform-api:ide",
+    "//platform/compose",
+    "//platform/core-ui",
+    "//plugins/performanceTesting/remote-driver",
+  ]
+)
+### auto-generated section `build intellij.performanceTesting.remoteDriver.compose` end
\ No newline at end of file
diff --git a/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml b/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml
new file mode 100644
index 000000000000..ce25c653ed64
--- /dev/null
+++ b/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.performanceTesting" />
+    <orderEntry type="module" module-name="intellij.driver.model" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.compose" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.performanceTesting.remoteDriver" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/performanceTesting/remote-driver.compose/resources/intellij.performanceTesting.remoteDriver.compose.xml b/plugins/performanceTesting/remote-driver.compose/resources/intellij.performanceTesting.remoteDriver.compose.xml
new file mode 100644
index 000000000000..0d6b0788db78
--- /dev/null
+++ b/plugins/performanceTesting/remote-driver.compose/resources/intellij.performanceTesting.remoteDriver.compose.xml
@@ -0,0 +1,11 @@
+<idea-plugin visibility="internal" package="com.intellij.performanceTesting.remoteDriver.compose">
+  <dependencies>
+    <module name="intellij.platform.compose"/>
+    <module name="intellij.performanceTesting.remoteDriver"/>
+  </dependencies>
+
+  <extensions defaultExtensionNs="com.jetbrains.performancePlugin">
+    <remotedriver.xpathDataModelExtension
+      implementation="com.intellij.performanceTesting.remoteDriver.compose.ComposeXpathDataModelExtension"/>
+  </extensions>
+</idea-plugin>
diff --git a/plugins/performanceTesting/remote-driver.compose/src/.keep b/plugins/performanceTesting/remote-driver.compose/src/.keep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/xpath/ComposeXpathDataModelExtension.kt b/plugins/performanceTesting/remote-driver.compose/src/com/intellij/performanceTesting/remoteDriver/compose/ComposeXpathDataModelExtension.kt
similarity index 98%
rename from plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/xpath/ComposeXpathDataModelExtension.kt
rename to plugins/performanceTesting/remote-driver.compose/src/com/intellij/performanceTesting/remoteDriver/compose/ComposeXpathDataModelExtension.kt
index 1ad0f9831622..3c033c663009 100644
--- a/plugins/performanceTesting/remote-driver/src/com/jetbrains/performancePlugin/remotedriver/xpath/ComposeXpathDataModelExtension.kt
+++ b/plugins/performanceTesting/remote-driver.compose/src/com/intellij/performanceTesting/remoteDriver/compose/ComposeXpathDataModelExtension.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.jetbrains.performancePlugin.remotedriver.xpath
+package com.intellij.performanceTesting.remoteDriver.compose
 
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.awt.ComposePanel
@@ -8,6 +8,7 @@ import androidx.compose.ui.semantics.SemanticsProperties
 import androidx.compose.ui.semantics.getOrNull
 import com.intellij.ui.scale.JBUIScale
 import com.jetbrains.performancePlugin.jmxDriver.InvokerService
+import com.jetbrains.performancePlugin.remotedriver.xpath.XpathDataModelExtension
 import org.jetbrains.jewel.bridge.JewelComposePanelWrapper
 import org.w3c.dom.Document
 import org.w3c.dom.Element
diff --git a/plugins/performanceTesting/remote-driver/BUILD.bazel b/plugins/performanceTesting/remote-driver/BUILD.bazel
index 1fc60b3f689e..0fcea581eba9 100644
--- a/plugins/performanceTesting/remote-driver/BUILD.bazel
+++ b/plugins/performanceTesting/remote-driver/BUILD.bazel
@@ -33,7 +33,6 @@ jvm_library(
     "//libraries/jcef",
     "//platform/platform-impl:ide-impl",
     "//platform/ui.jcef",
-    "//platform/compose",
     "//platform/core-ui",
   ],
   exports = [
diff --git a/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml b/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml
index 5b41e8772af8..e76668c3d6e7 100644
--- a/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml
+++ b/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml
@@ -27,7 +27,6 @@
     <orderEntry type="module" module-name="intellij.libraries.jcef" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ui.jcef" />
-    <orderEntry type="module" module-name="intellij.platform.compose" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/performanceTesting/remote-driver/resources/intellij.performanceTesting.remoteDriver.xml b/plugins/performanceTesting/remote-driver/resources/intellij.performanceTesting.remoteDriver.xml
index e9c6b06bcdd8..035a6e7750c4 100644
--- a/plugins/performanceTesting/remote-driver/resources/intellij.performanceTesting.remoteDriver.xml
+++ b/plugins/performanceTesting/remote-driver/resources/intellij.performanceTesting.remoteDriver.xml
@@ -1,8 +1,4 @@
 <idea-plugin visibility="internal" package="com.jetbrains.performancePlugin.remotedriver">
-  <dependencies>
-    <module name="intellij.platform.compose"/>
-  </dependencies>
-
   <extensionPoints>
     <extensionPoint interface="com.jetbrains.performancePlugin.remotedriver.xpath.XpathDataModelExtension"
                     qualifiedName="com.jetbrains.performancePlugin.remotedriver.xpathDataModelExtension" dynamic="true"/>
@@ -22,6 +18,5 @@
 
   <extensions defaultExtensionNs="com.jetbrains.performancePlugin">
     <remotedriver.xpathDataModelExtension implementation="com.jetbrains.performancePlugin.remotedriver.RemoteDriverDataModelExtension"/>
-    <remotedriver.xpathDataModelExtension implementation="com.jetbrains.performancePlugin.remotedriver.xpath.ComposeXpathDataModelExtension"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file