Add xcgmock #2595
Add xcgmock #2595
Conversation
wilhuff
force-pushed
the
wilhuff/xcgmock
branch
from
25b0a72 to
773f050
Compare
|
|
||
| #define XC_ASSERT_THAT(actual, matcher) \ | ||
| do { \ | ||
| using actual_type = \ |
There was a problem hiding this comment.
Hmm, this alias appears unused?
There was a problem hiding this comment.
Oops! Yes. This was used previously when I was casting the matchers by hand before I figured out that I could use PredicateFormatterFromMatcher.
I'm still somewhat uncomfortable about using testing::internal here, but I think it's worth accepting that we might be broken on the next upgrade to keep this simple.
| inline void ObjcPrintTo(id value, std::ostream* os) { | ||
| // Force the result type to NSString* or we can't resolve MakeString. | ||
| NSString* description = [value description]; | ||
| *os << util::MakeString(description); |
There was a problem hiding this comment.
I'm not 100% sure util::ToString (from to_string.h) works with id parameters, but if it does, perhaps use it here?
*os << util::ToString(value);There was a problem hiding this comment.
Great idea. It would allow me to get rid of ObjcPrintTo too.
Unfortunately, util::ToString does not work on types that are only forward declarations, as are most of the types below. This version works because the type is cast to id and thus relies on fully dynamic dispatch.
| TEST(XcGmockTest, FoundationPrints) { | ||
| EXPECT_EQ("value", testing::PrintToString(@"value")); | ||
|
|
||
| std::string expected = util::MakeString([@[ @"value" ] description]); |
There was a problem hiding this comment.
Very optional: I think this could be
std::string expected = util::ToString(@[@"value"]);
|
Note: I don't think XCTAssertEqual(accum, std::vector<ViewSnapshot>(viewSnapshot1));works -- at least, I have never been able to get it to work, because something in the macro checks that the types involved are primitives. I had to do XCTAssertTrue(accum == std::vector<ViewSnapshot>(viewSnapshot1));which is even worse, because it doesn't give a good message on failure. |
Right, it actually takes another set of parens to force the C preprocessor to be able to understand that it's actually a single argument. XCTAssertEqual(accum, (std::vector<ViewSnapshot>(viewSnapshot1)));I've updated the description, but this way's better anyway. |
| @@ -100,6 +100,7 @@ class ABSL_MUST_USE_RESULT Status { | |||
| /// \brief Return a string representation of this status suitable for | |||
| /// printing. Returns the string `"OK"` for success. | |||
| std::string ToString() const; | |||
| friend std::ostream& operator<<(std::ostream& out, const Status& status); | |||
There was a problem hiding this comment.
The definition doesn't actually use any private fields. I think you can just drop this friend declaration.
There was a problem hiding this comment.
My goal is to declare these near the ToString() to make it obvious which classes support this usage and which don't yet. I want to make this boilerplate something you can mostly copypasta into the next class.
In addition to giving access to internals friend declares a free function but inside the body of the class. There's no equivalent way to declare this operator without moving it outside the class, which is annoying.
| @@ -177,6 +178,7 @@ class ViewSnapshot { | |||
| } | |||
|
|
|||
| std::string ToString() const; | |||
| friend std::ostream& operator<<(std::ostream& out, const ViewSnapshot& value); | |||
There was a problem hiding this comment.
I think you can drop the friend declaration.
There was a problem hiding this comment.
Dropping friend also means moving the declaration out of the class, which is annoying.
| @@ -148,6 +149,8 @@ class Timestamp { | |||
| * don't rely on the format of the string. | |||
| */ | |||
| std::string ToString() const; | |||
| friend std::ostream& operator<<(std::ostream& out, | |||
* Add operator<< to a few types * Add xcgmock * Use gmock matchers in XCTest * Add gmock to integration test header search paths
This defines a means of using gmock matchers in XCTest tests.
This makes it easy to fix tests currently depending on e.g.
NSArrayvalues andXCTAssertEqualObjectsto instead use something else. It's better to fix the test toXC_ASSERT_THAT(accum, ElementsAre(viewSnapshot1));Instead of:
... or the even worse: