Skip to content

Commit 90437d8

Browse files
guperrotguperrot
authored
Merge pull request #485 from Microsoft/merge_master_bump_version
Merge master bump version
2 parents 0ce9135 + bb2fab8 commit 90437d8

File tree

9 files changed

+123
-253
lines changed

9 files changed

+123
-253
lines changed

‎apps/sasquatch/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
}
2323

2424
dependencies {
25-
def version = "0.10.0"
25+
def version = "0.11.0"
2626
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
2727
projectDependencyCompile project(':sdk:mobile-center-analytics')
2828
projectDependencyCompile project(':sdk:mobile-center-crashes')

‎apps/sasquatch/src/androidTest/java/com/microsoft/azure/mobile/sasquatch/activities/CrashesTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,23 @@ public class CrashesTest {
6666

6767
private Context mContext;
6868

69+
@SuppressWarnings("rawtypes")
70+
private static Matcher<Object> withCrashTitle(@StringRes final int titleId) {
71+
return new BoundedMatcher<Object, CrashActivity.Crash>(CrashActivity.Crash.class) {
72+
73+
@Override
74+
public boolean matchesSafely(CrashActivity.Crash map) {
75+
return map.title == titleId;
76+
}
77+
78+
@Override
79+
public void describeTo(Description description) {
80+
description.appendText("with item title from resource id: ");
81+
description.appendValue(titleId);
82+
}
83+
};
84+
}
85+
6986
@Before
7087
public void setUp() throws Exception {
7188
mContext = getInstrumentation().getTargetContext();
@@ -145,8 +162,8 @@ private void crashTest(@StringRes int titleId) throws InterruptedException {
145162
.perform(click());
146163

147164
/* Check error report. */
148-
assertTrue(GetHelper.hasCrashedInLastSession());
149-
ErrorReport errorReport = GetHelper.getLastSessionCrashReport();
165+
assertTrue(Crashes.hasCrashedInLastSession().get());
166+
ErrorReport errorReport = Crashes.getLastSessionCrashReport().get();
150167
assertNotNull(errorReport);
151168
assertNotNull(errorReport.getId());
152169
assertEquals(mContext.getMainLooper().getThread().getName(), errorReport.getThreadName());
@@ -183,23 +200,6 @@ private ViewInteraction onCrash(@StringRes int titleId) {
183200
.perform();
184201
}
185202

186-
@SuppressWarnings("rawtypes")
187-
private static Matcher<Object> withCrashTitle(@StringRes final int titleId) {
188-
return new BoundedMatcher<Object, CrashActivity.Crash>(CrashActivity.Crash.class) {
189-
190-
@Override
191-
public boolean matchesSafely(CrashActivity.Crash map) {
192-
return map.title == titleId;
193-
}
194-
195-
@Override
196-
public void describeTo(Description description) {
197-
description.appendText("with item title from resource id: ");
198-
description.appendValue(titleId);
199-
}
200-
};
201-
}
202-
203203
private class CrashFailureHandler implements FailureHandler {
204204

205205
Throwable uncaughtException;

‎apps/sasquatch/src/androidTest/java/com/microsoft/azure/mobile/sasquatch/activities/SettingsActivityTest.java‎

Lines changed: 64 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
import android.support.test.espresso.DataInteraction;
66
import android.support.test.rule.ActivityTestRule;
77

8+
import com.microsoft.azure.mobile.MobileCenter;
9+
import com.microsoft.azure.mobile.analytics.Analytics;
10+
import com.microsoft.azure.mobile.crashes.Crashes;
11+
import com.microsoft.azure.mobile.distribute.Distribute;
12+
import com.microsoft.azure.mobile.push.Push;
813
import com.microsoft.azure.mobile.sasquatch.R;
914
import com.microsoft.azure.mobile.utils.storage.StorageHelper;
1015

@@ -47,15 +52,15 @@ public void setUp() throws Exception {
4752
@Test
4853
public void testInitialState() {
4954
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
50-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
55+
Assert.assertTrue(MobileCenter.isEnabled().get());
5156
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
52-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
57+
Assert.assertTrue(Analytics.isEnabled().get());
5358
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
54-
Assert.assertTrue(GetHelper.isCrashesEnabled());
59+
Assert.assertTrue(Crashes.isEnabled().get());
5560
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
56-
Assert.assertTrue(GetHelper.isDistributeEnabled());
61+
Assert.assertTrue(Distribute.isEnabled().get());
5762
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
58-
Assert.assertTrue(GetHelper.isPushEnabled());
63+
Assert.assertTrue(Push.isEnabled().get());
5964
}
6065

6166
@Test
@@ -66,50 +71,50 @@ public void testEnableMobileCenter() {
6671

6772
/* Check mobile center and services state. */
6873
onCheckbox(R.string.mobile_center_state_key).check(matches(isNotChecked()));
69-
Assert.assertFalse(GetHelper.isMobileCenterEnabled());
74+
Assert.assertFalse(MobileCenter.isEnabled().get());
7075
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isNotChecked()));
71-
Assert.assertFalse(GetHelper.isAnalyticsEnabled());
76+
Assert.assertFalse(Analytics.isEnabled().get());
7277
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isNotChecked()));
73-
Assert.assertFalse(GetHelper.isCrashesEnabled());
78+
Assert.assertFalse(Crashes.isEnabled().get());
7479
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isNotChecked()));
75-
Assert.assertFalse(GetHelper.isDistributeEnabled());
80+
Assert.assertFalse(Distribute.isEnabled().get());
7681
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isNotChecked()));
77-
Assert.assertFalse(GetHelper.isPushEnabled());
82+
Assert.assertFalse(Push.isEnabled().get());
7883

7984
/* Unable enable analytics when mobile center is disabled. */
8085
onCheckbox(R.string.mobile_center_analytics_state_key).perform(click());
8186
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isNotChecked()));
82-
Assert.assertFalse(GetHelper.isAnalyticsEnabled());
87+
Assert.assertFalse(Analytics.isEnabled().get());
8388

8489
/* Unable enable crashes when mobile center is disabled. */
8590
onCheckbox(R.string.mobile_center_crashes_state_key).perform(click());
8691
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isNotChecked()));
87-
Assert.assertFalse(GetHelper.isCrashesEnabled());
92+
Assert.assertFalse(Crashes.isEnabled().get());
8893

8994
/* Unable enable distribute when mobile center is disabled. */
9095
onCheckbox(R.string.mobile_center_distribute_state_key).perform(click());
9196
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isNotChecked()));
92-
Assert.assertFalse(GetHelper.isDistributeEnabled());
97+
Assert.assertFalse(Distribute.isEnabled().get());
9398

9499
/* Unable enable push when mobile center is disabled. */
95100
onCheckbox(R.string.mobile_center_push_state_key).perform(click());
96101
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isNotChecked()));
97-
Assert.assertFalse(GetHelper.isPushEnabled());
102+
Assert.assertFalse(Push.isEnabled().get());
98103

99104
/* Enable mobile center. */
100105
onCheckbox(R.string.mobile_center_state_key).perform(click());
101106

102107
/* Check mobile center and services state. */
103108
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
104-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
109+
Assert.assertTrue(MobileCenter.isEnabled().get());
105110
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
106-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
111+
Assert.assertTrue(Analytics.isEnabled().get());
107112
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
108-
Assert.assertTrue(GetHelper.isCrashesEnabled());
113+
Assert.assertTrue(Crashes.isEnabled().get());
109114
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
110-
Assert.assertTrue(GetHelper.isDistributeEnabled());
115+
Assert.assertTrue(Distribute.isEnabled().get());
111116
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
112-
Assert.assertTrue(GetHelper.isPushEnabled());
117+
Assert.assertTrue(Push.isEnabled().get());
113118
}
114119

115120
@Test
@@ -120,30 +125,30 @@ public void testEnableAnalytics() {
120125

121126
/* Check mobile center and services state. */
122127
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
123-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
128+
Assert.assertTrue(MobileCenter.isEnabled().get());
124129
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isNotChecked()));
125-
Assert.assertFalse(GetHelper.isAnalyticsEnabled());
130+
Assert.assertFalse(Analytics.isEnabled().get());
126131
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
127-
Assert.assertTrue(GetHelper.isCrashesEnabled());
132+
Assert.assertTrue(Crashes.isEnabled().get());
128133
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
129-
Assert.assertTrue(GetHelper.isDistributeEnabled());
134+
Assert.assertTrue(Distribute.isEnabled().get());
130135
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
131-
Assert.assertTrue(GetHelper.isPushEnabled());
136+
Assert.assertTrue(Push.isEnabled().get());
132137

133138
/* Enable analytics service. */
134139
onCheckbox(R.string.mobile_center_analytics_state_key).perform(click());
135140

136141
/* Check mobile center and services state. */
137142
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
138-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
143+
Assert.assertTrue(MobileCenter.isEnabled().get());
139144
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
140-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
145+
Assert.assertTrue(Analytics.isEnabled().get());
141146
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
142-
Assert.assertTrue(GetHelper.isCrashesEnabled());
147+
Assert.assertTrue(Crashes.isEnabled().get());
143148
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
144-
Assert.assertTrue(GetHelper.isDistributeEnabled());
149+
Assert.assertTrue(Distribute.isEnabled().get());
145150
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
146-
Assert.assertTrue(GetHelper.isPushEnabled());
151+
Assert.assertTrue(Push.isEnabled().get());
147152
}
148153

149154
@Test
@@ -154,30 +159,30 @@ public void testEnableCrashes() {
154159

155160
/* Check mobile center and services state. */
156161
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
157-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
162+
Assert.assertTrue(MobileCenter.isEnabled().get());
158163
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
159-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
164+
Assert.assertTrue(Analytics.isEnabled().get());
160165
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isNotChecked()));
161-
Assert.assertFalse(GetHelper.isCrashesEnabled());
166+
Assert.assertFalse(Crashes.isEnabled().get());
162167
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
163-
Assert.assertTrue(GetHelper.isDistributeEnabled());
168+
Assert.assertTrue(Distribute.isEnabled().get());
164169
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
165-
Assert.assertTrue(GetHelper.isPushEnabled());
170+
Assert.assertTrue(Push.isEnabled().get());
166171

167172
/* Enable distribute service. */
168173
onCheckbox(R.string.mobile_center_crashes_state_key).perform(click());
169174

170175
/* Check mobile center and services state. */
171176
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
172-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
177+
Assert.assertTrue(MobileCenter.isEnabled().get());
173178
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
174-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
179+
Assert.assertTrue(Analytics.isEnabled().get());
175180
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
176-
Assert.assertTrue(GetHelper.isCrashesEnabled());
181+
Assert.assertTrue(Crashes.isEnabled().get());
177182
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
178-
Assert.assertTrue(GetHelper.isDistributeEnabled());
183+
Assert.assertTrue(Distribute.isEnabled().get());
179184
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
180-
Assert.assertTrue(GetHelper.isPushEnabled());
185+
Assert.assertTrue(Push.isEnabled().get());
181186
}
182187

183188
@Test
@@ -188,30 +193,30 @@ public void testEnableDistribute() {
188193

189194
/* Check mobile center and services state. */
190195
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
191-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
196+
Assert.assertTrue(MobileCenter.isEnabled().get());
192197
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
193-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
198+
Assert.assertTrue(Analytics.isEnabled().get());
194199
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
195-
Assert.assertTrue(GetHelper.isCrashesEnabled());
200+
Assert.assertTrue(Crashes.isEnabled().get());
196201
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isNotChecked()));
197-
Assert.assertFalse(GetHelper.isDistributeEnabled());
202+
Assert.assertFalse(Distribute.isEnabled().get());
198203
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
199-
Assert.assertTrue(GetHelper.isPushEnabled());
204+
Assert.assertTrue(Push.isEnabled().get());
200205

201206
/* Enable distribute service. */
202207
onCheckbox(R.string.mobile_center_distribute_state_key).perform(click());
203208

204209
/* Check mobile center and services state. */
205210
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
206-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
211+
Assert.assertTrue(MobileCenter.isEnabled().get());
207212
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
208-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
213+
Assert.assertTrue(Analytics.isEnabled().get());
209214
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
210-
Assert.assertTrue(GetHelper.isCrashesEnabled());
215+
Assert.assertTrue(Crashes.isEnabled().get());
211216
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
212-
Assert.assertTrue(GetHelper.isDistributeEnabled());
217+
Assert.assertTrue(Distribute.isEnabled().get());
213218
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
214-
Assert.assertTrue(GetHelper.isPushEnabled());
219+
Assert.assertTrue(Push.isEnabled().get());
215220
}
216221

217222
@Test
@@ -222,30 +227,30 @@ public void testEnablePush() {
222227

223228
/* Check mobile center and services state. */
224229
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
225-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
230+
Assert.assertTrue(MobileCenter.isEnabled().get());
226231
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
227-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
232+
Assert.assertTrue(Analytics.isEnabled().get());
228233
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
229-
Assert.assertTrue(GetHelper.isCrashesEnabled());
234+
Assert.assertTrue(Crashes.isEnabled().get());
230235
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
231-
Assert.assertTrue(GetHelper.isDistributeEnabled());
236+
Assert.assertTrue(Distribute.isEnabled().get());
232237
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isNotChecked()));
233-
Assert.assertFalse(GetHelper.isPushEnabled());
238+
Assert.assertFalse(Push.isEnabled().get());
234239

235240
/* Enable push service. */
236241
onCheckbox(R.string.mobile_center_push_state_key).perform(click());
237242

238243
/* Check mobile center and services state. */
239244
onCheckbox(R.string.mobile_center_state_key).check(matches(isChecked()));
240-
Assert.assertTrue(GetHelper.isMobileCenterEnabled());
245+
Assert.assertTrue(MobileCenter.isEnabled().get());
241246
onCheckbox(R.string.mobile_center_analytics_state_key).check(matches(isChecked()));
242-
Assert.assertTrue(GetHelper.isAnalyticsEnabled());
247+
Assert.assertTrue(Analytics.isEnabled().get());
243248
onCheckbox(R.string.mobile_center_crashes_state_key).check(matches(isChecked()));
244-
Assert.assertTrue(GetHelper.isCrashesEnabled());
249+
Assert.assertTrue(Crashes.isEnabled().get());
245250
onCheckbox(R.string.mobile_center_distribute_state_key).check(matches(isChecked()));
246-
Assert.assertTrue(GetHelper.isDistributeEnabled());
251+
Assert.assertTrue(Distribute.isEnabled().get());
247252
onCheckbox(R.string.mobile_center_push_state_key).check(matches(isChecked()));
248-
Assert.assertTrue(GetHelper.isPushEnabled());
253+
Assert.assertTrue(Push.isEnabled().get());
249254
}
250255

251256
private DataInteraction onCheckbox(int id) {

0 commit comments

Comments
 (0)