Rule Builder: Fix count resolution when Oring HasAnyCount (#6048)
Some checks failed
Analyze modified files / flake8 (push) Successful in 2m21s
Analyze modified files / mypy (push) Successful in 1m41s
Build / build-ubuntu2204 (push) Failing after 2m4s
Build and Publish Docker Images / prepare (push) Successful in 20s
Native Code Static Analysis / scan-build (push) Successful in 4m6s
type check / pyright (push) Successful in 42s
unittests / Test Python 3.11.2 ubuntu-latest (push) Successful in 7m53s
unittests / Test Python 3.12 ubuntu-latest (push) Successful in 15m52s
unittests / Test Python 3.13 ubuntu-latest (push) Successful in 17m15s
unittests / Test hosting with 3.13 on ubuntu-latest (push) Successful in 5m3s
Build and Publish Docker Images / build (amd64, amd64, ubuntu-latest, amd64) (push) Failing after 43s
Build / build-win (push) Has been cancelled
Build and Publish Docker Images / build (arm64, arm64, ubuntu-24.04-arm, arm64) (push) Has been cancelled
unittests / Test Python 3.13 macos-latest (push) Has been cancelled
unittests / Test Python 3.11 windows-latest (push) Has been cancelled
unittests / Test Python 3.13 windows-latest (push) Has been cancelled
Build and Publish Docker Images / manifest (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Failing after 14s
CodeQL / Analyze (python) (push) Failing after 2s

This commit is contained in:
Ian Robinson
2026-03-18 13:54:17 -04:00
committed by GitHub
parent 2e5356ad05
commit fb45a2f87e
2 changed files with 9 additions and 1 deletions

View File

@@ -233,6 +233,14 @@ class CachedRuleBuilderTestCase(RuleBuilderTestCase):
Or(Has("A"), HasAny("B", "C"), HasAnyCount({"D": 1, "E": 1})),
HasAny.Resolved(("A", "B", "C", "D", "E"), player=1),
),
(
And(HasAllCounts({"A": 1, "B": 2}), HasAllCounts({"A": 2, "B": 2})),
HasAllCounts.Resolved((("A", 2), ("B", 2)), player=1),
),
(
Or(HasAnyCount({"A": 1, "B": 2}), HasAnyCount({"A": 2, "B": 2})),
HasAnyCount.Resolved((("A", 1), ("B", 2)), player=1),
),
)
)
class TestSimplify(RuleBuilderTestCase):