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.

Sign up for GitHub

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

Jump to bottom

Refactor unit tests to use more convenient doctest assertion macros #3393

Merged
merged 26 commits into from
Mar 24, 2022
Merged

Refactor unit tests to use more convenient doctest assertion macros #3393

merged 26 commits into from
Mar 24, 2022

Conversation

kkarbowiak
Copy link
Contributor

This PR refactors unit tests to use more convenient doctest assertion macros, as discussed in issue #3365.

The bulk of the change was done automatically, using a regexp replace, with some manual adjustments.

In the process, I found several unit tests that rely on the side effects of running two assertion macros and got broken by running a single one. Those tests are left untouched, to keep them passing. I think I will try to address those is a separate PR.

@kkarbowiak
Add missing check
8b5abba
@kkarbowiak
Refactor assertions in unit-algorithms.cpp
d9d9aab
@kkarbowiak
Refactor assertions in unit-bson.cpp
f195887
@kkarbowiak
Refactor assertions in unit-cbor.cpp
da6be70
@kkarbowiak
Refactor assertions in unit-class_const_iterator.cpp
b0646df
@kkarbowiak
Refactor assertions in unit-class_iterator.cpp
cd486f6
@kkarbowiak
Refactor assertions in unit-class_parser.cpp
95e29df
@kkarbowiak
Refactor assertions in unit-constructor1.cpp
ffa5d9b
@kkarbowiak
Refactor assertions in unit-convenience.cpp
2b37ebb
@kkarbowiak
Refactor assertions in unit-conversions.cpp
8140466
@kkarbowiak
Refactor assertions in unit-deserialization.cpp
e7470de
@kkarbowiak
Refactor assertions in unit-element_access1.cpp
fc10743
@kkarbowiak
Refactor assertions in unit-element_access2.cpp
b77d802
@kkarbowiak
Refactor assertions in unit-iterators1.cpp
1c523fe
@kkarbowiak
Refactor assertions in unit-iterators2.cpp
ac8d903
@kkarbowiak
Refactor assertions in unit-json_patch.cpp
96783fd
@kkarbowiak
Refactor assertions in unit-json_pointer.cpp
44d242d
@kkarbowiak
Refactor assertions in unit-modifiers.cpp
16e9318
@kkarbowiak
Refactor assertions in unit-msgpack.cpp
3b1bdf4
@kkarbowiak
Refactor assertions in unit-reference_access.cpp
c8b8907
@kkarbowiak
Refactor assertions in unit-regression1.cpp
b9ee1de
@kkarbowiak
Refactor assertions in unit-serialization.cpp
443d446
@kkarbowiak
Refactor assertions in unit-ubjson.cpp
8c91092
@kkarbowiak
Refactor assertions in unit-unicode1.cpp
59e51e8
@kkarbowiak
Apply formatting
4741215
@coveralls
Copy link

coveralls commented Mar 17, 2022 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling bd24f68 on kkarbowiak:develop into ad103e5 on nlohmann:develop.

nlohmann
nlohmann approved these changes Mar 19, 2022
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann added the please rebase Please rebase your branch to origin/develop label Mar 19, 2022
nlohmann
nlohmann requested changes Mar 19, 2022
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

There are still tests failing in the CI. Can you please update from the latest develop branch?

@kkarbowiak
Copy link
Contributor Author

kkarbowiak commented Mar 20, 2022 •
edited
Loading

There are still tests failing in the CI. Can you please update from the latest develop branch?

As far as I can tell, my fork is up to date with regards to the develop branch.

Also, it seems that the only CI builds that did not succeed are the msvc2017 ones. Those got canceled, presumably due to Github deprecating the windows-2016 environment that these builds run on. Please have a look at the bottom of this page. If I'm mistaken though, I'll be happy to do any corrections necessary to make the CI builds pass.

@nlohmann
Copy link
Owner

The latest develop branch runs all CI tests.

@nlohmann nlohmann added release item: 🔨 further change and removed please rebase Please rebase your branch to origin/develop labels Mar 24, 2022
nlohmann
nlohmann approved these changes Mar 24, 2022
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann self-assigned this Mar 24, 2022
@nlohmann nlohmann linked an issue Mar 24, 2022 that may be closed by this pull request
Refactor unit tests to use more convenient doctest assertion macros #3365
Closed
@nlohmann nlohmann added this to the Release 3.10.6 milestone Mar 24, 2022
@nlohmann nlohmann merged commit ce35256 into nlohmann:develop Mar 24, 2022
@nlohmann
Copy link
Owner

Thanks a lot!

@kkarbowiak
Copy link
Contributor Author

Thank you, too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🔨 further change
Projects
None yet
Milestone
Release 3.11.0
Development

Successfully merging this pull request may close these issues.

Refactor unit tests to use more convenient doctest assertion macros
3 participants
@kkarbowiak @coveralls @nlohmann