-
Notifications
You must be signed in to change notification settings - Fork 10.2k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Remove gtest-type-util.h.pump and move pump to googlemock #2388
Conversation
6c21fb6
to
8ad1cb3
Compare
Thank you for your work improving Google test. I appreciate the through commit message describing each change. Could you please divide this into multiple requests so it's easier to review. How'd thoroughly has this been tested? many more millions of tests are written with Google tests that are written against it. do you think this will break people? if so what is the scale of the breakage? |
About splitting: I wouldn't like to do that and it's for your own good. GitHub doesn't detect related changes even if you place a single commit on top of another from another pull request. Example: About tests and compatibility: I didn't write it over night :) It took me several days of planning, coding and double checking. This code is really well tested with current test suite. Also name generators work like they used to, thus the output looks exactly the same. |
8ad1cb3
to
8068979
Compare
88a86a3
to
f9df3e4
Compare
273990769 |
Cool @gennadiycivil. Numbers are big, but the idea is similar (you will spot the pattern). I suggest going commit-wise (each is compilable, self-contained) or / and encourage you to ask me questions. |
@gennadiycivil, I've got a conflict in googletest/scripts/pump.py after the latest commit 37f3227. Would you like me to resolve it? Because you previously wrote:
|
@kuzkry It is better if you re-base and run against your tests. Could you please accept this version of pump into your branch and run your tests. Thank you! googletest/scripts/ and googlemock/scripts/ were the remnants of the past - these were not synched to the internal systems. I had to ensure that these directories are synched in preparation to move the pump.py. I had to assume internal version of pump to be the source of truth. I have found some internal usages of pump accumulated over the years that I am cleaning up before we can accept this PR and move the pump into googlemock. Longer term pump needs to disappear, there is really no need for it now. |
f9df3e4
to
1a49b67
Compare
@gennadiycivil, thanks :) As for the script - again I'm trying to move it only, not to modify it so I fully accepted the one from master. |
Yes, I'm sane XD
I think there's no need to generate (using a pump) most of the code in googletest/include/gtest/internal/gtest-internal.h. Actually, this is the only thing generated in the googletest module, so I've additionally moved the pumping script to the googlemock directory.
What can be said is:
TYPED_TEST_SUITE(FooTest, int);
will internally generateTypeList<int>
. This is why a "plumbing" unit test had to be adjusted. It think it makes it easier to handle, though it's a small trade-off.If something is seriously broken or you didn't understand, please make a comment.
Thanks for reading it and happy reviewing :)