Migrate base RulesEngineInternal operator unit tests to JSON predicate fixtures by ajpallares · Pull Request #6885 · RevenueCat/purchases-ios

ajpallares · 2026-06-02T12:58:07Z

Checklist

Unit tests
If applicable, create follow-up issues for purchases-android and hybrids

Motivation

Begin migrating the hand-written RulesEngineInternal operator unit tests into declarative JSON predicate fixtures sharing khepri's conformance format, run by one parameterized runner.

Description

Adds fixtures per-operator JSON files, covering existing operators and executed by a shared parameterized Swift Testing runner.
Deletes the migrated arithmetic / comparison / equality / logic unit tests; trims the accessor / evaluator / string-array suites to the cases not expressible as predicate→Bool.
Test-only; the sole production change is one Package.swift exclude.

Made with Cursor

Note

Low Risk
Test-only refactor with no RulesEngineInternal production logic changes; risk is limited to CI coverage gaps if fixtures fail to load or the exclude path is wrong.

Overview
Replaces most hand-written RulesEngineInternal operator XCTest coverage with declarative JSON predicate fixtures (khepri-style conformance) driven by a shared Swift Testing suite (PredicateFixtureTests + PredicateConformanceRunner). Per-operator cases live under PredicateFixtures/*.json (244 cases, with a pinned count guard); helpers add fixture loading, Value decoding for tests, and optional warning/error expectations.

Removed dedicated ArithmeticOperatorsTests, ComparisonOperatorsTests, EqualityOperatorsTests, and LogicOperatorsTests, and heavily trimmed accessor, evaluator, and string/array suites to scenarios that fixtures cannot express (e.g. array top-level var scope, malformed JSON parse errors, non-recursive merge structure).

Build: Package.swift excludes PredicateFixtures from the SPM test target so JSON is read from the repo at runtime; Xcode project wires in the new helper sources.

^{Reviewed by Cursor Bugbot for commit 7ae5c2c. Bugbot is set up for automated code reviews on this repo. Configure here.}

…tures Convert the hand-written operator unit tests for operators available at the string+array level into declarative JSON predicate fixtures sharing khepri's conformance format, run by a shared runner that auto-discovers every file in PredicateFixtures/. `expected` is a khepri-compatible superset (Bool or { "error": ... }) plus optional `description` and `expectedWarnings`. Adds a test-only Value: Decodable conformance so predicates and variables decode straight into the engine's value model; production Value is unchanged. Tests that can't be expressed as predicate->Bool stay in Swift; ValueTests untouched. Test-only change. Co-authored-by: Cursor <cursoragent@cursor.com> (cherry picked from commit 40901e5)

ajpallares · 2026-06-02T15:09:23Z

+    let id: String
+    let description: String?
+    let predicate: Value
+    let variables: [String: Value]
+    let expected: ExpectedOutcome
+    let expectedWarnings: ExpectedWarnings?


expected is a khepri-compatible superset (Bool or { "error": ... }) plus optional description / expectedWarnings (see #6822)

Load the in-repo fixtures once and feed the decoded cases straight into the parameterized test, instead of collecting IDs and re-reading every file to find the matching case per ID. PredicateConformanceFixtureCase gains Identifiable + Sendable (for the arguments) and a CustomTestStringConvertible extension so each case still displays by id. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

Asserting an exact warning count coupled the fixtures to engine internals. Match warnings by substring only (count-agnostic); an empty `contains` now asserts that no warning is emitted, preserving the "does not warn" cases. The three count-only fixtures gain the "missing variable" substring they actually emit. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

Drop the khepri single-file plumbing (defaultFixtureURL, fixtureURL, the no-arg loadCases(), the env var, and the unused fixtureNotFound error). This PR only runs the in-repo PredicateFixtures/ directory; the khepri conformance loader lands with its test in the conformance PR. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

tonidero

I didn't check every test... But I love how easy it is now to add/modify the tests :)

I wonder if it would be worth adding a test count test as well, to make sure we don't stop running some tests... But TBH, we don't do that for other tests, so I would say not needed.

So yeah, looking amazing, thank you!

tonidero · 2026-06-05T11:00:01Z

+        let fixtures: [PredicateConformanceFixtureCase]
+    }
+
+    static func inRepoFixturesDirectoryURL() -> URL {


Hmm supernitpick but maybe could be renamed to repoFixturesDirectoryURL?

Oh sure! Done in 4752b3d

Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # RevenueCat.xcodeproj/project.pbxproj

ajpallares · 2026-06-05T11:50:55Z

I wonder if it would be worth adding a test count test as well, to make sure we don't stop running some tests... But TBH, we don't do that for other tests, so I would say not needed.

That's a great idea @tonidero! Did so in 4752b3d. We can always remove it if it gets too noisy or if it becomes a bother. But I think it's a good strategy to avoid false positives 👌

Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # RevenueCat.xcodeproj/project.pbxproj

Expresses the "empty-string key resolves to the whole scope and is not missing" case as a `{"!!":{"missing":[""]}}` -> false fixture; the string coercion the other missing fixtures use can't distinguish [] from [""]. Bumps the pinned fixture count to 237. Keeps the corpus in sync with the purchases-android counterpart. Co-authored-by: Cursor <cursoragent@cursor.com>

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 0ada6d1. Configure here.}

Adds fixtures for the empty-segment dot-path splits, var default-vs-null-leaf behavior, and the non-numeric missing_some threshold (7 new cases), bumping the pinned count to 244. Also adds the var-null-path Swift test so the non-fixturizable cases match the purchases-android counterpart. Keeps the fixture corpus byte-identical across both repos. Co-authored-by: Cursor <cursoragent@cursor.com>

ajpallares added the pr:other label Jun 2, 2026

This was referenced Jun 2, 2026

Add JSON Logic iteration operators (some, all) #6817

Merged

Add khepri predicate conformance tests for RulesEngineInternal #6822

Draft

Merge branch 'main' into pallares/rules-engine-json-fixtures

ddd6937

ajpallares commented Jun 2, 2026

View reviewed changes

ajpallares and others added 6 commits June 2, 2026 17:16

Assert on the shared static fixtures in the load test

716481a

Co-authored-by: Cursor <cursoragent@cursor.com>

Trim ExpectedWarnings.contains doc comment

0803c94

Co-authored-by: Cursor <cursoragent@cursor.com>

Drop unreachable parse error branch from conformance runner

77d8e6c

Co-authored-by: Cursor <cursoragent@cursor.com>

ajpallares added a commit that referenced this pull request Jun 3, 2026

Merge #6885 (drop parse branch) into #6817

b1f8aa5

Merge branch 'main' into pallares/rules-engine-json-fixtures

7301998

ajpallares marked this pull request as ready for review June 5, 2026 09:23

ajpallares requested a review from a team as a code owner June 5, 2026 09:23

tonidero approved these changes Jun 5, 2026

View reviewed changes

Rename fixture dir helper and pin fixture count

4752b3d

Co-authored-by: Cursor <cursoragent@cursor.com>

ajpallares added a commit that referenced this pull request Jun 5, 2026

Merge #6885 (rename + fixture count) into #6817

60b283f

cursor Bot reviewed Jun 5, 2026

View reviewed changes

Comment thread Tests/RulesEngineInternalTests/PredicateFixtureTests.swift

Merge branch 'main' into pallares/rules-engine-json-fixtures

62d7d80

Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # RevenueCat.xcodeproj/project.pbxproj

ajpallares added a commit that referenced this pull request Jun 5, 2026

Merge #6885 (main) into #6817

ad87b94

Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # RevenueCat.xcodeproj/project.pbxproj

ajpallares mentioned this pull request Jun 5, 2026

Migrate base RulesEngineInternal operator unit tests to JSON predicate fixtures RevenueCat/purchases-android#3545

Merged

cursor Bot reviewed Jun 5, 2026

View reviewed changes

Comment thread Tests/RulesEngineInternalTests/Helpers/PredicateConformanceRunner.swift

ajpallares and others added 2 commits June 5, 2026 17:44

Merge branch 'main' into pallares/rules-engine-json-fixtures

7ae5c2c

ajpallares merged commit d223202 into main Jun 8, 2026
18 of 20 checks passed

ajpallares deleted the pallares/rules-engine-json-fixtures branch June 8, 2026 08:15

RCGitBot mentioned this pull request Jun 8, 2026

[AUTOMATIC] Release/5.78.0 #6954

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Migrate base RulesEngineInternal operator unit tests to JSON predicate fixtures#6885

Migrate base RulesEngineInternal operator unit tests to JSON predicate fixtures#6885
ajpallares merged 14 commits into
mainfrom
pallares/rules-engine-json-fixtures

ajpallares commented Jun 2, 2026 •

edited by cursor Bot

Loading

Uh oh!

ajpallares Jun 2, 2026

Uh oh!

tonidero left a comment

Uh oh!

tonidero Jun 5, 2026

Uh oh!

ajpallares Jun 5, 2026

Uh oh!

Uh oh!

ajpallares commented Jun 5, 2026

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

ajpallares commented Jun 2, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Motivation

Description

Uh oh!

ajpallares Jun 2, 2026

Choose a reason for hiding this comment

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

tonidero Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

ajpallares Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ajpallares commented Jun 5, 2026

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ajpallares commented Jun 2, 2026 •

edited by cursor Bot

Loading