Continue 1.1.0 development with inventory tabs and refresh fix
This commit is contained in:
@@ -0,0 +1,91 @@
|
||||
import copy
|
||||
import os
|
||||
import unittest
|
||||
|
||||
os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
|
||||
from PySide6 import QtCore as C, QtWidgets as W
|
||||
from PySide6.QtTest import QTest
|
||||
|
||||
from ranch_assistant.engine import demo_snapshot
|
||||
from ranch_assistant.inventory_gui import InventoryTable
|
||||
from ranch_assistant.model import Catalog
|
||||
|
||||
|
||||
class InventoryRefreshTests(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.app = W.QApplication.instance() or W.QApplication([])
|
||||
|
||||
def drain(self, table):
|
||||
for _ in range(200):
|
||||
if not table.row_batch.running:
|
||||
return
|
||||
QTest.qWait(2)
|
||||
self.fail("Inventory refresh did not finish")
|
||||
|
||||
def test_changed_inventory_reuses_cells_without_ownership_warnings(self):
|
||||
catalog = Catalog()
|
||||
snapshot = demo_snapshot(catalog)
|
||||
table = InventoryTable(catalog)
|
||||
messages = []
|
||||
previous = C.qInstallMessageHandler(lambda kind, context, message: messages.append(message))
|
||||
try:
|
||||
table.set_data(snapshot, {})
|
||||
self.drain(table)
|
||||
table.sortItems(1, C.Qt.SortOrder.DescendingOrder)
|
||||
cells = [table.item(row, 4) for row in range(table.rowCount())]
|
||||
changed = copy.deepcopy(snapshot)
|
||||
for item in changed.raw["items"]:
|
||||
item["num"] += 7
|
||||
table.set_data(changed, {})
|
||||
self.drain(table)
|
||||
counts = {str(item["typeId"]): item["num"] for item in changed.raw["items"]}
|
||||
for row in range(table.rowCount()):
|
||||
key = table.item(row, 0).data(C.Qt.ItemDataRole.UserRole)
|
||||
self.assertEqual(table.item(row, 4).data(C.Qt.ItemDataRole.DisplayRole), counts[key])
|
||||
self.assertIn(table.item(row, 4), cells)
|
||||
self.assertEqual([message for message in messages if "already owned" in message], [])
|
||||
finally:
|
||||
C.qInstallMessageHandler(previous)
|
||||
table.row_batch.stop()
|
||||
table.close()
|
||||
|
||||
def test_two_accounts_filter_and_restart_partial_refresh(self):
|
||||
catalog = Catalog()
|
||||
snapshot = demo_snapshot(catalog)
|
||||
keys = list(catalog.monsters)[:100]
|
||||
snapshot.raw["items"] = [{"id": 1000 + i, "typeId": int(key), "num": i + 1}
|
||||
for i, key in enumerate(keys)]
|
||||
tables = [InventoryTable(catalog), InventoryTable(catalog)]
|
||||
messages = []
|
||||
previous = C.qInstallMessageHandler(lambda kind, context, message: messages.append(message))
|
||||
try:
|
||||
for table in tables:
|
||||
table.set_data(snapshot, {})
|
||||
table.set_filter(catalog.item_name(keys[-1]), 6)
|
||||
table.set_data(snapshot, {})
|
||||
self.drain(table)
|
||||
self.assertGreater(table.rowCount(), 0)
|
||||
table.set_filter()
|
||||
table.set_data(snapshot, {})
|
||||
self.drain(table)
|
||||
table.sortItems(4, C.Qt.SortOrder.DescendingOrder)
|
||||
changed = copy.deepcopy(snapshot)
|
||||
changed.raw["items"].reverse()
|
||||
table.set_data(changed, {})
|
||||
self.drain(table)
|
||||
self.assertEqual(table.rowCount(), 100)
|
||||
for row in range(table.rowCount()):
|
||||
key = table.item(row, 0).data(C.Qt.ItemDataRole.UserRole)
|
||||
self.assertEqual(table.cellWidget(row, 6).property("item_type"), key)
|
||||
self.assertIsNot(tables[0].item(0, 0), tables[1].item(0, 0))
|
||||
self.assertEqual([message for message in messages if "already owned" in message], [])
|
||||
finally:
|
||||
C.qInstallMessageHandler(previous)
|
||||
for table in tables:
|
||||
table.row_batch.stop()
|
||||
table.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -122,25 +122,41 @@ class V11GuiTests(unittest.TestCase):
|
||||
self.assertIn("经验", window.summary.text())
|
||||
self.assertNotIn("真实", window.data_summary.text())
|
||||
self.assertIn("退出登录并清除登录记录", window.log.toPlainText() + " ".join(b.text() for b in window.tabs.widget(0).findChildren(W.QPushButton)))
|
||||
self.assertEqual([window.inventory_tabs.tabText(i) for i in range(window.inventory_tabs.count())],
|
||||
["魔物蛋", "可使用", "消耗品", "材料", "其他", "装备"])
|
||||
for category in window.inventory_tables:
|
||||
key = next(key for key in window.catalog.data["item_info"] if window.catalog.item_type(key) == category)
|
||||
window.engine.snapshot.raw["items"].append({"id": 4000 + category, "typeId": int(key), "num": 2})
|
||||
self.assertTrue(all(table.rowCount() == 0 for table in window.inventory_tables.values()))
|
||||
window.tabs.setCurrentWidget(window.inventory_tabs)
|
||||
window.inventory_tabs.setCurrentIndex(1)
|
||||
self.wait(window)
|
||||
for _ in range(80):
|
||||
self.app.processEvents()
|
||||
QTest.qWait(2)
|
||||
self.assertGreater(window.inventory.rowCount(), 1)
|
||||
egg = window.engine.snapshot.eggs(window.catalog)[0]
|
||||
egg_row = next(i for i in range(window.inventory.rowCount()) if window.inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == str(egg["typeId"]))
|
||||
self.assertEqual(window.inventory.item(egg_row, 1).text(), window.catalog.monster(egg["typeId"])["name"])
|
||||
for index, (category, inventory) in enumerate(window.inventory_tables.items(), 1):
|
||||
window.inventory_tabs.setCurrentIndex(index)
|
||||
while inventory.row_batch.running:
|
||||
QTest.qWait(2)
|
||||
self.assertGreater(inventory.rowCount(), 0)
|
||||
for row in range(inventory.rowCount()):
|
||||
key = inventory.item(row, 0).data(C.Qt.ItemDataRole.UserRole)
|
||||
self.assertEqual(window.catalog.item_type(key), category)
|
||||
key = str(window.catalog.monster(window.engine.snapshot.monsters[900]["typeId"])["like"].keys().__iter__().__next__())
|
||||
window.engine.snapshot.raw["items"].append({"id": 3000, "typeId": int(key), "num": 3})
|
||||
window.inventory.set_data(window.engine.snapshot, {})
|
||||
for _ in range(100):
|
||||
self.app.processEvents()
|
||||
category = window.catalog.item_type(key)
|
||||
inventory = window.inventory_tables[category]
|
||||
window.inventory_tabs.setCurrentIndex(list(window.inventory_tables).index(category) + 1)
|
||||
while inventory.row_batch.running:
|
||||
QTest.qWait(2)
|
||||
row = next(i for i in range(window.inventory.rowCount()) if window.inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == key)
|
||||
window.inventory.cellWidget(row, 6).setChecked(True)
|
||||
row = next(i for i in range(inventory.rowCount()) if inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == key)
|
||||
inventory.cellWidget(row, 6).setChecked(True)
|
||||
self.assertTrue(window.read_policy().gift_items[key]["enabled"])
|
||||
search = window.inventory_tabs.currentWidget().findChild(W.QLineEdit)
|
||||
search.setText("no-such-inventory-item")
|
||||
while inventory.row_batch.running:
|
||||
QTest.qWait(2)
|
||||
self.assertEqual(inventory.rowCount(), 0)
|
||||
search.clear()
|
||||
while inventory.row_batch.running:
|
||||
QTest.qWait(2)
|
||||
row = next(i for i in range(inventory.rowCount()) if inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == key)
|
||||
self.assertTrue(inventory.cellWidget(row, 6).isChecked())
|
||||
window.tabs.setCurrentWidget(window.room_page)
|
||||
for _ in range(100):
|
||||
self.app.processEvents()
|
||||
|
||||
Reference in New Issue
Block a user