third_party/ocmock/README.chromium - Issue 2624143003: Update OCMock to 3.1.5

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/ocmock/README.chromium

Issue 2624143003: Update OCMock to 3.1.5 (Closed)

Patch Set: Patches in more commits Created 3 years, 10 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 unified diff | Download patch

OLD	NEW
1 Name: ocmock	1 Name: ocmock

2 URL: https://github.com/erikdoe/ocmock	2 URL: https://github.com/erikdoe/ocmock

3 Version: unknown	3 Version: 3.1.5

4 Revision: 8b8793cf29a5bac0541421ea06c7dff071afb25e	4 Revision: f03b3cc126edc8d6a2d4466d227fb41a1b2c2a14

5 License: BSD with advertising clause	5 License: Apache Version 2.0

6 License File: NOT_SHIPPED	6 License File: NOT_SHIPPED

7 Security Critical: no	7 Security Critical: no

8	8

9 Description:	9 Description:

10 OCMock is an Objective-C implementation of mock objects. If you are unfamiliar	10 OCMock is an Objective-C implementation of mock objects. If you are unfamiliar

11 with the concept of mock objects please visit mockobjects.com which has more	11 with the concept of mock objects please visit mockobjects.com which has more

12 details and discussions about this approach to testing software.	12 details and discussions about this approach to testing software.

13	13

14 Local Modifications:	14 Local Modifications:

15 This is only a partial inclusion of the OCMock tree. This only includes	15 This is only a partial inclusion of the OCMock tree. This only includes

16 /Source/OCMock because the tests and other files are not necessary for Chromium.	16 /Source/OCMock because the tests and other files are not necessary for Chromium.

17 The License.txt and Changes.txt file are also present from /Source.	17 The License.txt and Changes.txt file are also present from /Source.

18	18

19 Chromium can no longer sync to the tip-of-tree because upstream OCMock requires	19 Chromium can no longer sync to the tip-of-tree because upstream OCMock requires

20 10.7 as of b5773084d56d2573caf6a2d98d5b56e301673de1.	20 OS X 10.11.

21	21

22 Chromium adds gtest_support.h/.mm and ocmock_extensions.h/.mm.	22 Chromium adds gtest_support.h/.mm and ocmock_extensions.h/.mm.

23	23

24 Chromium alters all NSLogging of -[NSArray count] to compile under both 32 and	24 Chromium patches in 3e193f3c2d4ea4ada63df54c8ce98e7ea4cf768f to use OCMock with

25 64 bits.	25 libc++'s string for return types having vtables.

26	26

27 Chromium also patches in e8a9cc97936bfa8be97706c5092110603745e708 for fixing	27 Chromium patches in c32abcaba428921d8ac12ac98b272ecf8241f9bb and

28 unit tests broken with Xcode 5 due to the lack of copyWithZone: selector.	28 33aeea46b0912d9f57ff0ee2763f2667ac099acc to allow the use of .andReturn(...)

29	29 because our version of clang does not support __builtin_types_compatible_p.

30 Chromium also patches in 77400c22b5bafd8aaaa75f90a1d997838204577a that fixes	30 As we are building with Objective-C++, we need to add 'extern "C"' in

31 the comparison of types between invocation return type description (which	31 OCMFunctions.h to have C linkage.

32 changed from "c" to "B" on arm64) and NSValue objCType (which didn't change)

33 on arm64 for BOOL values.

34

35 Chromium also patches in 65ee89744bc1fbb9461f26d83e08243068cb212b that fixes

36 the comparison between opaque (forward-declared) and non-opaque types.

37

38 Chromium adds the patch suggested in https://github.com/erikdoe/ocmock/issues/24 7

OLD	NEW

« no previous file with comments | « third_party/ocmock/OCMock/OCProtocolMockObject.m ('k') | third_party/ocmock/ocmock_extensions.h » ('j') | no next file with comments »