Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes from google3 #179

Merged
merged 18 commits into from
Apr 25, 2015
Merged

Merge changes from google3 #179

merged 18 commits into from
Apr 25, 2015

Conversation

cgruber
Copy link
Contributor

@cgruber cgruber commented Apr 25, 2015

No description provided.

@kluever
Copy link
Member

kluever commented Apr 25, 2015

LGTM

cgruber and others added 18 commits April 24, 2015 18:42
Fixes #164
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=88212495
…nullable, like the Object first and second arguments.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=88747371
… the actual value be the subject of the assertion. Also tidy up some of the formatting as a drive-by.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=89284234
…elements

don't implement hashCode() (e.g., ProtoBuf's MessageSet!)

This at least partially addresses #176
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=89605122
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=90543365
Add a test that makes sure all assertThat() overloads accept null and do the right thing for isNull(), isNotNull(), isEqualTo(), and isNotEqualTo().
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=90551205
…here we

know isEqualTo is the better option).
@deprecate isEqualTo and isNotEqualTo on DoubleSubject.
Add tests for pass null to ComparableSubject.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=90636937
Add missing @nullable annotatinos to TableSubject.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=90840494
Add missing @nullable annotations to MapSubject.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=90850969
…EqualTo().

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=91308469
…ld be prefer over isEquivalentAccordingToCompareTo().

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=91807574
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=91877928
cgruber added a commit that referenced this pull request Apr 25, 2015
@cgruber cgruber merged commit bfa1661 into master Apr 25, 2015
@cgruber cgruber deleted the merge_from_google3 branch April 25, 2015 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants