Skip to content

Commit

Permalink
Fix chery-pick merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamolight committed Apr 4, 2019
1 parent 4bffe91 commit d54d53b
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@
AppEventQueue.class,
AppEventUtility.class,
AppEventsLogger.class,
AppEventsLoggerImpl.class,
AppEventsLogger.class,
AttributionIdentifiers.class,
InternalAppEventsLogger.class,
FacebookSdk.class,
GraphRequest.class,
Utility.class,
Expand Down Expand Up @@ -281,6 +280,7 @@ public void testLogProductItemWithoutGtinMpnBrand() throws Exception {
Matchers.anyDouble(),
argThat(new AppEventTestUtilities.BundleMatcher(parameters)),
Matchers.anyBoolean(),
Matchers.anyBoolean(),
Matchers.any(UUID.class));
}

Expand All @@ -298,6 +298,7 @@ public void testLogPushNotificationOpen() throws Exception {
Matchers.anyDouble(),
argThat(new AppEventTestUtilities.BundleMatcher(parameters)),
Matchers.anyBoolean(),
Matchers.anyBoolean(),
Matchers.any(UUID.class));
}

Expand All @@ -313,6 +314,7 @@ public void testLogPushNotificationOpenWithoutCampaign() throws Exception {
Matchers.anyDouble(),
Matchers.any(Bundle.class),
Matchers.anyBoolean(),
Matchers.anyBoolean(),
Matchers.any(UUID.class));
}

Expand Down Expand Up @@ -347,6 +349,7 @@ public void testLogPushNotificationOpenWithoutPayload() throws Exception {
Matchers.anyDouble(),
Matchers.any(Bundle.class),
Matchers.anyBoolean(),
Matchers.anyBoolean(),
Matchers.any(UUID.class));
}

Expand Down

0 comments on commit d54d53b

Please sign in to comment.