From 45e95d497d9f7be39846724628f29d0b00fcdecb Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 21:41:41 +0200 Subject: [PATCH 1/5] Convert test_signal_name using a signal fixture --- qutebrowser/test/utils/debug/test_signal.py | 35 +++++++++++++++++++++ qutebrowser/test/utils/test_debug.py | 4 --- 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 qutebrowser/test/utils/debug/test_signal.py diff --git a/qutebrowser/test/utils/debug/test_signal.py b/qutebrowser/test/utils/debug/test_signal.py new file mode 100644 index 000000000..ff23680d0 --- /dev/null +++ b/qutebrowser/test/utils/debug/test_signal.py @@ -0,0 +1,35 @@ +# Copyright 2014-2015 Florian Bruhin (The Compiler) +# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: + +# +# This file is part of qutebrowser. +# +# qutebrowser is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# qutebrowser is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with qutebrowser. If not, see . + +"""Test signal debug output functions.""" + +import pytest + +from qutebrowser.test import stubs +from qutebrowser.utils import debug + + +@pytest.fixture +def signal(): + return stubs.FakeSignal() + + +def test_signal_name(signal): + """Test signal_name().""" + assert debug.signal_name(signal) == 'fake' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index 7bd2d94c4..e08b2b943 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -38,10 +38,6 @@ class TestDebug(unittest.TestCase): def setUp(self): self.signal = stubs.FakeSignal() - def test_signal_name(self): - """Test signal_name().""" - self.assertEqual(debug.signal_name(self.signal), 'fake') - def test_dbg_signal(self): """Test dbg_signal().""" self.assertEqual(debug.dbg_signal(self.signal, [23, 42]), From 9d39fbd4e5a1bf2a4749317b556099ad217026da Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 21:45:10 +0200 Subject: [PATCH 2/5] Convert test_dbg_signal --- qutebrowser/test/utils/debug/test_signal.py | 5 +++++ qutebrowser/test/utils/test_debug.py | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_signal.py b/qutebrowser/test/utils/debug/test_signal.py index ff23680d0..b6126b22f 100644 --- a/qutebrowser/test/utils/debug/test_signal.py +++ b/qutebrowser/test/utils/debug/test_signal.py @@ -33,3 +33,8 @@ def signal(): def test_signal_name(signal): """Test signal_name().""" assert debug.signal_name(signal) == 'fake' + + +def test_dbg_signal(signal): + """Test dbg_signal().""" + assert debug.dbg_signal(signal, [23, 42]) == 'fake(23, 42)' diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index e08b2b943..f36d7f24b 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -38,11 +38,6 @@ class TestDebug(unittest.TestCase): def setUp(self): self.signal = stubs.FakeSignal() - def test_dbg_signal(self): - """Test dbg_signal().""" - self.assertEqual(debug.dbg_signal(self.signal, [23, 42]), - 'fake(23, 42)') - def test_dbg_signal_eliding(self): """Test eliding in dbg_signal().""" self.assertEqual(debug.dbg_signal(self.signal, From 22522406e13cb98ed26e544bd2e864d9273317af Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 21:50:32 +0200 Subject: [PATCH 3/5] Convert test_dbg_signal_eliding --- qutebrowser/test/utils/debug/test_signal.py | 6 ++++++ qutebrowser/test/utils/test_debug.py | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_signal.py b/qutebrowser/test/utils/debug/test_signal.py index b6126b22f..177a11c6b 100644 --- a/qutebrowser/test/utils/debug/test_signal.py +++ b/qutebrowser/test/utils/debug/test_signal.py @@ -38,3 +38,9 @@ def test_signal_name(signal): def test_dbg_signal(signal): """Test dbg_signal().""" assert debug.dbg_signal(signal, [23, 42]) == 'fake(23, 42)' + + +def test_dbg_signal_eliding(signal): + """Test eliding in dbg_signal().""" + dbg_signal = debug.dbg_signal(signal, ['x' * 201]) + assert dbg_signal == "fake('{}\u2026)".format('x' * 198) diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index f36d7f24b..ee6ec30fe 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -38,12 +38,6 @@ class TestDebug(unittest.TestCase): def setUp(self): self.signal = stubs.FakeSignal() - def test_dbg_signal_eliding(self): - """Test eliding in dbg_signal().""" - self.assertEqual(debug.dbg_signal(self.signal, - ['x' * 201]), - "fake('{}\u2026)".format('x' * 198)) - def test_dbg_signal_newline(self): """Test dbg_signal() with a newline.""" self.assertEqual(debug.dbg_signal(self.signal, ['foo\nbar']), From 7540a5bbf4453fde3b307041a2be366db03a0649 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 21:54:24 +0200 Subject: [PATCH 4/5] Convert test_dbg_signal_newline --- qutebrowser/test/utils/debug/test_signal.py | 6 ++++++ qutebrowser/test/utils/test_debug.py | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/qutebrowser/test/utils/debug/test_signal.py b/qutebrowser/test/utils/debug/test_signal.py index 177a11c6b..4bea5bf6d 100644 --- a/qutebrowser/test/utils/debug/test_signal.py +++ b/qutebrowser/test/utils/debug/test_signal.py @@ -44,3 +44,9 @@ def test_dbg_signal_eliding(signal): """Test eliding in dbg_signal().""" dbg_signal = debug.dbg_signal(signal, ['x' * 201]) assert dbg_signal == "fake('{}\u2026)".format('x' * 198) + + +def test_dbg_signal_newline(signal): + """Test dbg_signal() with a newline.""" + dbg_signal = debug.dbg_signal(signal, ['foo\nbar']) + assert dbg_signal == r"fake('foo\nbar')" diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py index ee6ec30fe..13db4f1bd 100644 --- a/qutebrowser/test/utils/test_debug.py +++ b/qutebrowser/test/utils/test_debug.py @@ -31,18 +31,5 @@ from qutebrowser.utils import debug from qutebrowser.test import stubs -class TestDebug(unittest.TestCase): - - """Test signal debug output functions.""" - - def setUp(self): - self.signal = stubs.FakeSignal() - - def test_dbg_signal_newline(self): - """Test dbg_signal() with a newline.""" - self.assertEqual(debug.dbg_signal(self.signal, ['foo\nbar']), - r"fake('foo\nbar')") - - if __name__ == '__main__': unittest.main() From efbc8e0cbfb71442504500d029b676745e76dc55 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 3 Apr 2015 21:55:19 +0200 Subject: [PATCH 5/5] Remove former unittest module test_debug.py --- qutebrowser/test/utils/test_debug.py | 35 ---------------------------- 1 file changed, 35 deletions(-) delete mode 100644 qutebrowser/test/utils/test_debug.py diff --git a/qutebrowser/test/utils/test_debug.py b/qutebrowser/test/utils/test_debug.py deleted file mode 100644 index 13db4f1bd..000000000 --- a/qutebrowser/test/utils/test_debug.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2014-2015 Florian Bruhin (The Compiler) -# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: - -# -# This file is part of qutebrowser. -# -# qutebrowser is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# qutebrowser is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with qutebrowser. If not, see . - -"""Tests for qutebrowser.utils.debug.""" - -import re -import time -import unittest -import logging - -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QStyle, QFrame - -from qutebrowser.utils import debug -from qutebrowser.test import stubs - - -if __name__ == '__main__': - unittest.main()