Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codechange: add tests for GS <-> AdminPort JSON conversion #11252

Merged
merged 1 commit into from
Aug 31, 2023

Conversation

TrueBrain
Copy link
Member

Motivation / Problem

In #11251 I want to change our custom JSON conversions to nlohmann. But to know I did a good job, I first need tests.

Description

Of course during the writing of the tests you find small errors. Fixed one in #11250, and in this PR I fix another one: when loading in JSON, booleans were converted to integers. No biggy, as in Squirrel those two are interchangeable for most part.

There is one bug remaining that the tests detected in the current implementation: when loading JSON it fails to load in an empty table. This will be addressed when converting to nlohmann.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

rubidium42
rubidium42 previously approved these changes Aug 31, 2023
Copy link
Contributor

@rubidium42 rubidium42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks okay to me, except maybe an idea for an extra test that could be added.

src/tests/script_admin_json.cpp Outdated Show resolved Hide resolved
While at it, fix a bug where booleans were made integers.
@TrueBrain TrueBrain enabled auto-merge (squash) August 31, 2023 19:00
@TrueBrain TrueBrain merged commit 7afd686 into OpenTTD:master Aug 31, 2023
20 checks passed
@TrueBrain TrueBrain deleted the script-admin-test branch January 18, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants