@@ -114,7 +114,7 @@ public void testInstanceIdChanges_dataCollectionEnabled() {
114
114
115
115
String installId = idManager .getInstallIds ().getCrashlyticsInstallId ();
116
116
assertNotNull (installId );
117
- assertFalse ( installId . equals ( oldUuid ));
117
+ assertThat ( oldUuid ). isNotEqualTo ( installId );
118
118
119
119
assertEquals (installId , prefs .getString (IdManager .PREFKEY_INSTALLATION_UUID , null ));
120
120
assertEquals (newFid , prefs .getString (IdManager .PREFKEY_FIREBASE_IID , null ));
@@ -191,7 +191,7 @@ public void testInstanceIdRotatesWithDataCollectionFlag() {
191
191
secondUuid ,
192
192
createIdManager (null , MOCK_ARBITER_DISABLED ).getInstallIds ().getCrashlyticsInstallId ());
193
193
// Check that we cached an synthetic FID
194
- final SharedPreferences prefs = CommonUtils .getSharedPrefs (getContext ());
194
+ prefs = CommonUtils .getSharedPrefs (getContext ());
195
195
String cachedFid = prefs .getString (IdManager .PREFKEY_FIREBASE_IID , null );
196
196
assertTrue (IdManager .isSyntheticFid (cachedFid ));
197
197
@@ -218,6 +218,12 @@ public void testIdForEntropy() {
218
218
assertThat (idManager .getIdForEntropy ()).isEqualTo (CommonUtils .sha1 ("Seveneves" ));
219
219
}
220
220
221
+ public void testIdForEntropy_noCache () {
222
+ IdManager idManager = createIdManager (null , MOCK_ARBITER_ENABLED );
223
+
224
+ assertThat (idManager .getIdForEntropy ()).hasLength (32 ); // Length of random uuid.
225
+ }
226
+
221
227
public void testIdForEntropy_arbiterDisabled () {
222
228
prefs .edit ().putString (IdManager .PREFKEY_INSTALLATION_UUID , "Seveneves" ).apply ();
223
229
IdManager idManager = createIdManager (null , MOCK_ARBITER_DISABLED );
@@ -233,9 +239,15 @@ public void testIdForEntropy_arbiterDisabled_syntheticFid() {
233
239
.putString (IdManager .PREFKEY_INSTALLATION_UUID , "Seveneves" )
234
240
.putString (IdManager .PREFKEY_FIREBASE_IID , "SYN_" ) // Synthetic fid
235
241
.apply ();
236
- IdManager idManager = createIdManager (null , MOCK_ARBITER_ENABLED );
242
+ IdManager idManager = createIdManager (null , MOCK_ARBITER_DISABLED );
237
243
238
244
// Do use the cached Crashlytics id, since the cached fid is synthetic.
239
245
assertThat (idManager .getIdForEntropy ()).isEqualTo (CommonUtils .sha1 ("Seveneves" ));
240
246
}
247
+
248
+ public void testIdForEntropy_arbiterDisabled_noCache () {
249
+ IdManager idManager = createIdManager (null , MOCK_ARBITER_DISABLED );
250
+
251
+ assertThat (idManager .getIdForEntropy ()).hasLength (32 ); // Length of random uuid.
252
+ }
241
253
}
0 commit comments