Skip to content

Commit 716fb61

Browse files
gmsdelmundogmsdelmundo
committed
Updated tests to have all salt file fields present even if null
1 parent a498dc4 commit 716fb61

File tree

3 files changed

+114
-147
lines changed

3 files changed

+114
-147
lines changed

‎src/test/java/com/uid2/shared/store/EncryptedRotatingSaltProviderTest.java‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030

3131
@ExtendWith(MockitoExtension.class)
3232
@MockitoSettings(strictness = Strictness.LENIENT)
33-
public class EncryptedRotatingSaltProviderTest {
33+
class EncryptedRotatingSaltProviderTest {
3434
@Mock
3535
private ICloudStorage cloudStorage;
3636
@Mock
3737
private RotatingCloudEncryptionKeyProvider keyProvider;
3838
private CloudEncryptionKey encryptionKey;
3939

4040
@BeforeEach
41-
public void setup() {
41+
void setup() {
4242
byte[] keyBytes = new byte[32];
4343
new Random().nextBytes(keyBytes);
4444
String base64Key = Base64.getEncoder().encodeToString(keyBytes);
@@ -65,15 +65,15 @@ private InputStream getEncryptedStream(String content) {
6565
}
6666

6767
@Test
68-
public void metadataPath() {
68+
void metadataPath() {
6969
EncryptedRotatingSaltProvider saltsProvider = new EncryptedRotatingSaltProvider(
7070
cloudStorage, keyProvider, new EncryptedScope(new CloudPath("salts/metadata.json"), 1, true));
7171

7272
assertEquals("salts/encrypted/1_public/metadata.json", saltsProvider.getMetadataPath());
7373
}
7474

7575
@Test
76-
public void loadSaltSingleVersion() throws Exception {
76+
void loadSaltSingleVersion() throws Exception {
7777
final String firstLevelSalt = "first_level_salt_value";
7878
final String idPrefix = "a";
7979
final String idSecret = "m3yMIcbg9vCaFLJsn4m4PfruZnvAZ72OxmFG5QsGMOw=";
@@ -103,14 +103,14 @@ public void loadSaltSingleVersion() throws Exception {
103103
final String effectiveTimeString = String.valueOf(generatedTime.getEpochSecond() * 1000L);
104104
final String refreshFromTimeString = String.valueOf(generatedTime.plus(30, ChronoUnit.DAYS).getEpochSecond() * 1000L);
105105
final String salts =
106-
"1000000," + effectiveTimeString + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeString + ",\n" +
107-
"1000001," + effectiveTimeString + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeString + ",\n" +
108-
"1000002," + effectiveTimeString + ",+a5LPajo7uPfNcc9HH0Tn25b3RnSNZwe8YaAKcyeHaA=," + refreshFromTimeString + ",\n" +
109-
"1000003," + effectiveTimeString + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeString + ",\n" +
110-
"1000004," + effectiveTimeString + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeString + ",\n" +
111-
"1000005," + effectiveTimeString + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeString + ",\n" +
112-
"1000006," + effectiveTimeString + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeString + ",\n" +
113-
"1000007," + effectiveTimeString + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeString + ",";
106+
"1000000," + effectiveTimeString + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeString + ",,,,,,\n" +
107+
"1000001," + effectiveTimeString + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeString + ",,,,,,\n" +
108+
"1000002," + effectiveTimeString + ",+a5LPajo7uPfNcc9HH0Tn25b3RnSNZwe8YaAKcyeHaA=," + refreshFromTimeString + ",,,,,,\n" +
109+
"1000003," + effectiveTimeString + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeString + ",,,,,,\n" +
110+
"1000004," + effectiveTimeString + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeString + ",,,,,,\n" +
111+
"1000005," + effectiveTimeString + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeString + ",,,,,,\n" +
112+
"1000006," + effectiveTimeString + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeString + ",,,,,,\n" +
113+
"1000007," + effectiveTimeString + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeString + ",,,,,,";
114114

115115
when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
116116
.thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
@@ -130,7 +130,7 @@ public void loadSaltSingleVersion() throws Exception {
130130
}
131131

132132
@Test
133-
public void loadSaltSingleVersion1mil() throws Exception {
133+
void loadSaltSingleVersion1mil() throws Exception {
134134
final String firstLevelSalt = "first_level_salt_value";
135135
final String idPrefix = "a";
136136
final String idSecret = "m3yMIcbg9vCaFLJsn4m4PfruZnvAZ72OxmFG5QsGMOw=";
@@ -161,7 +161,7 @@ public void loadSaltSingleVersion1mil() throws Exception {
161161
final String refreshFromTimeString = String.valueOf(generatedTime.plus(30, ChronoUnit.DAYS).getEpochSecond() * 1000L);
162162
StringBuilder salts = new StringBuilder();
163163
for (int i = 0; i < 1000000; i++) {
164-
salts.append(i).append(",").append(effectiveTimeString).append(",").append("currentSalt-string").append(",").append(refreshFromTimeString).append(",").append("\n");
164+
salts.append(i).append(",").append(effectiveTimeString).append(",").append("currentSalt-string").append(",").append(refreshFromTimeString).append(",,,,,,").append("\n");
165165
}
166166

167167
when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
@@ -182,7 +182,7 @@ public void loadSaltSingleVersion1mil() throws Exception {
182182
}
183183

184184
@Test
185-
public void loadSaltMultipleVersions() throws Exception {
185+
void loadSaltMultipleVersions() throws Exception {
186186
final String firstLevelSalt = "first_level_salt_value";
187187
final String idPrefix = "a";
188188
final String idSecret = "m3yMIcbg9vCaFLJsn4m4PfruZnvAZ72OxmFG5QsGMOw=";
@@ -225,25 +225,25 @@ public void loadSaltMultipleVersions() throws Exception {
225225
final String refreshFromTimeStringV2 = String.valueOf(generatedTimeV2.plus(60, ChronoUnit.DAYS).getEpochSecond() * 1000L);
226226

227227
final String saltsV1 =
228-
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV1 + ",\n" +
229-
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV1 + ",\n" +
230-
"1000002," + effectiveTimeStringV1 + ",+a5LPajo7uPfNcc9HH0Tn25b3RnSNZwe8YaAKcyeHaA=," + refreshFromTimeStringV1 + ",\n" +
231-
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV1 + ",\n" +
232-
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV1 + ",\n" +
233-
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV1 + ",\n" +
234-
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV1 + ",\n" +
235-
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV1 + ",";
228+
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV1 + ",,,,,,\n" +
229+
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV1 + ",,,,,,\n" +
230+
"1000002," + effectiveTimeStringV1 + ",+a5LPajo7uPfNcc9HH0Tn25b3RnSNZwe8YaAKcyeHaA=," + refreshFromTimeStringV1 + ",,,,,,\n" +
231+
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV1 + ",,,,,,\n" +
232+
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV1 + ",,,,,,\n" +
233+
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV1 + ",,,,,,\n" +
234+
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV1 + ",,,,,,\n" +
235+
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV1 + ",,,,,,";
236236

237237
// update key 1000002
238238
final String saltsV2 =
239-
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV2 + ",\n" +
240-
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV2 + ",\n" +
241-
"1000002," + effectiveTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=," + refreshFromTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=\n" +
242-
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV2 + ",\n" +
243-
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV2 + ",\n" +
244-
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV2 + ",\n" +
245-
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV2 + ",\n" +
246-
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV2 + ",";
239+
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV2 + ",,,,,,\n" +
240+
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV2 + ",,,,,,\n" +
241+
"1000002," + effectiveTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=," + refreshFromTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=,,,,,\n" +
242+
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV2 + ",,,,,,\n" +
243+
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV2 + ",,,,,,\n" +
244+
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV2 + ",,,,,,\n" +
245+
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV2 + ",,,,,,\n" +
246+
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV2 + ",,,,,,";
247247

248248
when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
249249
.thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
@@ -267,10 +267,10 @@ public void loadSaltMultipleVersions() throws Exception {
267267
}
268268

269269
@Test
270-
public void loadSaltMultipleVersionsExpired() throws Exception {
271-
final String FIRST_LEVEL_SALT = "first_level_salt_value";
272-
final String ID_PREFIX = "a";
273-
final String ID_SECRET = "m3yMIcbg9vCaFLJsn4m4PfruZnvAZ72OxmFG5QsGMOw=";
270+
void loadSaltMultipleVersionsExpired() throws Exception {
271+
final String firstLevelSalt = "first_level_salt_value";
272+
final String idPrefix = "a";
273+
final String idSecret = "m3yMIcbg9vCaFLJsn4m4PfruZnvAZ72OxmFG5QsGMOw=";
274274

275275
final Instant generatedTimeV1 = Instant.now().minus(3, ChronoUnit.DAYS);
276276
final Instant expireTimeV1 = Instant.now().minus(2, ChronoUnit.DAYS);
@@ -281,9 +281,9 @@ public void loadSaltMultipleVersionsExpired() throws Exception {
281281
{
282282
metadataJson.put("version", 2);
283283
metadataJson.put("generated", generatedTimeV1.getEpochSecond() * 1000L);
284-
metadataJson.put("first_level", FIRST_LEVEL_SALT);
285-
metadataJson.put("id_prefix", ID_PREFIX);
286-
metadataJson.put("id_secret", ID_SECRET);
284+
metadataJson.put("first_level", firstLevelSalt);
285+
metadataJson.put("id_prefix", idPrefix);
286+
metadataJson.put("id_secret", idSecret);
287287
final JsonArray saltsRefList = new JsonArray();
288288
{
289289
final JsonObject saltsRef = new JsonObject();
@@ -310,25 +310,25 @@ public void loadSaltMultipleVersionsExpired() throws Exception {
310310
final String refreshFromTimeStringV2 = String.valueOf(generatedTimeV2.plus(60, ChronoUnit.DAYS).getEpochSecond() * 1000L);
311311

312312
final String saltsV1 =
313-
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV1 + ",\n" +
314-
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV1 + ",\n" +
315-
"1000002," + effectiveTimeStringV1 + ",+a5LPajo7uPfNcc9HH0Tn25b3RnSNZwe8YaAKcyeHaA=," + refreshFromTimeStringV1 + ",\n" +
316-
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV1 + ",\n" +
317-
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV1 + ",\n" +
318-
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV1 + ",\n" +
319-
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV1 + ",\n" +
320-
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV1 + ",";
313+
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV1 + ",,,,,,\n" +
314+
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV1 + ",,,,,,\n" +
315+
"1000002," + effectiveTimeStringV1 + ",+a5LPajo7uPfNcc9HH0Tn25b3RnSNZwe8YaAKcyeHaA=," + refreshFromTimeStringV1 + ",,,,,,\n" +
316+
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV1 + ",,,,,,\n" +
317+
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV1 + ",,,,,,\n" +
318+
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV1 + ",,,,,,\n" +
319+
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV1 + ",,,,,,\n" +
320+
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV1 + ",,,,,,";
321321

322322
// update key 1000002
323323
final String saltsV2 =
324-
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV2 + ",\n" +
325-
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV2 + ",\n" +
326-
"1000002," + effectiveTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=," + refreshFromTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=\n" +
327-
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV2 + ",\n" +
328-
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV2 + ",\n" +
329-
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV2 + ",\n" +
330-
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV2 + ",\n" +
331-
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV2 + ",";
324+
"1000000," + effectiveTimeStringV1 + ",y5YitNf/KFtceipDz8nqsFVmBZsK3KY7s8bOVM4gMD4=," + refreshFromTimeStringV2 + ",,,,,,\n" +
325+
"1000001," + effectiveTimeStringV1 + ",z1uBoGyyzgna9i0o/r5eiD/wAhDX/2Q/6zX1p6hsF7I=," + refreshFromTimeStringV2 + ",,,,,,\n" +
326+
"1000002," + effectiveTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=," + refreshFromTimeStringV2 + ",AP73KwZscb1ltQQH/B7fdbHUnMmbJNlRULxzklXUqaA=,,,,,\n" +
327+
"1000003," + effectiveTimeStringV1 + ",wAL6U+lu9gcMhSEySzWG9RQyoo446zAyGWKTW8VVoVw=," + refreshFromTimeStringV2 + ",,,,,,\n" +
328+
"1000004," + effectiveTimeStringV1 + ",eP9ZvW4igLQZ4QfzlyiXgKYFDZgmGOefaKDLEL0zuwE=," + refreshFromTimeStringV2 + ",,,,,,\n" +
329+
"1000005," + effectiveTimeStringV1 + ",UebesrNN0bQkm/QR7Jx7eav+UDXN5Gbq3zs1fLBMRy0=," + refreshFromTimeStringV2 + ",,,,,,\n" +
330+
"1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=," + refreshFromTimeStringV2 + ",,,,,,\n" +
331+
"1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=," + refreshFromTimeStringV2 + ",,,,,,";
332332

333333
when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
334334
.thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
@@ -345,7 +345,7 @@ public void loadSaltMultipleVersionsExpired() throws Exception {
345345
assertEquals(2, saltsProvider.getVersion(loadedMetadata));
346346

347347
final ISaltProvider.ISaltSnapshot snapshot = saltsProvider.getSnapshot(Instant.now());
348-
assertEquals(FIRST_LEVEL_SALT, snapshot.getFirstLevelSalt());
348+
assertEquals(firstLevelSalt, snapshot.getFirstLevelSalt());
349349
assertTrue(snapshot.getModifiedSince(Instant.now().minus(1, ChronoUnit.HOURS)).isEmpty());
350350
assertEquals(1, snapshot.getModifiedSince(Instant.now().minus(49, ChronoUnit.HOURS)).size());
351351
assertEquals(1000002, snapshot.getModifiedSince(Instant.now().minus(49, ChronoUnit.HOURS)).getFirst().id());

0 commit comments

Comments
 (0)