Skip to content

Updating test for set({}, mergeAll:true) #3115

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.

Sign up for GitHub

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

Merged
pongad merged 3 commits into from
Apr 3, 2018
Merged

Updating test for set({}, mergeAll:true) #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f02d05
Merge
schmidt-sebastian Apr 2, 2018
9b4cbf8
Merge branch 'master' into mrschmidt-conformancefix
schmidt-sebastian Apr 2, 2018
dc4708b
Merge
schmidt-sebastian Apr 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ public class ConformanceTest {
private interface ConformanceTestCase extends Test, Describable {}

/** Excluded tests by test description. */
private final Set<String> excludedTests =
Collections.singleton("set: MergeAll cannot be specified with empty data."); // b/73495873
private final Set<String> excludedTests = Collections.emptySet();

/** If non-empty, only runs tests included in this set. */
private final Set<String> includedTests = Collections.emptySet();
Expand Down
Binary file modified google-cloud-firestore/src/test/resources/test-suite.binproto
View file
Open in desktop
Binary file not shown.