Skip to content

Commit

Permalink
Rename default flags
Browse files Browse the repository at this point in the history
  • Loading branch information
@guperrot
guperrot committed Nov 5, 2018
1 parent 862c67d commit d2899ff
Show file tree
Hide file tree
Showing 27 changed files with 194 additions and 194 deletions.
2 changes: 1 addition & 1 deletion ...rc/projectDependency/java/com/microsoft/appcenter/sasquatch/activities/EventActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public void send(@SuppressWarnings("UnusedParameters") View view) {
private int getFlags(PersistenceFlag persistenceFlag) {
switch (persistenceFlag) {
case DEFAULT:
return Flags.getPersistenceFlag(Flags.DEFAULT_FLAGS, true);
return Flags.getPersistenceFlag(Flags.DEFAULTS, true);

case NORMAL:
return Flags.PERSISTENCE_NORMAL;
Expand Down
8 changes: 4 additions & 4 deletions sdk/appcenter-analytics/src/main/java/com/microsoft/appcenter/analytics/Analytics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ protected static void trackPage(String name, Map<String, String> properties) {
* @param name An event name.
*/
public static void trackEvent(String name) {
trackEvent(name, null, null, Flags.DEFAULT_FLAGS);
trackEvent(name, null, null, Flags.DEFAULTS);
}

/**
Expand Down Expand Up @@ -309,7 +309,7 @@ public static void trackEvent(String name) {
* @param properties Optional properties.
*/
public static void trackEvent(String name, Map<String, String> properties) {
getInstance().trackEventAsync(name, convertProperties(properties), null, Flags.DEFAULT_FLAGS);
getInstance().trackEventAsync(name, convertProperties(properties), null, Flags.DEFAULTS);
}

/**
Expand Down Expand Up @@ -342,7 +342,7 @@ public static void trackEvent(String name, Map<String, String> properties) {
* @param properties Optional properties.
*/
public static void trackEvent(String name, EventProperties properties) {
trackEvent(name, properties, Flags.DEFAULT_FLAGS);
trackEvent(name, properties, Flags.DEFAULTS);
}

/**
Expand Down Expand Up @@ -698,7 +698,7 @@ private void queuePage(String name, Map<String, String> properties) {
PageLog pageLog = new PageLog();
pageLog.setName(name);
pageLog.setProperties(properties);
mChannel.enqueue(pageLog, ANALYTICS_GROUP, Flags.DEFAULT_FLAGS);
mChannel.enqueue(pageLog, ANALYTICS_GROUP, Flags.DEFAULTS);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions ...nalytics/src/main/java/com/microsoft/appcenter/analytics/AnalyticsTransmissionTarget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private static void updateProvider(AuthenticationProvider authenticationProvider
* @param name An event name.
*/
public void trackEvent(String name) {
trackEvent(name, null, Flags.DEFAULT_FLAGS);
trackEvent(name, null, Flags.DEFAULTS);
}

/**
Expand All @@ -179,7 +179,7 @@ public void trackEvent(String name, Map<String, String> properties) {
eventProperties.set(entry.getKey(), entry.getValue());
}
}
trackEvent(name, eventProperties, Flags.DEFAULT_FLAGS);
trackEvent(name, eventProperties, Flags.DEFAULTS);
}

/**
Expand All @@ -198,7 +198,7 @@ public void trackEvent(String name, Map<String, String> properties) {
* @param properties Optional properties.
*/
public void trackEvent(String name, EventProperties properties) {
trackEvent(name, properties, Flags.DEFAULT_FLAGS);
trackEvent(name, properties, Flags.DEFAULTS);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ter-analytics/src/main/java/com/microsoft/appcenter/analytics/channel/SessionTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private void sendStartSessionIfNeeded() {
/* Enqueue a start session log. */
StartSessionLog startSessionLog = new StartSessionLog();
startSessionLog.setSid(mSid);
mChannel.enqueue(startSessionLog, mGroupName, Flags.DEFAULT_FLAGS);
mChannel.enqueue(startSessionLog, mGroupName, Flags.DEFAULTS);
}
}

Expand Down
52 changes: 26 additions & 26 deletions sdk/appcenter-analytics/src/test/java/com/microsoft/appcenter/analytics/AnalyticsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import static com.microsoft.appcenter.Flags.DEFAULT_FLAGS;
import static com.microsoft.appcenter.Flags.DEFAULTS;
import static com.microsoft.appcenter.Flags.PERSISTENCE_CRITICAL;
import static com.microsoft.appcenter.Flags.PERSISTENCE_NORMAL;
import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -144,7 +144,7 @@ public boolean matches(Object item) {
}
return false;
}
}), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
}), eq(analytics.getGroupName()), eq(DEFAULTS));
}

@Test
Expand Down Expand Up @@ -178,7 +178,7 @@ public void disableAutomaticPageTracking() {
public boolean matches(Object argument) {
return argument instanceof StartSessionLog;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));
verify(channel, never()).enqueue(argThat(new ArgumentMatcher<Log>() {

@Override
Expand All @@ -199,7 +199,7 @@ public boolean matches(Object item) {
}
return false;
}
}), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
}), eq(analytics.getGroupName()), eq(DEFAULTS));
}

@Test
Expand All @@ -212,7 +212,7 @@ public void trackEventFromAppWithoutProperties() {

/* Send event without properties. */
Analytics.trackEvent("eventName");
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULTS));
assertNotNull(argumentCaptor.getValue());
assertEquals("eventName", argumentCaptor.getValue().getName());
assertNull(argumentCaptor.getValue().getTypedProperties());
Expand All @@ -228,7 +228,7 @@ public void trackEventFromAppWithNullMapProperty() {

/* Send event with empty Map properties. */
Analytics.trackEvent("eventName", (Map<String, String>) null);
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULTS));
assertNotNull(argumentCaptor.getValue());
assertEquals("eventName", argumentCaptor.getValue().getName());
assertNull(argumentCaptor.getValue().getTypedProperties());
Expand All @@ -244,7 +244,7 @@ public void trackEventFromAppWithEmptyMapProperty() {

/* Send event with empty Map properties. */
Analytics.trackEvent("eventName", new HashMap<String, String>());
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULTS));
assertNotNull(argumentCaptor.getValue());
assertEquals("eventName", argumentCaptor.getValue().getName());
assertEquals(Collections.emptyList(), argumentCaptor.getValue().getTypedProperties());
Expand All @@ -265,7 +265,7 @@ public void trackEventFromAppWithMapProperties() {
StringTypedProperty stringProperty = new StringTypedProperty();
stringProperty.setName("name");
stringProperty.setValue("value");
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULTS));
assertNotNull(argumentCaptor.getValue());
assertEquals("eventName", argumentCaptor.getValue().getName());
assertEquals(Collections.<TypedProperty>singletonList(stringProperty), argumentCaptor.getValue().getTypedProperties());
Expand All @@ -281,7 +281,7 @@ public void trackEventFromAppWithEmptyEventProperties() {

/* Send event with empty EventProperties. */
Analytics.trackEvent("eventName", new EventProperties());
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULTS));
assertNotNull(argumentCaptor.getValue());
assertEquals("eventName", argumentCaptor.getValue().getName());
assertEquals(Collections.emptyList(), argumentCaptor.getValue().getTypedProperties());
Expand Down Expand Up @@ -321,7 +321,7 @@ public void trackEventFromAppWithEventProperties() {
eventProperties.set("n3", 0d);
eventProperties.set("n4", true);
Analytics.trackEvent("eventName", eventProperties);
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(argumentCaptor.capture(), anyString(), eq(DEFAULTS));
assertNotNull(argumentCaptor.getValue());
assertEquals("eventName", argumentCaptor.getValue().getName());
assertEquals(stringTypedProperty, argumentCaptor.getValue().getTypedProperties().get(0));
Expand Down Expand Up @@ -358,7 +358,7 @@ public void trackEventWithInvalidFlags() {
analytics.onStarting(mAppCenterHandler);
analytics.onStarted(mock(Context.class), channel, "", null, true);
Analytics.trackEvent("eventName", null, 0x03);
verify(channel).enqueue(isA(EventLog.class), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(isA(EventLog.class), anyString(), eq(DEFAULTS));
verifyStatic();
AppCenterLog.warn(eq(AppCenter.LOG_TAG), anyString());
}
Expand All @@ -377,11 +377,11 @@ public void trackEventFromLibrary() {
/* It works from a target. */
AnalyticsTransmissionTarget target = Analytics.getTransmissionTarget("t");
target.trackEvent("eventName");
verify(channel).enqueue(isA(EventLog.class), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(isA(EventLog.class), anyString(), eq(DEFAULTS));

/* It works from a child target. */
target.getTransmissionTarget("t2").trackEvent("eventName");
verify(channel, times(2)).enqueue(isA(EventLog.class), anyString(), eq(DEFAULT_FLAGS));
verify(channel, times(2)).enqueue(isA(EventLog.class), anyString(), eq(DEFAULTS));
}

@Test
Expand All @@ -391,7 +391,7 @@ public void trackPageFromApp() {
analytics.onStarting(mAppCenterHandler);
analytics.onStarted(mock(Context.class), channel, "", null, true);
Analytics.trackPage("pageName");
verify(channel).enqueue(isA(PageLog.class), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(isA(PageLog.class), anyString(), eq(DEFAULTS));
}

@Test
Expand Down Expand Up @@ -468,7 +468,7 @@ public void accept(Void aVoid) {
target.trackEvent("test");
target.getTransmissionTarget("t2").trackEvent("test");
Analytics.trackPage("test");
verify(channel, times(4)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(4)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULTS));

/* Disable again. */
Analytics.setEnabled(false);
Expand All @@ -479,7 +479,7 @@ public void accept(Void aVoid) {
analytics.onActivityPaused(new Activity());

/* No more log enqueued. */
verify(channel, times(4)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(4)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULTS));
}

@Test
Expand Down Expand Up @@ -518,7 +518,7 @@ public void notSendingLogsOnPause() {
/* Send logs to verify the logs are enqueued after pause. */
Analytics.trackEvent("test");
Analytics.trackPage("test");
verify(channel, times(2)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(2)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULTS));

/* Resume Analytics. */
Analytics.resume();
Expand All @@ -529,7 +529,7 @@ public void notSendingLogsOnPause() {
/* Send logs to verify the logs are enqueued after resume. */
Analytics.trackEvent("test");
Analytics.trackPage("test");
verify(channel, times(4)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(4)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULTS));
}

@Test
Expand Down Expand Up @@ -595,14 +595,14 @@ public void startSessionAfterUserApproval() {
public boolean matches(Object argument) {
return argument instanceof StartSessionLog;
}
}), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
}), eq(analytics.getGroupName()), eq(DEFAULTS));
verify(channel).enqueue(argThat(new ArgumentMatcher<Log>() {

@Override
public boolean matches(Object argument) {
return argument instanceof PageLog;
}
}), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
}), eq(analytics.getGroupName()), eq(DEFAULTS));

/* Go background. */
analytics.onActivityPaused(new Activity());
Expand All @@ -612,7 +612,7 @@ public boolean matches(Object argument) {
Analytics.setEnabled(true);

/* No additional log. */
verify(channel, times(2)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(2)).enqueue(any(Log.class), eq(analytics.getGroupName()), eq(DEFAULTS));
}

@Test
Expand Down Expand Up @@ -714,7 +714,7 @@ public void appOnlyFeatures() {

/* Session tracker is started now. */
verify(channel).addListener(isA(SessionTracker.class));
verify(channel).enqueue(isA(StartSessionLog.class), anyString(), eq(DEFAULT_FLAGS));
verify(channel).enqueue(isA(StartSessionLog.class), anyString(), eq(DEFAULTS));

/* Verify last page tracked as still in foreground. */
verify(channel).enqueue(argThat(new ArgumentMatcher<Log>() {
Expand All @@ -727,10 +727,10 @@ public boolean matches(Object item) {
}
return false;
}
}), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
}), eq(analytics.getGroupName()), eq(DEFAULTS));

/* Check that was the only page sent. */
verify(channel).enqueue(isA(PageLog.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel).enqueue(isA(PageLog.class), eq(analytics.getGroupName()), eq(DEFAULTS));

/* Session tracker removed if disabled. */
Analytics.setEnabled(false);
Expand All @@ -739,8 +739,8 @@ public boolean matches(Object item) {
/* And added again on enabling again. Page tracked again. */
Analytics.setEnabled(true);
verify(channel, times(2)).addListener(isA(SessionTracker.class));
verify(channel, times(2)).enqueue(isA(StartSessionLog.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(2)).enqueue(isA(PageLog.class), eq(analytics.getGroupName()), eq(DEFAULT_FLAGS));
verify(channel, times(2)).enqueue(isA(StartSessionLog.class), eq(analytics.getGroupName()), eq(DEFAULTS));
verify(channel, times(2)).enqueue(isA(PageLog.class), eq(analytics.getGroupName()), eq(DEFAULTS));
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions ...tics/src/test/java/com/microsoft/appcenter/analytics/AnalyticsTransmissionTargetTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.util.HashMap;
import java.util.List;

import static com.microsoft.appcenter.Flags.DEFAULT_FLAGS;
import static com.microsoft.appcenter.Flags.DEFAULTS;
import static com.microsoft.appcenter.Flags.PERSISTENCE_CRITICAL;
import static com.microsoft.appcenter.Flags.PERSISTENCE_NORMAL;
import static com.microsoft.appcenter.analytics.Analytics.ANALYTICS_GROUP;
Expand Down Expand Up @@ -145,7 +145,7 @@ public boolean matches(Object item) {
}
return false;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));
} else {
verify(mChannel, never()).enqueue(isA(EventLog.class), anyString(), anyInt());
}
Expand All @@ -166,7 +166,7 @@ public boolean matches(Object item) {
}
return false;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));
reset(mChannel);

/* Track event via another transmission target method with properties. */
Expand All @@ -191,7 +191,7 @@ public boolean matches(Object item) {
}
return false;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));
reset(mChannel);

/* Create a child transmission target and track event. */
Expand All @@ -210,7 +210,7 @@ public boolean matches(Object item) {
}
return false;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));
reset(mChannel);

/* Another child transmission target with the same token should be the same instance. */
Expand All @@ -234,7 +234,7 @@ public boolean matches(Object item) {
}
return false;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));

/* Set enabled to false and assert that it cannot track event. */
transmissionTarget.setEnabledAsync(false).get();
Expand Down Expand Up @@ -290,7 +290,7 @@ public boolean matches(Object item) {
}
return false;
}
}), anyString(), eq(DEFAULT_FLAGS));
}), anyString(), eq(DEFAULTS));
}

@Test
Expand Down Expand Up @@ -622,7 +622,7 @@ public void trackEventWithNormalCriticalPersistenceFlag() {
public void trackEventWithInvalidFlags() {
AnalyticsTransmissionTarget target = Analytics.getTransmissionTarget("token");
target.trackEvent("eventName", null, 0x03);
verify(mChannel).enqueue(isA(EventLog.class), anyString(), eq(DEFAULT_FLAGS));
verify(mChannel).enqueue(isA(EventLog.class), anyString(), eq(DEFAULTS));
verifyStatic();
AppCenterLog.warn(eq(AppCenter.LOG_TAG), anyString());
}
Expand Down
Loading

0 comments on commit d2899ff

Please sign in to comment.