Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

eliminated xcode format string warnings

  • Loading branch information...
commit 21406df1097cd632612871f726eb876bf85ea680 1 parent 3f03247
@petejkim petejkim authored
Showing with 6 additions and 6 deletions.
  1. +1 −1  src/EXPFloatTuple.m
  2. +5 −5 src/matchers/EXPMatchers+haveCountOf.m
View
2  src/EXPFloatTuple.m
@@ -36,7 +36,7 @@ - (NSString *)description {
} else if (self.size == 4) {
return [NSString stringWithFormat:@"Float tuple: {%f, %f, %f, %f}", self.values[0], self.values[1], self.values[2], self.values[3]];
}
- return [NSString stringWithFormat:@"Float tuple of unexpected size %li, sadly", self.size];
+ return [NSString stringWithFormat:@"Float tuple of unexpected size %zd, sadly", self.size];
}
@end
View
10 src/matchers/EXPMatchers+haveCountOf.m
@@ -3,8 +3,8 @@
EXPMatcherImplementationBegin(haveCountOf, (NSUInteger expected)) {
BOOL actualIsCompatible = [actual isKindOfClass:[NSString class]] ||
[actual isKindOfClass:[NSArray class]] ||
- [actual isKindOfClass:[NSSet class]] ||
- [actual isKindOfClass:[NSDictionary class]];
+ [actual isKindOfClass:[NSSet class]] ||
+ [actual isKindOfClass:[NSDictionary class]];
prerequisite(^BOOL{
return actualIsCompatible;
@@ -13,7 +13,7 @@
NSUInteger (^count)(id) = ^(id actual) {
if([actual isKindOfClass:[NSString class]]) {
return [actual length];
- } else {
+ } else {
return [actual count];
}
};
@@ -27,12 +27,12 @@
failureMessageForTo(^NSString *{
if(!actualIsCompatible) return [NSString stringWithFormat:@"%@ is not an instance of NSString, NSArray, NSSet, or NSDictionary", EXPDescribeObject(actual)];
- return [NSString stringWithFormat:@"expected %@ to have a count of %zi but got %zi", EXPDescribeObject(actual), expected, count(actual)];
+ return [NSString stringWithFormat:@"expected %@ to have a count of %zd but got %zd", EXPDescribeObject(actual), expected, count(actual)];
});
failureMessageForNotTo(^NSString *{
if(!actualIsCompatible) return [NSString stringWithFormat:@"%@ is not an instance of NSString, NSArray, NSSet, or NSDictionary", EXPDescribeObject(actual)];
- return [NSString stringWithFormat:@"expected %@ not to have a count of %zi", EXPDescribeObject(actual), expected];
+ return [NSString stringWithFormat:@"expected %@ not to have a count of %zd", EXPDescribeObject(actual), expected];
});
}
EXPMatcherImplementationEnd
Please sign in to comment.
Something went wrong with that request. Please try again.