Skip to content

fix: Account for indeterminate Map ordering in unit tests #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Feb 10, 2022
Merged

fix: Account for indeterminate Map ordering in unit tests #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8e1a444
Fixed All Flaky Tests
kaiyaok2 Jan 15, 2022
f13b093
Refactored Code Changes
kaiyaok2 Jan 16, 2022
3cb795b
Deleted Unused Code
kaiyaok2 Jan 16, 2022
687a1b6
Refactor
kaiyaok2 Jan 17, 2022
385f72f
Refactor
kaiyaok2 Jan 18, 2022
b325822
Refactor
kaiyaok2 Jan 18, 2022
67dcb1f
Refactor
kaiyaok2 Jan 18, 2022
072c95e
Refactor
kaiyaok2 Jan 23, 2022
2c45d1f
Refactored Changes after Peer Review
kaiyaok2 Jan 23, 2022
70b45ad
Merge pull request #1 from kaiyaok2/fixed_all_flaky_tests
kaiyaok2 Feb 7, 2022
4c281d4
Merge branch 'master' into master
kaiyaok2 Feb 7, 2022
3e70d9a
Addresses Changes
kaiyaok2 Feb 9, 2022
44be39a
Merge pull request #2 from kaiyaok2/fixed_all_flaky_tests
kaiyaok2 Feb 9, 2022
4cf88ee
Changed Style
kaiyaok2 Feb 9, 2022
dbf848d
Restored Changes
kaiyaok2 Feb 10, 2022
ef7283b
Changed Style
kaiyaok2 Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import javax.crypto.KeyGenerator;
Expand Down Expand Up @@ -198,15 +199,16 @@ public void ensureEncryptedAttributesUnmodified() throws GeneralSecurityExceptio
Map<String, AttributeValue> encryptedAttributes =
encryptor.encryptAllFieldsExcept(
Collections.unmodifiableMap(attribs), context, "hashKey", "rangeKey", "version");
String encryptedString = encryptedAttributes.toString();
// Using TreeMap before casting to string to avoid nondeterministic key orders.
String encryptedString = new TreeMap<>(encryptedAttributes).toString();
encryptor.decryptAllFieldsExcept(
Collections.unmodifiableMap(encryptedAttributes),
context,
"hashKey",
"rangeKey",
"version");

assertEquals(encryptedString, encryptedAttributes.toString());
assertEquals(encryptedString, new TreeMap<>(encryptedAttributes).toString());
}

@Test(expectedExceptions = SignatureException.class)
Expand Down
10 changes: 7 additions & 3 deletions ...com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,13 @@ public void testSimpleMapWithNull() {
marshall(av);
Assert.fail("Unexpected success");
} catch (final NullPointerException npe) {
Assert.assertEquals(
"Encountered null map value for key NullKeyValue while marshalling attribute value {M: {KeyValue={S: ValueValue,}, NullKeyValue=null},}",
npe.getMessage());
// Map entries may permute under nondeterministic Java API
String npeMessage = npe.getMessage();
String common =
"Encountered null map value for key NullKeyValue while marshalling attribute value ";
String case1 = common + "{M: {KeyValue={S: ValueValue,}, NullKeyValue=null},}";
String case2 = common + "{M: {NullKeyValue=null, KeyValue={S: ValueValue,}},}";
Assert.assertTrue(case1.equals(npeMessage) || case2.equals(npeMessage));
}
}

Expand Down