Skip to content

Commit 38107a7

Browse files
aravindm711aravindm711
committed
added plugin filter to add project browse; refactored tests
1 parent 018babe commit 38107a7

23 files changed

Lines changed: 394 additions & 331 deletions

‎mslib/mscolab/_tests/test_chat.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
from mslib.mscolab.conf import mscolab_settings
3939
from mslib.mscolab.models import Message, MessageType
4040
from mslib.msui.icons import icons
41-
from mslib.msui.mscolab import MSSMscolabWindow
4241
from mslib._tests.utils import mscolab_start_server
42+
import mslib.msui.mss_pyui as mss_pyui
4343

4444

4545
PORTS = list(range(9300, 9320))
@@ -52,17 +52,16 @@ def setup(self):
5252
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
5353
QtTest.QTest.qWait(500)
5454
self.application = QtWidgets.QApplication(sys.argv)
55-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
56-
mscolab_server_url=self.url)
55+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5756
self.sockets = []
5857

5958
def teardown(self):
6059
for socket in self.sockets:
6160
socket.disconnect()
62-
if self.window.version_window:
63-
self.window.version_window.close()
64-
if self.window.conn:
65-
self.window.conn.disconnect()
61+
if self.window.mscolab.version_window:
62+
self.window.mscolab.version_window.close()
63+
if self.window.mscolab.conn:
64+
self.window.mscolab.conn.disconnect()
6665
self.window.hide()
6766
QtWidgets.QApplication.processEvents()
6867
self.application.quit()

‎mslib/mscolab/_tests/test_chat_manager.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
from mslib.mscolab.models import User, MessageType, Message
3535
from mslib.mscolab.conf import mscolab_settings
3636
from mslib.mscolab.chat_manager import ChatManager
37-
from mslib.msui.mscolab import MSSMscolabWindow
3837
from mslib._tests.utils import mscolab_start_server
38+
import mslib.msui.mss_pyui as mss_pyui
3939

4040

4141
PORTS = list(range(9321, 9340))
@@ -48,8 +48,7 @@ def setup(self):
4848
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
4949
QtTest.QTest.qWait(500)
5050
self.application = QtWidgets.QApplication(sys.argv)
51-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
52-
mscolab_server_url=self.url)
51+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5352
self.cm = ChatManager()
5453
self.room_name = "europe"
5554
data = {
@@ -70,10 +69,10 @@ def setup(self):
7069
requests.post(url, data=data)
7170

7271
def teardown(self):
73-
if self.window.version_window:
74-
self.window.version_window.close()
75-
if self.window.conn:
76-
self.window.conn.disconnect()
72+
if self.window.mscolab.version_window:
73+
self.window.mscolab.version_window.close()
74+
if self.window.mscolab.conn:
75+
self.window.mscolab.conn.disconnect()
7776
self.application.quit()
7877
QtWidgets.QApplication.processEvents()
7978
self.process.terminate()

‎mslib/mscolab/_tests/test_file_manager.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
from mslib.mscolab.conf import mscolab_settings
3434
from mslib.mscolab import file_manager
3535
from mslib.mscolab.models import User, Project
36-
from mslib.msui.mscolab import MSSMscolabWindow
3736
from mslib._tests.utils import mscolab_start_server
37+
import mslib.msui.mss_pyui as mss_pyui
3838

3939
PORTS = list(range(19341, 19390))
4040

@@ -46,8 +46,7 @@ def setup(self):
4646
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
4747
QtTest.QTest.qWait(500)
4848
self.application = QtWidgets.QApplication(sys.argv)
49-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
50-
mscolab_server_url=self.url)
49+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5150
self.sockets = []
5251
self.fm = file_manager.FileManager(mscolab_settings.MSCOLAB_DATA_DIR)
5352
self._example_data()
@@ -64,10 +63,10 @@ def setup(self):
6463
def teardown(self):
6564
for socket in self.sockets:
6665
socket.disconnect()
67-
if self.window.version_window:
68-
self.window.version_window.close()
69-
if self.window.conn:
70-
self.window.conn.disconnect()
66+
if self.window.mscolab.version_window:
67+
self.window.mscolab.version_window.close()
68+
if self.window.mscolab.conn:
69+
self.window.mscolab.conn.disconnect()
7170
self.application.quit()
7271
QtWidgets.QApplication.processEvents()
7372
self.process.terminate()

‎mslib/mscolab/_tests/test_files.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
from mslib.mscolab.models import db, User, Project, Change, Permission, Message
4141
from mslib.mscolab.utils import get_recent_pid
4242
from mslib._tests.utils import mscolab_register_and_login, mscolab_create_project, mscolab_start_server
43-
from mslib.msui.mscolab import MSSMscolabWindow
43+
import mslib.msui.mss_pyui as mss_pyui
4444

4545

4646
PORTS = list(range(9361, 9380))
@@ -53,8 +53,7 @@ def setup(self):
5353
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
5454
QtTest.QTest.qWait(500)
5555
self.application = QtWidgets.QApplication(sys.argv)
56-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
57-
mscolab_server_url=self.url)
56+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5857
self.sockets = []
5958
self.file_message_counter = [0] * 2
6059
with self.app.app_context():
@@ -63,10 +62,10 @@ def setup(self):
6362
def teardown(self):
6463
for socket in self.sockets:
6564
socket.disconnect()
66-
if self.window.version_window:
67-
self.window.version_window.close()
68-
if self.window.conn:
69-
self.window.conn.disconnect()
65+
if self.window.mscolab.version_window:
66+
self.window.mscolab.version_window.close()
67+
if self.window.mscolab.conn:
68+
self.window.mscolab.conn.disconnect()
7069
self.application.quit()
7170
QtWidgets.QApplication.processEvents()
7271
self.process.terminate()

‎mslib/mscolab/_tests/test_files_api.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from mslib.mscolab.server import db
3838
from mslib.mscolab.utils import get_recent_pid
3939
from mslib._tests.utils import mscolab_register_and_login, mscolab_create_project, mscolab_start_server
40-
from mslib.msui.mscolab import MSSMscolabWindow
40+
import mslib.msui.mss_pyui as mss_pyui
4141

4242

4343
PORTS = list(range(9381, 9400))
@@ -50,8 +50,7 @@ def setup(self):
5050
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
5151
QtTest.QTest.qWait(500)
5252
self.application = QtWidgets.QApplication(sys.argv)
53-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
54-
mscolab_server_url=self.url)
53+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5554
self.sockets = []
5655
self.file_message_counter = [0] * 2
5756
self.undefined_p_id = 123
@@ -68,10 +67,10 @@ def setup(self):
6867
def teardown(self):
6968
for socket in self.sockets:
7069
socket.disconnect()
71-
if self.window.version_window:
72-
self.window.version_window.close()
73-
if self.window.conn:
74-
self.window.conn.disconnect()
70+
if self.window.mscolab.version_window:
71+
self.window.mscolab.version_window.close()
72+
if self.window.mscolab.conn:
73+
self.window.mscolab.conn.disconnect()
7574
self.application.quit()
7675
QtWidgets.QApplication.processEvents()
7776
self.process.terminate()

‎mslib/mscolab/_tests/test_seed.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
"""
2727

2828
import sys
29-
from mslib.msui.mscolab import MSSMscolabWindow
3029
from PyQt5 import QtTest, QtWidgets
3130
from mslib.mscolab.models import User
3231
from mslib.mscolab.conf import mscolab_settings
3332
from mslib._tests.utils import (mscolab_register_and_login,
3433
mscolab_create_project, mscolab_delete_all_projects,
3534
mscolab_delete_user, mscolab_start_server)
3635
from mslib.mscolab.seed import add_all_users_default_project, add_user, delete_user
36+
import mslib.msui.mss_pyui as mss_pyui
3737

3838

3939
PORTS = list(range(19571, 19590))
@@ -45,8 +45,7 @@ def setup(self):
4545
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS, mscolab_settings)
4646
QtTest.QTest.qWait(100)
4747
self.application = QtWidgets.QApplication(sys.argv)
48-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
49-
mscolab_server_url=self.url)
48+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5049
with self.app.app_context():
5150
response = mscolab_register_and_login(self.app, self.url, 'UV0@uv0', 'UV0', 'uv0')
5251
assert response.status == '200 OK'
@@ -66,10 +65,10 @@ def teardown(self):
6665
user = User.query.filter_by(emailid="UV2@v2").first()
6766
if user is not None:
6867
delete_user('UV2@uv2')
69-
if self.window.version_window:
70-
self.window.version_window.close()
71-
if self.window.conn:
72-
self.window.conn.disconnect()
68+
if self.window.mscolab.version_window:
69+
self.window.mscolab.version_window.close()
70+
if self.window.mscolab.conn:
71+
self.window.mscolab.conn.disconnect()
7372
self.application.quit()
7473
QtWidgets.QApplication.processEvents()
7574
self.process.terminate()

‎mslib/mscolab/_tests/test_server.py‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
from werkzeug.urls import url_join
3333
from mslib.mscolab.conf import mscolab_settings
3434
from mslib.mscolab import server
35-
from mslib.msui.mscolab import MSSMscolabWindow
3635
from mslib.mscolab.models import User
3736
from mslib._tests.utils import (mscolab_register_user,
3837
mscolab_register_and_login, mscolab_create_content,
3938
mscolab_create_project,
4039
mscolab_delete_user, mscolab_login, mscolab_start_server)
4140
from PyQt5 import QtWidgets, QtTest
41+
import mslib.msui.mss_pyui as mss_pyui
4242

4343
PORTS = list(range(10481, 10530))
4444

@@ -50,17 +50,16 @@ def setup(self):
5050
self.process, self.url, self.app, self.sockio, self.cm, self.fm = mscolab_start_server(PORTS)
5151
QtTest.QTest.qWait(500)
5252
self.application = QtWidgets.QApplication(sys.argv)
53-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
54-
mscolab_server_url=self.url)
53+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5554

5655
def teardown(self):
5756
# to disconnect connections, and clear token
5857
# Not logging out since it pops up a dialog
59-
# self.window.logout()
60-
if self.window.version_window:
61-
self.window.version_window.close()
62-
if self.window.conn:
63-
self.window.conn.disconnect()
58+
# self.window.mscolab.logout()
59+
if self.window.mscolab.version_window:
60+
self.window.mscolab.version_window.close()
61+
if self.window.mscolab.conn:
62+
self.window.mscolab.conn.disconnect()
6463
self.application.quit()
6564
QtWidgets.QApplication.processEvents()
6665
self.process.terminate()
@@ -80,14 +79,13 @@ def setup(self):
8079
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS, mscolab_settings)
8180
QtTest.QTest.qWait(100)
8281
self.application = QtWidgets.QApplication(sys.argv)
83-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
84-
mscolab_server_url=self.url)
82+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
8583

8684
def teardown(self):
87-
if self.window.version_window:
88-
self.window.version_window.close()
89-
if self.window.conn:
90-
self.window.conn.disconnect()
85+
if self.window.mscolab.version_window:
86+
self.window.mscolab.version_window.close()
87+
if self.window.mscolab.conn:
88+
self.window.mscolab.conn.disconnect()
9189
self.application.quit()
9290
QtWidgets.QApplication.processEvents()
9391
self.process.terminate()

‎mslib/mscolab/_tests/test_sockets.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
from PyQt5 import QtWidgets, QtTest
3636
from mslib.mscolab.conf import mscolab_settings
37-
from mslib.msui.mscolab import MSSMscolabWindow
3837
from mslib._tests.utils import mscolab_start_server
38+
import mslib.msui.mss_pyui as mss_pyui
3939

4040

4141
PORTS = list(range(9521, 9540))
@@ -51,17 +51,16 @@ def setup(self):
5151
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
5252
QtTest.QTest.qWait(500)
5353
self.application = QtWidgets.QApplication(sys.argv)
54-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
55-
mscolab_server_url=self.url)
54+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5655
self.sockets = []
5756

5857
def teardown(self):
5958
for socket in self.sockets:
6059
socket.disconnect()
61-
if self.window.version_window:
62-
self.window.version_window.close()
63-
if self.window.conn:
64-
self.window.conn.disconnect()
60+
if self.window.mscolab.version_window:
61+
self.window.mscolab.version_window.close()
62+
if self.window.mscolab.conn:
63+
self.window.mscolab.conn.disconnect()
6564
self.application.quit()
6665
QtWidgets.QApplication.processEvents()
6766
self.process.terminate()

‎mslib/mscolab/_tests/test_user.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
from PyQt5 import QtWidgets, QtTest
3333
from mslib.mscolab.server import check_login, register_user
3434
from mslib.mscolab.conf import mscolab_settings
35-
from mslib.msui.mscolab import MSSMscolabWindow
3635
from mslib._tests.utils import mscolab_start_server
36+
import mslib.msui.mss_pyui as mss_pyui
3737

3838

3939
PORTS = list(range(9541, 9560))
@@ -46,14 +46,13 @@ def setup(self):
4646
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
4747
QtTest.QTest.qWait(500)
4848
self.application = QtWidgets.QApplication(sys.argv)
49-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
50-
mscolab_server_url=self.url)
49+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
5150

5251
def teardown(self):
53-
if self.window.version_window:
54-
self.window.version_window.close()
55-
if self.window.conn:
56-
self.window.conn.disconnect()
52+
if self.window.mscolab.version_window:
53+
self.window.mscolab.version_window.close()
54+
if self.window.mscolab.conn:
55+
self.window.mscolab.conn.disconnect()
5756
self.application.quit()
5857
QtWidgets.QApplication.processEvents()
5958
self.process.terminate()

‎mslib/mscolab/_tests/test_utils.py‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
from mslib.mscolab.models import User, MessageType
3434
from mslib.mscolab.utils import get_recent_pid, get_session_id, get_message_dict, create_files, os_fs_create_dir
3535
from mslib.mscolab.conf import mscolab_settings
36-
from mslib.msui.mscolab import MSSMscolabWindow
3736
from mslib._tests.utils import (mscolab_start_server, mscolab_create_project, mscolab_register_and_login,
3837
mscolab_delete_user, mscolab_delete_all_projects)
3938
from mslib.mscolab.server import register_user
39+
import mslib.msui.mss_pyui as mss_pyui
4040

4141
PORTS = list(range(9561, 9580))
4242

@@ -64,8 +64,7 @@ def setup(self):
6464
self.process, self.url, self.app, self.sio, self.cm, self.fm = mscolab_start_server(PORTS)
6565
QtTest.QTest.qWait(500)
6666
self.application = QtWidgets.QApplication(sys.argv)
67-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
68-
mscolab_server_url=self.url)
67+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
6968

7069
with self.app.app_context():
7170
response = mscolab_register_and_login(self.app, self.url, 'a1a@a1a', 'a1a', 'a1a')
@@ -83,10 +82,10 @@ def teardown(self):
8382
with self.app.app_context():
8483
mscolab_delete_all_projects(self.app, self.url, 'a1a@a1a', 'a1a', 'a1a')
8584
mscolab_delete_user(self.app, self.url, 'a1a@a1a', 'a1a')
86-
if self.window.version_window:
87-
self.window.version_window.close()
88-
if self.window.conn:
89-
self.window.conn.disconnect()
85+
if self.window.mscolab.version_window:
86+
self.window.mscolab.version_window.close()
87+
if self.window.mscolab.conn:
88+
self.window.mscolab.conn.disconnect()
9089
self.application.quit()
9190
QtWidgets.QApplication.processEvents()
9291
self.process.terminate()
@@ -117,19 +116,18 @@ def setup(self):
117116
self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
118117
QtTest.QTest.qWait(100)
119118
self.application = QtWidgets.QApplication(sys.argv)
120-
self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
121-
mscolab_server_url=self.url)
119+
self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
122120
with self.app.app_context():
123121
register_user('[email protected]', 'sdf', 'sdf')
124122
self.user = User.query.filter_by(emailid="[email protected]").first()
125123

126124
def teardown(self):
127125
with self.app.app_context():
128126
mscolab_delete_user(self.app, self.url, '[email protected]', 'sdf')
129-
if self.window.version_window:
130-
self.window.version_window.close()
131-
if self.window.conn:
132-
self.window.conn.disconnect()
127+
if self.window.mscolab.version_window:
128+
self.window.mscolab.version_window.close()
129+
if self.window.mscolab.conn:
130+
self.window.mscolab.conn.disconnect()
133131
self.application.quit()
134132
QtWidgets.QApplication.processEvents()
135133
self.process.terminate()

0 commit comments

Comments
 (0)