Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: third_party/protobuf/objectivec/Tests/GPBUtilitiesTests.m

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/objectivec/Tests/GPBUtilitiesTests.m
diff --git a/third_party/protobuf/objectivec/Tests/GPBUtilitiesTests.m b/third_party/protobuf/objectivec/Tests/GPBUtilitiesTests.m
deleted file mode 100644
index ba1fc270e6ffdec240976b454c1963454c0e7d8a..0000000000000000000000000000000000000000
--- a/third_party/protobuf/objectivec/Tests/GPBUtilitiesTests.m
+++ /dev/null
@@ -1,173 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <XCTest/XCTest.h>
-
-#import "GPBUtilities_PackagePrivate.h"
-
-#import <objc/runtime.h>
-
-#import "GPBTestUtilities.h"
-
-#import "GPBDescriptor.h"
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBMessage.h"
-
-#import "google/protobuf/MapUnittest.pbobjc.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-
-@interface UtilitiesTests : GPBTestCase
-@end
-
-@implementation UtilitiesTests
-
-- (void)testRightShiftFunctions {
- XCTAssertEqual((1UL << 31) >> 31, 1UL);
- XCTAssertEqual((1 << 31) >> 31, -1);
- XCTAssertEqual((1ULL << 63) >> 63, 1ULL);
- XCTAssertEqual((1LL << 63) >> 63, -1LL);
-
- XCTAssertEqual(GPBLogicalRightShift32((1 << 31), 31), 1);
- XCTAssertEqual(GPBLogicalRightShift64((1LL << 63), 63), 1LL);
-}
-
-- (void)testGPBDecodeTextFormatName {
- uint8_t decodeData[] = {
- 0x6,
- // An inlined string (first to make sure the leading null is handled
- // correctly, and with a key of zero to check that).
- 0x0, 0x0, 'z', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'I', 'J', 0x0,
- // All as is (00 op)
- 0x1, 0x0A, 0x0,
- // Underscore, upper + 9 (10 op)
- 0x3, 0xCA, 0x0,
- // Upper + 3 (10 op), underscore, upper + 5 (10 op)
- 0x2, 0x44, 0xC6, 0x0,
- // All Upper for 4 (11 op), underscore, underscore, upper + 5 (10 op),
- // underscore, lower + 0 (01 op)
- 0x4, 0x64, 0x80, 0xC5, 0xA1, 0x0,
- // 2 byte key: as is + 3 (00 op), underscore, lower + 4 (01 op),
- // underscore, lower + 3 (01 op), underscore, lower + 1 (01 op),
- // underscore, lower + 30 (01 op), as is + 30 (00 op), as is + 13 (00 op),
- // underscore, as is + 3 (00 op)
- 0xE8, 0x07, 0x04, 0xA5, 0xA4, 0xA2, 0xBF, 0x1F, 0x0E, 0x84, 0x0,
- };
- NSString *inputStr = @"abcdefghIJ";
-
- // Empty inputs
-
- XCTAssertNil(GPBDecodeTextFormatName(nil, 1, NULL));
- XCTAssertNil(GPBDecodeTextFormatName(decodeData, 1, NULL));
- XCTAssertNil(GPBDecodeTextFormatName(nil, 1, inputStr));
-
- // Keys not found.
-
- XCTAssertNil(GPBDecodeTextFormatName(decodeData, 5, inputStr));
- XCTAssertNil(GPBDecodeTextFormatName(decodeData, -1, inputStr));
-
- // Some name decodes.
-
- XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 1, inputStr), @"abcdefghIJ");
- XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 2, inputStr), @"Abcd_EfghIJ");
- XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 3, inputStr), @"_AbcdefghIJ");
- XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 4, inputStr), @"ABCD__EfghI_j");
-
- // An inlined string (and key of zero).
- XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 0, inputStr), @"zbcdefghIJ");
-
- // Long name so multiple decode ops are needed.
- inputStr = @"longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1000";
- XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 1000, inputStr),
- @"long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1000");
-}
-
-- (void)testTextFormat {
- TestAllTypes *message = [TestAllTypes message];
-
- // Not kGPBDefaultRepeatCount because we are comparing to golden master file
- // which was generated with 2.
- [self setAllFields:message repeatedCount:2];
-
- NSString *result = GPBTextFormatForMessage(message, nil);
-
- NSString *fileName = @"text_format_unittest_data.txt";
- NSData *resultData = [result dataUsingEncoding:NSUTF8StringEncoding];
- NSData *expectedData =
- [self getDataFileNamed:fileName dataToWrite:resultData];
- NSString *expected = [[NSString alloc] initWithData:expectedData
- encoding:NSUTF8StringEncoding];
- XCTAssertEqualObjects(expected, result);
- [expected release];
-}
-
-- (void)testTextFormatExtra {
- // -testTextFormat uses all protos with fields that don't require special
- // handing for figuring out the names. The ObjC proto has a bunch of oddball
- // field and enum names that require the decode info to get right, so this
- // confirms they generated and decoded correctly.
-
- self_Class *message = [self_Class message];
- message.cmd = YES;
- message.isProxy_p = YES;
- message.subEnum = self_autorelease_RetainCount;
- message.new_p.copy_p = @"foo";
-
- NSString *expected = @"_cmd: true\n"
- @"isProxy: true\n"
- @"SubEnum: retainCount\n"
- @"New {\n"
- @" copy: \"foo\"\n"
- @"}\n";
- NSString *result = GPBTextFormatForMessage(message, nil);
- XCTAssertEqualObjects(expected, result);
-}
-
-- (void)testTextFormatMaps {
- TestMap *message = [TestMap message];
-
- // Map iteration order doesn't have to be stable, so use only one entry.
- [self setAllMapFields:message numEntries:1];
-
- NSString *result = GPBTextFormatForMessage(message, nil);
-
- NSString *fileName = @"text_format_map_unittest_data.txt";
- NSData *resultData = [result dataUsingEncoding:NSUTF8StringEncoding];
- NSData *expectedData =
- [self getDataFileNamed:fileName dataToWrite:resultData];
- NSString *expected = [[NSString alloc] initWithData:expectedData
- encoding:NSUTF8StringEncoding];
- XCTAssertEqualObjects(expected, result);
- [expected release];
-}
-
-// TODO(thomasvl): add test with extensions once those format with correct names.
-
-@end

Powered by Google App Engine
This is Rietveld 408576698