Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
d7183b0a
Commit
d7183b0a
authored
Jan 05, 2016
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1091 from thomasvl/objc_tests_use_autocreators
Have the tests rely on the autocreator behaviors.
parents
2f15b8f5
ca428c1b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
13 deletions
+1
-13
GPBMessageTests+Merge.m
objectivec/Tests/GPBMessageTests+Merge.m
+1
-3
GPBMessageTests+Runtime.m
objectivec/Tests/GPBMessageTests+Runtime.m
+0
-1
GPBMessageTests.m
objectivec/Tests/GPBMessageTests.m
+0
-8
GPBWireFormatTests.m
objectivec/Tests/GPBWireFormatTests.m
+0
-1
No files found.
objectivec/Tests/GPBMessageTests+Merge.m
View file @
d7183b0a
...
...
@@ -675,14 +675,12 @@
TestAllTypes
*
subMsg
=
[
TestAllTypes
message
];
subMsg
.
repeatedInt32Array
=
[
GPBInt32Array
arrayWithValue
:
100
];
msg1
.
mapInt32Message
=
[
GPBInt32ObjectDictionary
dictionary
];
[
msg1
.
mapInt32Message
setObject
:
subMsg
forKey
:
0
];
subMsg
=
nil
;
subMsg
=
[
TestAllTypes
message
];
subMsg
.
repeatedInt32Array
=
[
GPBInt32Array
arrayWithValue
:
101
];
msg2
.
mapInt32Message
=
[
GPBInt32ObjectDictionary
dictionary
];
[
msg2
.
mapInt32Message
setObject
:
subMsg
forKey
:
0
];
subMsg
=
nil
;
...
...
objectivec/Tests/GPBMessageTests+Runtime.m
View file @
d7183b0a
...
...
@@ -2074,7 +2074,6 @@
// Add an uninitialized message.
TestRequired
*
subMsg
=
[[
TestRequired
alloc
]
init
];
msg
.
mapField
=
[
GPBInt32ObjectDictionary
dictionary
];
[
msg
.
mapField
setObject
:
subMsg
forKey
:
0
];
XCTAssertFalse
(
msg
.
initialized
);
...
...
objectivec/Tests/GPBMessageTests.m
View file @
d7183b0a
...
...
@@ -55,7 +55,6 @@
[
message
setOptionalInt32
:
1
];
[
message
setOptionalString
:
@"foo"
];
[
message
setOptionalForeignMessage
:[
ForeignMessage
message
]];
message
.
repeatedStringArray
=
[
NSMutableArray
array
];
[
message
.
repeatedStringArray
addObject
:
@"bar"
];
return
message
;
}
...
...
@@ -67,7 +66,6 @@
ForeignMessage
*
foreignMessage
=
[
ForeignMessage
message
];
[
foreignMessage
setC
:
3
];
[
message
setOptionalForeignMessage
:
foreignMessage
];
message
.
repeatedStringArray
=
[
NSMutableArray
array
];
[
message
.
repeatedStringArray
addObject
:
@"qux"
];
return
message
;
}
...
...
@@ -76,7 +74,6 @@
TestAllTypes
*
message
=
[
TestAllTypes
message
];
[
message
setOptionalInt64
:
2
];
[
message
setOptionalString
:
@"baz"
];
message
.
repeatedStringArray
=
[
NSMutableArray
array
];
[
message
.
repeatedStringArray
addObject
:
@"qux"
];
return
message
;
}
...
...
@@ -89,7 +86,6 @@
ForeignMessage
*
foreignMessage
=
[
ForeignMessage
message
];
[
foreignMessage
setC
:
3
];
[
message
setOptionalForeignMessage
:
foreignMessage
];
message
.
repeatedStringArray
=
[
NSMutableArray
array
];
[
message
.
repeatedStringArray
addObject
:
@"qux"
];
[
message
.
repeatedStringArray
addObject
:
@"bar"
];
return
message
;
...
...
@@ -102,7 +98,6 @@
[
message
setOptionalString
:
@"foo"
];
ForeignMessage
*
foreignMessage
=
[
ForeignMessage
message
];
[
message
setOptionalForeignMessage
:
foreignMessage
];
message
.
repeatedStringArray
=
[
NSMutableArray
array
];
[
message
.
repeatedStringArray
addObject
:
@"qux"
];
[
message
.
repeatedStringArray
addObject
:
@"bar"
];
return
message
;
...
...
@@ -248,7 +243,6 @@
[
message
setOptionalMessage
:
self
.
testRequiredInitialized
];
XCTAssertTrue
(
message
.
initialized
);
message
.
repeatedMessageArray
=
[
NSMutableArray
array
];
[
message
.
repeatedMessageArray
addObject
:[
TestRequired
message
]];
XCTAssertFalse
(
message
.
initialized
);
...
...
@@ -300,7 +294,6 @@
-
(
void
)
testDataFromNestedUninitialized
{
TestRequiredForeign
*
message
=
[
TestRequiredForeign
message
];
[
message
setOptionalMessage
:[
TestRequired
message
]];
message
.
repeatedMessageArray
=
[
NSMutableArray
array
];
[
message
.
repeatedMessageArray
addObject
:[
TestRequired
message
]];
[
message
.
repeatedMessageArray
addObject
:[
TestRequired
message
]];
NSData
*
data
=
[
message
data
];
...
...
@@ -319,7 +312,6 @@
TestRequiredForeign
*
message
=
[
TestRequiredForeign
message
];
[
message
setOptionalMessage
:[
TestRequired
message
]];
message
.
repeatedMessageArray
=
[
NSMutableArray
array
];
[
message
.
repeatedMessageArray
addObject
:[
TestRequired
message
]];
[
message
.
repeatedMessageArray
addObject
:[
TestRequired
message
]];
...
...
objectivec/Tests/GPBWireFormatTests.m
View file @
d7183b0a
...
...
@@ -190,7 +190,6 @@ const int kUnknownTypeId = 1550055;
TestMessageSetExtension1
*
message
=
[
TestMessageSetExtension1
message
];
message
.
i
=
123
;
item
.
message
=
[
message
data
];
raw
.
itemArray
=
[
NSMutableArray
array
];
[
raw
.
itemArray
addObject
:
item
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment