From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Aaron Jensen Newsgroups: gmane.emacs.bugs Subject: bug#45748: [PATCH] * test/src/xdisp-tests.el Fix tests to work in batch mode Date: Sat, 16 Jan 2021 12:28:46 -0600 Message-ID: <20210116182846.4206-2-aaronjensen@gmail.com> References: <20210116182846.4206-1-aaronjensen@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7471"; mail-complaints-to="usenet@ciao.gmane.io" Cc: contovob@tcd.ie, Aaron Jensen To: 45748@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 16 19:30:43 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l0qLT-0001qi-7r for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 16 Jan 2021 19:30:43 +0100 Original-Received: from localhost ([::1]:35838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0qLS-0002Ia-AN for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 16 Jan 2021 13:30:42 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0qKp-00025Y-9z for bug-gnu-emacs@gnu.org; Sat, 16 Jan 2021 13:30:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0qKp-0004Ra-2Y for bug-gnu-emacs@gnu.org; Sat, 16 Jan 2021 13:30:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0qKo-0002MC-UE for bug-gnu-emacs@gnu.org; Sat, 16 Jan 2021 13:30:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Aaron Jensen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Jan 2021 18:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45748 X-GNU-PR-Package: emacs Original-Received: via spool by 45748-submit@debbugs.gnu.org id=B45748.16108217438960 (code B ref 45748); Sat, 16 Jan 2021 18:30:02 +0000 Original-Received: (at 45748) by debbugs.gnu.org; 16 Jan 2021 18:29:03 +0000 Original-Received: from localhost ([127.0.0.1]:44003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0qJr-0002KS-1C for submit@debbugs.gnu.org; Sat, 16 Jan 2021 13:29:03 -0500 Original-Received: from mail-io1-f48.google.com ([209.85.166.48]:33885) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0qJq-0002Jn-Ae for 45748@debbugs.gnu.org; Sat, 16 Jan 2021 13:29:02 -0500 Original-Received: by mail-io1-f48.google.com with SMTP id u17so24794549iow.1 for <45748@debbugs.gnu.org>; Sat, 16 Jan 2021 10:29:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aoNZuGpLXxX0cRo4Gbll3vhuz1gs9Lih0vvQYaMdOIE=; b=UwhgtxdCNJa7dOUD39IMKV/8bxv83xZdqEPVr0yODLtK7Ei9mjQ84JklalEt46CuLs QJdoYjBQLCCHg++Iy8cInU6Uh+lBepGtypfQ+8MLGdYiSdbnAiozEq8jXp+PyAvhB0uv prNxuhpkTN8SzE9updC3DWk4sSjC01LnZZfsUR3G2tULhNOYjUnhoku/OR9xmEipf/X/ 2Ia7QqKQQxheVCQu+/3UkDfOgqwxjkTwvmQ6W1/x/3dG6a2g0mtFa48dwYI4GsZj4mmn mTGV7wBDzVxFU75FUGevGjtxkzLh9pXiN1qz7d7oIdUSFf0OzJJ9la/YHWkz2CB7ltqn GRUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aoNZuGpLXxX0cRo4Gbll3vhuz1gs9Lih0vvQYaMdOIE=; b=SIOh+nCfIPsTNvkZVJujXJBY8ug28qHorluXA1mcQ8bgRvhygtzzmU6UYHPtdGYIv0 H6RLMhc5K+WIr3efTFG/lTPdf+w3UxNbnHBWjO04lIJ5e3JZaouZ2PuKVO/u1YuseYZR 2sZwWE1NN55tR3dRxkOHNU2apYdVvlVQ/nlz0ITUCJBh+bNY6RtOufEjeKeNXsVF7Zmp rLyZaD0psM5KfAfPXi7Usec1HnKyd45sE8QKqbLwrE5t19jX/90uWWD3adTpd8X3f8x/ jGBb7EsvSeq5BhSxdUzGe7s4R+eUiCVI14EGZXinSN6MhvClvYOhoQgetFedOnTfIWWX CBAQ== X-Gm-Message-State: AOAM5326bycUq92nNWsRqB+E6YYCGPnOa//kH8e0AFgNdRVGctTsjsYL 0YV/c7zA7UxT6QeXUXIbMFW4pDohFRQxwA== X-Google-Smtp-Source: ABdhPJxYJcMSnIH3m+pTWNPNri4Sd9A/Ep5KeXeUxp+tK+9KTFm8CpRQq5mKEh4WdSjoI3zRzGrKiw== X-Received: by 2002:a05:6e02:1908:: with SMTP id w8mr15684666ilu.229.1610821736655; Sat, 16 Jan 2021 10:28:56 -0800 (PST) Original-Received: from localhost.localdomain ([205.214.166.193]) by smtp.gmail.com with ESMTPSA id g2sm7313833ilh.41.2021.01.16.10.28.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Jan 2021 10:28:56 -0800 (PST) X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210116182846.4206-1-aaronjensen@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198032 Archived-At: (xdisp-tests--window-text-pixel-size) (xdisp-tests--window-text-pixel-size-leading-space) (xdisp-tests--window-text-pixel-size-trailing-space): Fix tests --- test/src/xdisp-tests.el | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/test/src/xdisp-tests.el b/test/src/xdisp-tests.el index ec96d777ff..4e7d2ad8ab 100644 --- a/test/src/xdisp-tests.el +++ b/test/src/xdisp-tests.el @@ -75,31 +75,28 @@ xdisp-tests--minibuffer-scroll (ert-deftest xdisp-tests--window-text-pixel-size () ;; bug#45748 (with-temp-buffer (insert "xxx") - (let* ((window - (display-buffer (current-buffer) '(display-buffer-in-child-frame . nil))) - (char-width (frame-char-width)) - (size (window-text-pixel-size nil t t))) - (delete-frame (window-frame window)) - (should (equal (/ (car size) char-width) 3))))) + (switch-to-buffer (current-buffer)) + (let* ((char-width (frame-char-width)) + (size (window-text-pixel-size nil t t)) + (width-in-chars (/ (car size) char-width))) + (should (equal width-in-chars 3))))) (ert-deftest xdisp-tests--window-text-pixel-size-leading-space () ;; bug#45748 (with-temp-buffer (insert " xx") - (let* ((window - (display-buffer (current-buffer) '(display-buffer-in-child-frame . nil))) - (char-width (frame-char-width)) - (size (window-text-pixel-size nil t t))) - (delete-frame (window-frame window)) - (should (equal (/ (car size) char-width) 3))))) + (switch-to-buffer (current-buffer)) + (let* ((char-width (frame-char-width)) + (size (window-text-pixel-size nil t t)) + (width-in-chars (/ (car size) char-width))) + (should (equal width-in-chars 3))))) (ert-deftest xdisp-tests--window-text-pixel-size-trailing-space () ;; bug#45748 (with-temp-buffer (insert "xx ") - (let* ((window - (display-buffer (current-buffer) '(display-buffer-in-child-frame . nil))) - (char-width (frame-char-width)) - (size (window-text-pixel-size nil t t))) - (delete-frame (window-frame window)) - (should (equal (/ (car size) char-width) 3))))) + (switch-to-buffer (current-buffer)) + (let* ((char-width (frame-char-width)) + (size (window-text-pixel-size nil t t)) + (width-in-chars (/ (car size) char-width))) + (should (equal width-in-chars 3))))) ;;; xdisp-tests.el ends here -- 2.28.0