Skip to content

Include types with HaveReceived failure messages #327

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

Open
idoru wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Include types with HaveReceived failure messages #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Source/Extensions/NSInvocation+Cedar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ - (NSArray *)arguments {
[self getArgument:argBuffer atIndex:argIndex];

const char *argType = [methodSignature getArgumentTypeAtIndex:argIndex];
[args addObject:[CDRTypeUtilities boxedObjectOfBytes:argBuffer ofObjCType:argType]];
[args addObject:[NSString stringWithFormat:@"%@(%@)",
[CDRTypeUtilities boxedObjectOfBytes:argBuffer ofObjCType:argType],
[CDRTypeUtilities typeNameForEncoding:argType]]];
}
return args;
}
Expand Down
10 changes: 8 additions & 2 deletions Source/Headers/Doubles/HaveReceived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#import "InvocationMatcher.h"
#import "CedarDouble.h"
#import "NSInvocation+Cedar.h"
#import "CDRTypeUtilities.h"

namespace Cedar { namespace Doubles {

Expand Down Expand Up @@ -119,9 +120,14 @@ namespace Cedar { namespace Doubles {
if (this->arguments().size()) {
[message appendString:@", with arguments: <"];
arguments_vector_t::const_iterator cit = this->arguments().begin();
[message appendString:(*cit++)->value_string()];
[message appendString:[NSString stringWithFormat:@"%@(%@)",
(*cit)->value_string(),
[CDRTypeUtilities typeNameForEncoding:(*cit)->value_encoding()]]];
++cit;
for (; cit != this->arguments().end(); ++cit) {
[message appendString:[NSString stringWithFormat:@", %@", (*cit)->value_string()]];
[message appendString:[NSString stringWithFormat:@", %@(%@)",
(*cit)->value_string(),
[CDRTypeUtilities typeNameForEncoding:(*cit)->value_encoding()]]];
}
[message appendString:@">"];
NSArray *recordedInvocations = [(id<CedarDouble>)value sent_messages];
Expand Down
Loading