openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

You've just missed removing the pjlink instance in the test file. (see inline)

Diff comments:

> 
> === added file 'tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py'
> --- tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py	1970-01-01 00:00:00 +0000
> +++ tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py	2017-11-24 16:39:03 +0000
> @@ -0,0 +1,136 @@
> +# -*- coding: utf-8 -*-
> +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
> +
> +###############################################################################
> +# OpenLP - Open Source Lyrics Projection                                      #
> +# --------------------------------------------------------------------------- #
> +# Copyright (c) 2008-2015 OpenLP Developers                                   #
> +# --------------------------------------------------------------------------- #
> +# This program 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; version 2 of the License.                              #
> +#                                                                             #
> +# This program 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 this program; if not, write to the Free Software Foundation, Inc., 59  #
> +# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
> +###############################################################################
> +"""
> +Package to test the openlp.core.projectors.pjlink base package.
> +"""
> +from unittest import TestCase
> +from unittest.mock import patch
> +
> +from openlp.core.projectors.db import Projector
> +from openlp.core.projectors.pjlink import PJLink
> +
> +from tests.resources.projector.data import TEST_PIN, TEST_CONNECT_AUTHENTICATE, TEST_HASH, TEST1_DATA
> +
> +pjlink_test = PJLink(Projector(**TEST1_DATA), no_poll=True)

You havn't removed this ^

> +
> +
> +class TestPJLinkBugs(TestCase):
> +    """
> +    Tests for the PJLink module bugfixes
> +    """
> +    def setUp(self):
> +        '''
> +        Initialization
> +        '''
> +        self.pjlink_test = PJLink(Projector(**TEST1_DATA), no_poll=True)
> +
> +    def tearDown(self):
> +        '''
> +        Cleanups
> +        '''
> +        self.pjlink_test = None
> +
> +    def test_bug_1550891_process_clss_nonstandard_reply_1(self):
> +        """
> +        Bugfix 1550891: CLSS request returns non-standard reply with Optoma/Viewsonic projector
> +        """
> +        # GIVEN: Test object
> +        pjlink = self.pjlink_test
> +
> +        # WHEN: Process non-standard reply
> +        pjlink.process_clss('Class 1')
> +
> +        # THEN: Projector class should be set with proper value
> +        self.assertEqual(pjlink.pjlink_class, '1',
> +                         'Non-standard class reply should have set class=1')
> +
> +    def test_bug_1550891_process_clss_nonstandard_reply_2(self):
> +        """
> +        Bugfix 1550891: CLSS request returns non-standard reply with BenQ projector
> +        """
> +        # GIVEN: Test object
> +        pjlink = self.pjlink_test
> +
> +        # WHEN: Process non-standard reply
> +        pjlink.process_clss('Version2')
> +
> +        # THEN: Projector class should be set with proper value
> +        # NOTE: At this time BenQ is Class 1, but we're trying a different value to verify
> +        self.assertEqual(pjlink.pjlink_class, '2',
> +                         'Non-standard class reply should have set class=2')
> +
> +    def test_bug_1593882_no_pin_authenticated_connection(self):
> +        """
> +        Test bug 1593882 no pin and authenticated request exception
> +        """
> +        # GIVEN: Test object and mocks
> +        mock_socket_timer = patch.object(self.pjlink_test, 'socket_timer').start()
> +        mock_timer = patch.object(self.pjlink_test, 'timer').start()
> +        mock_authentication = patch.object(self.pjlink_test, 'projectorAuthentication').start()
> +        mock_ready_read = patch.object(self.pjlink_test, 'waitForReadyRead').start()
> +        mock_send_command = patch.object(self.pjlink_test, 'send_command').start()
> +        pjlink = self.pjlink_test
> +        pjlink.pin = None
> +        mock_ready_read.return_value = True
> +
> +        # WHEN: call with authentication request and pin not set
> +        pjlink.check_login(data=TEST_CONNECT_AUTHENTICATE)
> +
> +        # THEN: 'No Authentication' signal should have been sent
> +        mock_authentication.emit.assert_called_with(pjlink.ip)
> +
> +    def test_bug_1593883_pjlink_authentication(self):
> +        """
> +        Test bugfix 1593883 pjlink authentication
> +        """
> +        # GIVEN: Test object and data
> +        mock_socket_timer = patch.object(self.pjlink_test, 'socket_timer').start()
> +        mock_timer = patch.object(self.pjlink_test, 'timer').start()
> +        mock_send_command = patch.object(self.pjlink_test, 'write').start()
> +        mock_state = patch.object(self.pjlink_test, 'state').start()
> +        mock_waitForReadyRead = patch.object(self.pjlink_test, 'waitForReadyRead').start()
> +        pjlink = self.pjlink_test
> +        pjlink.pin = TEST_PIN
> +        mock_state.return_value = pjlink.ConnectedState
> +        mock_waitForReadyRead.return_value = True
> +
> +        # WHEN: Athenticated connection is called
> +        pjlink.check_login(data=TEST_CONNECT_AUTHENTICATE)
> +
> +        # THEN: send_command should have the proper authentication
> +        self.assertEqual("{test}".format(test=mock_send_command.call_args),
> +                         "call(b'{hash}%1CLSS ?\\r')".format(hash=TEST_HASH))
> +
> +    def test_bug_1734275_process_lamp_nonstandard_reply(self):
> +        """
> +        Test bugfix 17342785 non-standard LAMP response
> +        """
> +        # GIVEN: Test object
> +        pjlink = self.pjlink_test
> +
> +        # WHEN: Process lamp command called with only hours and no lamp power state
> +        pjlink.process_lamp("45")
> +
> +        # THEN: Lamp should show hours as 45 and lamp power as Unavailable
> +        self.assertEqual(len(pjlink.lamp), 1, 'There should only be 1 lamp available')
> +        self.assertEqual(pjlink.lamp[0]['Hours'], 45, 'Lamp hours should have equalled 45')
> +        self.assertIsNone(pjlink.lamp[0]['On'], 'Lamp power should be "None"')


-- 
https://code.launchpad.net/~alisonken1/openlp/bug-1734275/+merge/334254
Your team OpenLP Core is subscribed to branch lp:openlp.