From fb1d9efb27d0a7daffaa11da2a2773e52405ddef Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Tue, 12 Sep 2017 08:50:40 +0000 Subject: [PATCH] 533-randr15.t: Stop hard-coding the output name Refactor away all mentions of DP3. --- testcases/t/533-randr15.t | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testcases/t/533-randr15.t b/testcases/t/533-randr15.t index da51a097..e22e8116 100644 --- a/testcases/t/533-randr15.t +++ b/testcases/t/533-randr15.t @@ -42,13 +42,14 @@ my $reply = pack('cxSLLLLx[LLL]', # Manually intern _NET_CURRENT_DESKTOP as $x->atom will not create atoms if # they are not yet interned. -my $atom_cookie = $x->intern_atom(0, length("DP3"), "DP3"); -my $DP3 = $x->intern_atom_reply($atom_cookie->{sequence})->{atom}; +my $monitor_name = 'i3-fake-monitor'; +my $atom_cookie = $x->intern_atom(0, length($monitor_name), $monitor_name); +my $monitor_name_atom = $x->intern_atom_reply($atom_cookie->{sequence})->{atom}; # MONITORINFO is defined in A.1.1 in # https://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt my $monitor1 = pack('LccSssSSLLL', - $DP3, # name (ATOM) + $monitor_name_atom, # name (ATOM) 1, # primary 1, # automatic 1, # ncrtcs @@ -89,15 +90,15 @@ my $pid = launch_with_config($config, my $tree = i3->get_tree->recv; my @outputs = map { $_->{name} } @{$tree->{nodes}}; -is_deeply(\@outputs, [ '__i3', 'DP3' ], 'outputs are __i3 and DP3'); +is_deeply(\@outputs, [ '__i3', $monitor_name ], 'outputs are __i3 and the fake monitor'); -my ($dp3) = grep { $_->{name} eq 'DP3' } @{$tree->{nodes}}; -is_deeply($dp3->{rect}, { +my ($output_data) = grep { $_->{name} eq $monitor_name } @{$tree->{nodes}}; +is_deeply($output_data->{rect}, { width => 3840, height => 2160, x => 0, y => 0, - }, 'Output DP3 at 3840x2160+0+0'); + }, "Fake output at 3840x2160+0+0"); exit_gracefully($pid); -- 2.39.5