diff options
| author |  vjpai <vpai@google.com> | 2015-05-28 10:09:32 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-05-28 10:09:32 -0700 |
| commit | 675140ca1d394f564f2156add8a1a18a2dc132b7 (patch) | |
| tree | 78fd267e9b416c1ef00514052b54b93ecdbdb4d1 /src/objective-c/examples/Sample/SampleTests/SampleTests.m | |
| parent | efad2ae67478ca70c064683af42c7f4bcfca5908 (diff) | |
| parent | 5e9757bf0f8ada75068038c3e29d8b1e875d2ce3 (diff) | |
Merge branch 'master' into poisson
Conflicts:
Makefile
test/cpp/qps/client_async.cc
test/cpp/qps/qpstest.proto
Diffstat (limited to 'src/objective-c/examples/Sample/SampleTests/SampleTests.m')
| -rw-r--r-- | src/objective-c/examples/Sample/SampleTests/SampleTests.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/objective-c/examples/Sample/SampleTests/SampleTests.m b/src/objective-c/examples/Sample/SampleTests/SampleTests.m index b1a0f78a01..83cfd8c1b5 100644 --- a/src/objective-c/examples/Sample/SampleTests/SampleTests.m +++ b/src/objective-c/examples/Sample/SampleTests/SampleTests.m @@ -123,7 +123,7 @@ id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) { XCTAssertNotNil(value, @"nil value received as response."); - RGDFeature *feature = [RGDFeature parseFromData:value]; + RGDFeature *feature = [RGDFeature parseFromData:value error:NULL]; XCTAssertEqualObjects(point, feature.location); XCTAssertNotNil(feature.name, @"Response's name is nil."); [response fulfill]; |