openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-c-resources into lp:openlp.

Commit message:
Update pjlink resources with old database and new test data

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-c-resources/+merge/324333

-- Add pjlink version 1 old database for testing db upgrade
-- Update test data with new information
 
No code changes at this time.
Projector tests will fail until test methods updated (merge pjlink2-c)

-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-c-resources into lp:openlp.

=== modified file 'tests/resources/projector/data.py'
--- tests/resources/projector/data.py	2017-05-07 10:15:10 +0000
+++ tests/resources/projector/data.py	2017-05-19 17:36:31 +0000
@@ -27,6 +27,8 @@
 from tempfile import gettempdir
 
 # Test data
+TEST_DB_PJLINK1 = 'projector_pjlink1.sqlite'
+
 TEST_DB = os.path.join(gettempdir(), 'openlp-test-projectordb.sql')
 
 TEST_SALT = '498e4a67'
@@ -39,26 +41,45 @@
 
 TEST_DB = os.path.join(gettempdir(), 'openlp-test-projectordb.sql')
 
+
+    serial_no = Column(String(30))
+    model_filter = Column(String(30))
+    model_lamp = Column(String(30))
+    sw_version = Column(String(30))
+
 TEST1_DATA = dict(ip='111.111.111.111',
                   port='1111',
                   pin='1111',
                   name='___TEST_ONE___',
                   location='location one',
-                  notes='notes one')
+                  notes='notes one',
+                  serial_no='Serial Number 1',
+                  model_filter='Filter type 1',
+                  model_lamp='Lamp type 1',
+                  sw_version='Test Version 1')
 
 TEST2_DATA = dict(ip='222.222.222.222',
                   port='2222',
                   pin='2222',
                   name='___TEST_TWO___',
                   location='location two',
-                  notes='notes two')
+                  notes='notes two',
+                  serial_no='Serial Number 2',
+                  model_filter='Filter type 2',
+                  model_lamp='Lamp type 2',
+                  sw_version='Test Version 2')
 
 TEST3_DATA = dict(ip='333.333.333.333',
                   port='3333',
                   pin='3333',
                   name='___TEST_THREE___',
                   location='location three',
-                  notes='notes three')
+                  notes='notes three',
+                  serial_no='Serial Number 3',
+                  model_filter='Filter type 3',
+                  model_lamp='Lamp type 3',
+                  sw_version='Test Version 3')
+)
 
 TEST_VIDEO_CODES = {
     '11': 'RGB 1',

=== added file 'tests/resources/projector/projector_pjlink1.sqlite'
Binary files tests/resources/projector/projector_pjlink1.sqlite	1970-01-01 00:00:00 +0000 and tests/resources/projector/projector_pjlink1.sqlite	2017-05-19 17:36:31 +0000 differ