Skip to content

Commit

Permalink
Fix keyring.childrenKeyrings->keyring.childKeyrings after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Cioc committed Aug 13, 2020
1 parent 664495b commit 186b6e2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
20 changes: 10 additions & 10 deletions .../java/com/amazonaws/encryptionsdk/keyrings/AwsKmsSymmetricMultiCmkKeyringBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ void testBuildFullyConfigured() {
.build();

assertNotNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(4, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(4, keyring.childKeyrings.size());

verify(daoBuilder, times(REGIONS.size())).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(REGIONS.size())).credentialsProvider(credentialsProvider);
Expand All @@ -96,8 +96,8 @@ void testBuildNoGenerator() {
.build();

assertNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(4, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(4, keyring.childKeyrings.size());

verify(daoBuilder, times(REGIONS.size())).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(REGIONS.size())).credentialsProvider(credentialsProvider);
Expand All @@ -117,8 +117,8 @@ void testBuildNoChildren() {
.build();

assertNotNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(0, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(0, keyring.childKeyrings.size());

verify(daoBuilder, times(1)).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(1)).credentialsProvider(credentialsProvider);
Expand All @@ -139,8 +139,8 @@ void testBuildNullKeyNames() {
.build();

assertNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(1, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(1, keyring.childKeyrings.size());

verify(daoBuilder, times(1)).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(1)).credentialsProvider(credentialsProvider);
Expand All @@ -166,8 +166,8 @@ void testBuildNoCustomization() {
.build();

assertNotNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(4, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(4, keyring.childKeyrings.size());

verify(daoBuilder, times(REGIONS.size())).clientConfiguration(null);
verify(daoBuilder, times(REGIONS.size())).credentialsProvider(null);
Expand Down
16 changes: 8 additions & 8 deletions ...azonaws/encryptionsdk/keyrings/AwsKmsSymmetricMultiRegionDiscoveryKeyringBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ void testBuildFullyConfigured() {
.build();

assertNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(2, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(2, keyring.childKeyrings.size());

verify(daoBuilder, times(REGIONS.size())).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(REGIONS.size())).credentialsProvider(credentialsProvider);
Expand All @@ -78,9 +78,9 @@ void testBuildMultipleSameRegion() {
.build();

assertNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertNotNull(keyring.childKeyrings);
// Regions are not de-duplicated
assertEquals(3, keyring.childrenKeyrings.size());
assertEquals(3, keyring.childKeyrings.size());

verify(daoBuilder, times(2)).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(2)).credentialsProvider(credentialsProvider);
Expand All @@ -99,8 +99,8 @@ void testBuildEmptyAndNullRegions() {
.build();

assertNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(2, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(2, keyring.childKeyrings.size());

verify(daoBuilder, times(2)).clientConfiguration(clientConfiguration);
verify(daoBuilder, times(2)).credentialsProvider(credentialsProvider);
Expand Down Expand Up @@ -130,8 +130,8 @@ void testBuildNoCustomization() {
.build();

assertNull(keyring.generatorKeyring);
assertNotNull(keyring.childrenKeyrings);
assertEquals(2, keyring.childrenKeyrings.size());
assertNotNull(keyring.childKeyrings);
assertEquals(2, keyring.childKeyrings.size());

verify(daoBuilder, times(REGIONS.size())).clientConfiguration(null);
verify(daoBuilder, times(REGIONS.size())).credentialsProvider(null);
Expand Down

0 comments on commit 186b6e2

Please sign in to comment.