Skip to content

Commit 8605b3d

Browse files
amezinamezin
committed
tests/wm: make gdk_backend class-scoped fixture
1 parent db3e83d commit 8605b3d

11 files changed

+383
-378
lines changed

‎test/dbus-interfaces/com.github.amezin.ddterm.TestHook.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<property type="b" name="WindowAbove" access="read"/>
1616
<property type="b" name="WindowSkipTaskbar" access="read"/>
1717
<property type="b" name="WindowOnAllWorkspaces" access="read"/>
18+
<property type="s" name="ClientType" access="read"/>
1819

1920
<method name="Destroy"/>
2021

‎test/extensionhook.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import GLib from 'gi://GLib';
22
import GObject from 'gi://GObject';
33
import Gio from 'gi://Gio';
4+
import Meta from 'gi://Meta';
45
import Shell from 'gi://Shell';
56

67
import {
@@ -154,6 +155,7 @@ const Interface = GObject.registerClass({
154155
this.HasWindow = false;
155156
this.MaximizedHorizontally = false;
156157
this.MaximizedVertically = false;
158+
this.ClientType = '';
157159
this._update_window_rect();
158160

159161
return;
@@ -268,6 +270,11 @@ const Interface = GObject.registerClass({
268270
]));
269271
}));
270272

273+
this.ClientType = {
274+
[Meta.WindowClientType.WAYLAND]: 'wayland',
275+
[Meta.WindowClientType.X11]: 'x11',
276+
}[win.get_client_type()];
277+
271278
this.HasWindow = true;
272279
} finally {
273280
this.thaw_notify();

‎test/pict/test_maximize_unmaximize.gen‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
class gdk_backend monitor0_scale monitor1_scale layout_mode window_position window_size window_maximize window_monitor current_monitor primary_monitor window_monitor_connector window_above window_skip_taskbar window_stick
2-
TestWaylandTwoMonitors GdkBackend.X11 2.0 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.6 False WindowMonitor.CONNECTOR 0 0 0 False True False
3-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.25 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.714 True WindowMonitor.CONNECTOR 1 1 1 True False True
4-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.0 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.714 False WindowMonitor.CONNECTOR 1 0 1 False True True
5-
TestWaylandTwoMonitors GdkBackend.X11 1.748633861541748 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.913 True WindowMonitor.CONNECTOR 0 1 0 True False False
6-
TestWaylandTwoMonitors GdkBackend.X11 1.502347469329834 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 1.0 True WindowMonitor.CONNECTOR 0 0 0 False False True
7-
TestWaylandTwoMonitors GdkBackend.X11 1.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.LEFT 0.714 False WindowMonitor.CONNECTOR 0 0 1 True True False
8-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.0 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.8 True WindowMonitor.CONNECTOR 1 1 0 False True True
9-
TestWaylandTwoMonitors GdkBackend.WAYLAND 2.0 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.8 False WindowMonitor.CONNECTOR 1 0 1 True False False
10-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.748633861541748 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.913 False WindowMonitor.CONNECTOR 1 1 1 False True True
11-
TestWayland GdkBackend.WAYLAND 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.6 True WindowMonitor.CONNECTOR 0 0 0 True False True
12-
TestWaylandTwoMonitors GdkBackend.X11 1.0 1.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.TOP 0.913 False WindowMonitor.CONNECTOR 0 0 0 False True False
13-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.502347469329834 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 1.0 False WindowMonitor.CONNECTOR 1 1 1 True True False
14-
TestWaylandTwoMonitors GdkBackend.X11 1.25 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.913 True WindowMonitor.CONNECTOR 1 1 0 True False False
15-
TestWayland GdkBackend.X11 1.502347469329834 0 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.8 False WindowMonitor.CONNECTOR 0 0 0 False True False
16-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.25 2.0 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.6 True WindowMonitor.CONNECTOR 1 1 0 False False True
17-
TestWaylandTwoMonitors GdkBackend.X11 1.0 1.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 1.0 False WindowMonitor.CONNECTOR 0 0 0 False False False
18-
TestWaylandTwoMonitors GdkBackend.X11 1.502347469329834 2.0 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.714 True WindowMonitor.CONNECTOR 1 1 0 True True False
19-
TestWaylandTwoMonitors GdkBackend.X11 2.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.913 False WindowMonitor.CONNECTOR 0 0 0 False True False
20-
TestWaylandTwoMonitors GdkBackend.X11 1.25 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.714 False WindowMonitor.CONNECTOR 0 0 0 True True False
21-
TestWaylandTwoMonitors GdkBackend.X11 1.748633861541748 2.0 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 1.0 True WindowMonitor.CONNECTOR 1 0 0 False False False
22-
TestWaylandTwoMonitors GdkBackend.X11 1.0 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.6 False WindowMonitor.CONNECTOR 0 1 1 True True False
23-
TestWaylandTwoMonitors GdkBackend.X11 2.0 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 1.0 True WindowMonitor.CONNECTOR 1 1 0 False True False
24-
TestX11 GdkBackend.X11 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 0.714 False WindowMonitor.CONNECTOR 0 0 0 False False False
25-
TestWaylandTwoMonitors GdkBackend.WAYLAND 2.0 1.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.8 True WindowMonitor.CONNECTOR 1 1 0 True True True
26-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.502347469329834 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.6 True WindowMonitor.CONNECTOR 1 1 0 True True True
27-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.748633861541748 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.714 True WindowMonitor.CONNECTOR 1 0 1 True True True
28-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.748633861541748 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.8 True WindowMonitor.CONNECTOR 0 1 0 True True True
29-
TestWayland GdkBackend.WAYLAND 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 0.913 False WindowMonitor.CONNECTOR 0 0 0 False False False
30-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.25 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 1.0 True WindowMonitor.CONNECTOR 1 1 1 True True True
31-
TestWayland GdkBackend.WAYLAND 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.TOP 1.0 False WindowMonitor.CONNECTOR 0 0 0 True False False
32-
TestX11 GdkBackend.X11 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.LEFT 0.6 True WindowMonitor.CONNECTOR 0 0 0 True True True
33-
TestWaylandTwoMonitors GdkBackend.WAYLAND 2.0 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.714 False WindowMonitor.CONNECTOR 1 1 0 False False False
34-
TestWayland GdkBackend.WAYLAND 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 0.714 False WindowMonitor.CONNECTOR 0 0 0 False False False
35-
TestWayland GdkBackend.WAYLAND 1.748633861541748 0 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.6 False WindowMonitor.CONNECTOR 0 0 0 False True False
36-
TestX11 GdkBackend.X11 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.8 False WindowMonitor.CONNECTOR 0 0 0 True True False
37-
TestWayland GdkBackend.WAYLAND 1.25 0 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.8 False WindowMonitor.CONNECTOR 0 0 0 True False False
38-
TestWaylandTwoMonitors GdkBackend.WAYLAND 2.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 0.8 False WindowMonitor.CONNECTOR 0 0 1 False True False
39-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.502347469329834 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.913 False WindowMonitor.CONNECTOR 0 0 0 True False True
40-
TestX11 GdkBackend.X11 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.TOP 1.0 False WindowMonitor.CONNECTOR 0 0 0 True False False
41-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.748633861541748 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.913 False WindowMonitor.CONNECTOR 0 1 1 False True False
42-
TestX11 GdkBackend.X11 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.913 False WindowMonitor.CONNECTOR 0 0 0 True False False
43-
TestWaylandTwoMonitors GdkBackend.WAYLAND 1.25 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.6 False WindowMonitor.CONNECTOR 0 1 1 True False True
1+
class monitor0_scale monitor1_scale layout_mode window_position window_size window_maximize window_monitor current_monitor primary_monitor window_monitor_connector window_above window_skip_taskbar window_stick
2+
TestWaylandTwoMonitors 2.0 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.6 False WindowMonitor.CONNECTOR 0 0 0 False True False
3+
TestWaylandTwoMonitors 1.25 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.714 True WindowMonitor.CONNECTOR 1 1 1 True False True
4+
TestWaylandTwoMonitors 1.0 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.714 False WindowMonitor.CONNECTOR 1 0 1 False True True
5+
TestWaylandTwoMonitors 1.748633861541748 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.913 True WindowMonitor.CONNECTOR 0 1 0 True False False
6+
TestWaylandTwoMonitors 1.502347469329834 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 1.0 True WindowMonitor.CONNECTOR 0 0 0 False False True
7+
TestWaylandTwoMonitors 1.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.LEFT 0.714 False WindowMonitor.CONNECTOR 0 0 1 True True False
8+
TestWaylandTwoMonitors 1.0 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.8 True WindowMonitor.CONNECTOR 1 1 0 False True True
9+
TestWaylandTwoMonitors 2.0 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.8 False WindowMonitor.CONNECTOR 1 0 1 True False False
10+
TestWaylandTwoMonitors 1.748633861541748 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.913 False WindowMonitor.CONNECTOR 1 1 1 False True True
11+
TestX11 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.6 True WindowMonitor.CONNECTOR 0 0 0 True False True
12+
TestWaylandTwoMonitors 1.502347469329834 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.6 False WindowMonitor.CONNECTOR 1 1 1 False True False
13+
TestWaylandTwoMonitors 2.0 1.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.LEFT 1.0 False WindowMonitor.CONNECTOR 0 1 0 False True False
14+
TestWaylandTwoMonitors 1.0 1.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.8 False WindowMonitor.CONNECTOR 0 0 0 False True False
15+
TestWaylandTwoMonitors 1.502347469329834 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.913 False WindowMonitor.CONNECTOR 1 0 0 True False False
16+
TestWaylandTwoMonitors 1.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.TOP 0.6 True WindowMonitor.CONNECTOR 1 1 0 False False True
17+
TestWaylandTwoMonitors 1.748633861541748 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 1.0 True WindowMonitor.CONNECTOR 0 1 0 True False False
18+
TestWaylandTwoMonitors 1.25 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.714 False WindowMonitor.CONNECTOR 0 0 0 False True False
19+
TestWaylandTwoMonitors 1.25 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.913 False WindowMonitor.CONNECTOR 0 1 1 False True False
20+
TestWaylandTwoMonitors 2.0 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 1.0 False WindowMonitor.CONNECTOR 0 0 1 False True False
21+
TestWayland 1.748633861541748 0 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.6 False WindowMonitor.CONNECTOR 0 0 0 False True False
22+
TestWaylandTwoMonitors 1.502347469329834 2.0 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.8 True WindowMonitor.CONNECTOR 0 1 1 True False False
23+
TestWayland 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.TOP 1.0 True WindowMonitor.CONNECTOR 0 0 0 True True False
24+
TestWaylandTwoMonitors 1.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.LEFT 0.913 False WindowMonitor.CONNECTOR 0 1 1 False True False
25+
TestWaylandTwoMonitors 1.748633861541748 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.714 False WindowMonitor.CONNECTOR 1 1 0 False True False
26+
TestWaylandTwoMonitors 1.748633861541748 2.0 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 1.0 False WindowMonitor.CONNECTOR 1 1 0 False False False
27+
TestWayland 1.502347469329834 0 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.714 False WindowMonitor.CONNECTOR 0 0 0 False False False
28+
TestWaylandTwoMonitors 1.25 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.TOP 0.8 False WindowMonitor.CONNECTOR 0 1 1 False True False
29+
TestWayland 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.8 False WindowMonitor.CONNECTOR 0 0 0 False True True
30+
TestWaylandTwoMonitors 1.25 2.0 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 1.0 False WindowMonitor.CONNECTOR 1 0 1 False True False
31+
TestX11 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.LEFT 1.0 False WindowMonitor.CONNECTOR 0 0 0 False True False
32+
TestWayland 1.25 0 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.913 False WindowMonitor.CONNECTOR 0 0 0 True True True
33+
TestWaylandTwoMonitors 2.0 2.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 0.714 False WindowMonitor.CONNECTOR 0 0 0 True False False
34+
TestX11 2.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.RIGHT 0.913 False WindowMonitor.CONNECTOR 0 0 0 False False True
35+
TestWaylandTwoMonitors 1.25 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.714 False WindowMonitor.CONNECTOR 0 1 1 False False True
36+
TestX11 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.TOP 0.8 False WindowMonitor.CONNECTOR 0 0 0 False False True
37+
TestWaylandTwoMonitors 1.0 1.748633861541748 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.6 False WindowMonitor.CONNECTOR 1 0 0 True True True
38+
TestWaylandTwoMonitors 1.748633861541748 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.BOTTOM 0.714 False WindowMonitor.CONNECTOR 0 0 0 False False True
39+
TestWaylandTwoMonitors 1.25 1.502347469329834 displayconfig.LayoutMode.LOGICAL WindowPosition.LEFT 0.6 False WindowMonitor.CONNECTOR 0 0 1 False False False
40+
TestX11 1.0 0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.714 False WindowMonitor.CONNECTOR 0 0 0 False True False
41+
TestWaylandTwoMonitors 1.0 1.0 displayconfig.LayoutMode.PHYSICAL WindowPosition.BOTTOM 0.6 False WindowMonitor.CONNECTOR 1 1 0 False True True
42+
TestWaylandTwoMonitors 1.502347469329834 1.25 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.8 False WindowMonitor.CONNECTOR 1 1 1 False True True
43+
TestWaylandTwoMonitors 1.748633861541748 1.0 displayconfig.LayoutMode.LOGICAL WindowPosition.RIGHT 0.8 False WindowMonitor.CONNECTOR 1 1 1 True True True

‎test/pict/test_maximize_unmaximize.model‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
class: TestX11, TestWayland, TestWaylandTwoMonitors
22

3-
gdk_backend: GdkBackend.X11, GdkBackend.WAYLAND (100)
4-
53
monitor0_scale: 1.0, 1.25, 1.502347469329834, 1.748633861541748, 2.0
64
monitor1_scale: <monitor0_scale>, 0
75
layout_mode: displayconfig.LayoutMode.PHYSICAL (100), displayconfig.LayoutMode.LOGICAL
@@ -20,7 +18,7 @@ window_skip_taskbar: True, False
2018
window_stick: True, False
2119

2220
IF [class] = "TestX11"
23-
THEN [layout_mode] = "displayconfig.LayoutMode.PHYSICAL" AND [gdk_backend] = "GdkBackend.X11";
21+
THEN [layout_mode] = "displayconfig.LayoutMode.PHYSICAL";
2422

2523
IF [layout_mode] = "displayconfig.LayoutMode.PHYSICAL"
2624
THEN [monitor0_scale] IN {1.0, 2.0} AND [monitor1_scale] IN {1.0, 2.0, 0};

0 commit comments

Comments
 (0)