Unify strategy controls and refresh logged-in accounts automatically
This commit is contained in:
@@ -142,7 +142,7 @@ class RemovalTests(unittest.TestCase):
|
||||
self.remove(hub, "default")
|
||||
self.assertIn("default", hub.windows)
|
||||
self.assertIn("default", hub.pending_removals)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(window.monitoring)
|
||||
release.set()
|
||||
self.wait(lambda: not hub.windows and not hub.pending_removals)
|
||||
|
||||
@@ -147,7 +147,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
saved = json.loads((selected.state / "settings.json").read_text(encoding="utf-8"))
|
||||
self.assertEqual(saved["policy"]["keep_money"], expected)
|
||||
self.assertEqual(selected.engine.policy.keep_money, expected)
|
||||
self.assertFalse(selected.execute.isChecked())
|
||||
self.assertFalse(selected.strategy_toggle.isChecked())
|
||||
finally:
|
||||
hub.close()
|
||||
|
||||
@@ -160,7 +160,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
try:
|
||||
self.wait(windows)
|
||||
self.assertEqual([action.text().split("(")[0] for action in hub.menuBar().actions()],
|
||||
["账号", "监控", "策略配置", "帮助"])
|
||||
["账号", "策略", "策略配置", "帮助"])
|
||||
for window in windows:
|
||||
self.assertIsNone(window.findChild(W.QMenuBar))
|
||||
labels = {button.text() for button in hub.findChildren(W.QPushButton)}
|
||||
@@ -250,7 +250,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
window.resume_session()
|
||||
self.wait([window])
|
||||
self.assertEqual(window.session_store.load(key).reqid, 1)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertTrue(window.engine.demo)
|
||||
finally:
|
||||
window.close()
|
||||
@@ -277,10 +277,10 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.assertFalse(first.monsters.group_items)
|
||||
self.assertTrue(all(item.parent() is None for item in first.monsters.monster_items.values()))
|
||||
self.assertEqual(first.saved_sessions.count(), 1)
|
||||
first.start_monitor.setChecked(True)
|
||||
first.monitoring = True
|
||||
hub.tabs.setCurrentWidget(second)
|
||||
self.assertTrue(first.monitoring)
|
||||
hub.monitor_all()
|
||||
self.assertTrue(all(window.monitoring for window in windows))
|
||||
for window in windows:
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.next_poll = 0
|
||||
@@ -291,7 +291,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.assertEqual(second.engine.client.session.token, "test-token-account-b")
|
||||
self.assertEqual(first.engine.snapshot.raw["master"]["id"], 101)
|
||||
self.assertEqual(second.engine.snapshot.raw["master"]["id"], 202)
|
||||
first.execute.setChecked(True)
|
||||
first.set_strategy_checked(True)
|
||||
before = len(calls)
|
||||
hub.tabs.setCurrentWidget(first)
|
||||
first.tabs.setCurrentWidget(first.egg_page)
|
||||
@@ -324,10 +324,90 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.wait(restarted)
|
||||
self.assertEqual({window.engine.snapshot.raw["master"]["id"] for window in restarted}, {101, 202},
|
||||
"\n".join(window.log.toPlainText() for window in restarted))
|
||||
self.assertTrue(all(not window.engine.demo and not window.execute.isChecked() and not window.monitoring for window in restarted))
|
||||
self.assertTrue(all(not window.engine.demo and not window.strategy_toggle.isChecked() and window.monitoring for window in restarted))
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
def test_login_refreshes_automatically_and_strategy_menu_only_controls_execution(self):
|
||||
with workspace_temp() as folder:
|
||||
hub = AccountsWindow(folder)
|
||||
hub.add_profile()
|
||||
windows = list(hub.windows.values())
|
||||
calls = []
|
||||
for window in windows:
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(windows)
|
||||
for number, window in enumerate(windows, 1):
|
||||
self.connect(window, f"account-{number}", number, number, calls)
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.schedule()
|
||||
self.wait(windows)
|
||||
self.assertTrue(calls)
|
||||
self.assertTrue(all(url.endswith("masterService/masterQueryDetail") for _, url, _ in calls))
|
||||
for window in windows:
|
||||
window.ranch_enabled.setChecked(False)
|
||||
window.daily_enabled.setChecked(True)
|
||||
# Exercise real Qt menu actions with synthetic worker results.
|
||||
observed = []
|
||||
from contextlib import ExitStack
|
||||
with ExitStack() as stack:
|
||||
for window in windows:
|
||||
def poll(current=window, **kwargs):
|
||||
observed.append((current, current.engine.auto))
|
||||
return current.engine.snapshot, [], "synthetic refresh"
|
||||
stack.enter_context(patch.object(window.engine, "poll", side_effect=poll))
|
||||
menu = next(action.menu() for action in hub.menuBar().actions() if action.text() == "策略(&R)")
|
||||
menu.actions()[0].trigger()
|
||||
self.wait(windows)
|
||||
self.assertEqual(len(observed), 2)
|
||||
self.assertTrue(all(enabled for _, enabled in observed))
|
||||
self.assertTrue(all(w.strategy_toggle.text() == "关闭策略" for w in windows))
|
||||
# A manual refresh never executes, even with strategies on.
|
||||
windows[0].refresh()
|
||||
self.wait(windows)
|
||||
self.assertFalse(observed[-1][1])
|
||||
menu.actions()[1].trigger()
|
||||
self.assertTrue(all(w.monitoring and not w.strategy_toggle.isChecked() for w in windows))
|
||||
observed.clear()
|
||||
for window in windows:
|
||||
window.next_poll = 0
|
||||
window.schedule()
|
||||
self.wait(windows)
|
||||
self.assertEqual(len(observed), 2)
|
||||
self.assertFalse(any(enabled for _, enabled in observed))
|
||||
windows[0].demo()
|
||||
self.wait(windows)
|
||||
self.assertFalse(windows[0].monitoring)
|
||||
self.assertTrue(windows[1].monitoring)
|
||||
finally:
|
||||
hub.close()
|
||||
|
||||
def test_incomplete_policy_keeps_logged_in_account_refreshing_without_actions(self):
|
||||
with workspace_temp() as folder:
|
||||
window = gui.Window(folder)
|
||||
window.timer.stop()
|
||||
calls = []
|
||||
try:
|
||||
self.wait([window])
|
||||
self.connect(window, "account-a", 1, 101, calls)
|
||||
window.reserved_types.setText("incomplete-input")
|
||||
window.strategy_toggle.click()
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertTrue(window.monitoring)
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.next_poll = 0
|
||||
window.schedule()
|
||||
self.wait([window])
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertFalse(window.engine.auto)
|
||||
self.assertTrue(calls)
|
||||
self.assertTrue(all(url.endswith("masterService/masterQueryDetail") for _, url, _ in calls))
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
def test_role_switch_restores_own_strategy_and_heartbeat_uses_normal_api(self):
|
||||
with workspace_temp() as folder:
|
||||
window = gui.Window(folder)
|
||||
@@ -346,6 +426,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.assertEqual(window.strategy.currentData(), "gold")
|
||||
self.assertEqual(window.saved_sessions.count(), 2)
|
||||
window.engine.last_heartbeat = 0
|
||||
window.next_poll = float("inf")
|
||||
window.schedule()
|
||||
self.wait([window])
|
||||
self.assertTrue(calls[-1][1].endswith("heartBeatService/keepAlive"))
|
||||
|
||||
@@ -314,7 +314,7 @@ class ActivityGuiTests(unittest.TestCase):
|
||||
if not restored.busy:
|
||||
break
|
||||
self.assertEqual(restored.map_rules["0101"]["limit"], 12)
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
self.assertFalse(restored.monitoring)
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
@@ -314,7 +314,7 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
return
|
||||
self.fail("Qt task did not finish")
|
||||
|
||||
def test_workflow_start_monitor_stop_and_settings_restore(self):
|
||||
def test_strategy_toggle_off_keeps_refreshing_and_settings_restore_with_strategy_off(self):
|
||||
with workspace_temp() as folder:
|
||||
window = gui.Window(folder)
|
||||
window.timer.stop()
|
||||
@@ -327,17 +327,24 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
window.fill.setChecked(False)
|
||||
window.buy_eggs.setChecked(False)
|
||||
before = len(window.engine.snapshot.raw["monsters"])
|
||||
window.monitor_only()
|
||||
window.refresh()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before)
|
||||
self.assertIn("仅监控", window.workflow_status.text())
|
||||
window.workflow_start.click()
|
||||
self.assertIn("策略已关闭", window.workflow_status.text())
|
||||
window.strategy_toggle.click()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before - 1)
|
||||
self.assertIn("执行中", window.workflow_status.text())
|
||||
window.workflow_stop.click()
|
||||
self.assertIn("策略已开启", window.workflow_status.text())
|
||||
window.strategy_toggle.click()
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertFalse(window.engine.auto)
|
||||
self.assertEqual(window.strategy_toggle.text(), "开启策略")
|
||||
remaining = len(window.engine.snapshot.raw["monsters"])
|
||||
window.next_poll = 0
|
||||
window.schedule()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), remaining)
|
||||
self.assertFalse(window.engine.auto)
|
||||
window.buy_eggs.setChecked(True)
|
||||
window.market.setCurrentIndex(window.market.findData("sc_city2"))
|
||||
window.daily_buy_money.setValue(700)
|
||||
@@ -355,7 +362,7 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
self.assertTrue(restored.buy_eggs.isChecked())
|
||||
self.assertEqual(restored.market.currentData(), "sc_city2")
|
||||
self.assertEqual(restored.daily_buy_money.value(), 700)
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
self.assertFalse(restored.yield_stars[5].isChecked())
|
||||
self.assertEqual(restored.hatch_max_star.currentData(), 3)
|
||||
finally:
|
||||
@@ -413,8 +420,8 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(window)
|
||||
window.execute.setChecked(True)
|
||||
window.start_monitor.setChecked(True)
|
||||
window.set_strategy_checked(True)
|
||||
window.monitoring = True
|
||||
before = len(window.engine.snapshot.raw["monsters"])
|
||||
def select(mid):
|
||||
window.tabs.setCurrentWidget(window.monster_page)
|
||||
@@ -425,7 +432,7 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
window.lock_monsters.click()
|
||||
self.wait(window)
|
||||
self.assertEqual(window.engine.snapshot.monsters[101]["lock"], 1)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before)
|
||||
select(101)
|
||||
with patch("PySide6.QtWidgets.QMenu.popup"):
|
||||
|
||||
@@ -168,7 +168,7 @@ class CultivationGuiTests(unittest.TestCase):
|
||||
window.engine.plans()
|
||||
window.tabs.setCurrentWidget(window.gift_page)
|
||||
self.assertGreater(window.gift_representatives.rowCount(), 0)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
window.load_config()
|
||||
self.assertTrue(window.keep_better_quality.isChecked())
|
||||
self.assertTrue(window.gift_auto_representative.isChecked())
|
||||
|
||||
@@ -214,7 +214,7 @@ class GrowthGuiTests(unittest.TestCase):
|
||||
self.assertEqual(window.slots.item(row, 7).text(), "S/S/S/S")
|
||||
self.assertIn("资质", window.slots.item(row, 8).text())
|
||||
self.assertIn("S/S/S/S", window.monsters.monster_items[501].text(4))
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(any(name == "monsterService/monsterSell" for name, _ in client.calls))
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -5,7 +5,7 @@ import json
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
from PySide6.QtTest import QTest
|
||||
from PySide6.QtWidgets import QApplication
|
||||
from PySide6.QtWidgets import QApplication, QPushButton, QCheckBox
|
||||
from ranch_assistant import gui
|
||||
from ranch_assistant.tests.test_core import workspace_temp
|
||||
|
||||
@@ -38,17 +38,23 @@ class GuiTests(unittest.TestCase):
|
||||
self.assertLess(labels.index("自动孵蛋"), labels.index("自动扫荡"))
|
||||
self.assertEqual(window.yields.rowCount(), 749)
|
||||
self.assertEqual(window.styleSheet(), "")
|
||||
buttons = {button.text() for button in window.findChildren(QPushButton)}
|
||||
self.assertIn("开启策略", buttons)
|
||||
for removed in ("开始监控", "停止监控", "仅监控", "开始执行勾选功能", "停止执行",
|
||||
"开始执行勾选策略", "开始扫荡", "停止扫荡", "开始每日事务", "停止每日事务"):
|
||||
self.assertNotIn(removed, buttons)
|
||||
self.assertNotIn("自动执行已启用策略", {check.text() for check in window.findChildren(QCheckBox)})
|
||||
window.strategy.setCurrentIndex(window.strategy.findData("gold"))
|
||||
window.egg_rules = {str(m["typeId"]): {"enabled": True, "action": "sell"} for m in window.engine.snapshot.raw["monsters"][:2]}
|
||||
window.protect_star.setValue(6)
|
||||
window.protect_quality.setCurrentIndex(window.protect_quality.findData(5))
|
||||
window.fill.setChecked(False)
|
||||
window.execute.setChecked(True)
|
||||
window.set_strategy_checked(True)
|
||||
before = len(window.engine.snapshot.raw["monsters"])
|
||||
window.refresh()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before)
|
||||
window.start_monitor.setChecked(True)
|
||||
window.monitoring = True
|
||||
window.refresh(automated=True)
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before - 1)
|
||||
|
||||
@@ -127,8 +127,8 @@ class HatchTimerGuiTests(unittest.TestCase):
|
||||
window.engine = Engine(window.catalog, client)
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.egg_rules = policy_for(client).egg_rules
|
||||
window.start_monitor.setChecked(True)
|
||||
window.execute.setChecked(True)
|
||||
window.monitoring = True
|
||||
window.set_strategy_checked(True)
|
||||
with patch.object(window, "poll_delay", return_value=300), patch("ranch_assistant.gui.random.uniform", return_value=1.5) as draw:
|
||||
window.refresh(automated=True)
|
||||
self.wait(window)
|
||||
|
||||
@@ -155,8 +155,8 @@ class MasterSyncGuiTests(unittest.TestCase):
|
||||
self.assertEqual(window.engine.snapshot.raw["master"]["ti"], 6)
|
||||
self.assertEqual(client.calls, [(STAMINA, {})])
|
||||
self.assertEqual(window.next_poll, float("inf"))
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.monitoring)
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertTrue(window.monitoring)
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ class MonitoringGuiTests(unittest.TestCase):
|
||||
self.wait(restored)
|
||||
self.assertEqual(restored.interval.currentData(), 300)
|
||||
self.assertEqual(restored.read_policy().protect_quality, 6)
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
@@ -121,11 +121,12 @@ class MonitoringGuiTests(unittest.TestCase):
|
||||
self.assertFalse(window.monitoring)
|
||||
window.schedule()
|
||||
self.wait(window)
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertEqual(sum(name == "growth" for name, _ in client.calls), 1)
|
||||
self.assertEqual(window.engine.snapshot.monsters[501]["mode"], 2)
|
||||
self.assertEqual(window.catalog.quality_text(window.engine.snapshot.monsters[501]), "S/S/S/S")
|
||||
self.assertFalse(any(name == "monsterService/monsterSell" for name, _ in client.calls))
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(any("同步孵化" in button.text() for button in window.slot_page.findChildren(W.QPushButton)))
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -89,7 +89,7 @@ class StrategyGuiTests(unittest.TestCase):
|
||||
path.write_text(json.dumps(value), encoding="utf-8")
|
||||
with patch("ranch_assistant.gui.W.QFileDialog.getOpenFileName", return_value=(str(path), "")):
|
||||
window.import_policies()
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(window.engine.auto)
|
||||
self.assertTrue(window.engine.policy.gift_enabled)
|
||||
self.assertEqual(window.engine.quest_policy.max_money, 100)
|
||||
@@ -119,6 +119,6 @@ class StrategyGuiTests(unittest.TestCase):
|
||||
window.gift_enabled.setChecked(True)
|
||||
with patch.object(window, "refresh"):
|
||||
window.start_workflow()
|
||||
self.assertTrue(window.execute.isChecked())
|
||||
self.assertTrue(window.strategy_toggle.isChecked())
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -159,7 +159,7 @@ class RuleEditingTests(unittest.TestCase):
|
||||
self.assertEqual(saved["sweep_policy"]["keep_stamina"], 23)
|
||||
self.assertEqual(window.engine.policy.keep_money, 4321)
|
||||
self.assertFalse(window.monitoring)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
window.reserve_eggs.setText("1001010:")
|
||||
self.wait(lambda: not window.auto_save_timer.isActive())
|
||||
self.assertEqual(json.loads((folder / "settings.json").read_text(encoding="utf-8")), saved)
|
||||
|
||||
@@ -209,7 +209,7 @@ class ManualGuiTests(unittest.TestCase):
|
||||
self.assertTrue(restored.egg_rules[key]["enabled"])
|
||||
self.assertEqual(restored.egg_rules[key]["action"], "feed")
|
||||
self.assertEqual(restored.feed_targets, {"900": 1})
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
|
||||
@@ -206,7 +206,7 @@ class V11GuiTests(unittest.TestCase):
|
||||
path.write_text(json.dumps(portable_policy(policy, window.engine.snapshot)), encoding="utf-8")
|
||||
with patch("ranch_assistant.gui.W.QFileDialog.getOpenFileName", return_value=(str(path), "")):
|
||||
window.import_policies()
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(window.read_policy().gift_enabled)
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
Reference in New Issue
Block a user