From 813916a2c1755766f9df64eed30f0088b2536dea Mon Sep 17 00:00:00 2001 From: Sahil Palvia Date: Tue, 15 Aug 2017 11:37:15 -0700 Subject: [PATCH] Losing the leases correctly instead of updating them multiple times to lose it. --- .../kinesis/leases/impl/LeaseIntegrationTest.java | 5 ----- .../kinesis/leases/impl/LeaseRenewerIntegrationTest.java | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java b/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java index 7812873d..df235755 100644 --- a/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java +++ b/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseIntegrationTest.java @@ -72,9 +72,4 @@ public class LeaseIntegrationTest { } }; - protected void loseLease(KinesisClientLease lease) throws LeasingException { - // Need to call update 2 times because 1st time would be considered to be spurious update for the lease. - leaseManager.updateLease(lease); - leaseManager.updateLease(lease); - } } diff --git a/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java b/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java index 334dbeb2..e57579ba 100644 --- a/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java +++ b/src/test/java/com/amazonaws/services/kinesis/leases/impl/LeaseRenewerIntegrationTest.java @@ -58,7 +58,7 @@ public class LeaseRenewerIntegrationTest extends LeaseIntegrationTest { KinesisClientLease renewedLease = builder.renewMutateAssert(renewer, "1", "2").get("2"); // lose lease 2 - loseLease(renewedLease); + leaseManager.takeLease(renewedLease, "bar"); builder.renewMutateAssert(renewer, "1"); } @@ -108,7 +108,7 @@ public class LeaseRenewerIntegrationTest extends LeaseIntegrationTest { Assert.assertEquals((Long) 1L, heldLeases.get("2").getLeaseCounter()); // lose lease 2 - loseLease(lease2); + leaseManager.takeLease(lease2, "bar"); // Do another renewal and make sure the copy doesn't change builder.renewMutateAssert(renewer, "1"); @@ -179,7 +179,7 @@ public class LeaseRenewerIntegrationTest extends LeaseIntegrationTest { KinesisClientLease lease = renewer.getCurrentlyHeldLease("1"); // cause lease loss such that the renewer knows the lease has been lost when update is called - loseLease(lease); + leaseManager.takeLease(lease, "bar"); builder.renewMutateAssert(renewer); lease.setCheckpoint(new ExtendedSequenceNumber("new checkpoint")); @@ -198,7 +198,7 @@ public class LeaseRenewerIntegrationTest extends LeaseIntegrationTest { KinesisClientLease lease = renewer.getCurrentlyHeldLease("1"); // cause lease loss such that the renewer knows the lease has been lost when update is called - loseLease(lease); + leaseManager.takeLease(lease, "bar"); builder.renewMutateAssert(renewer); // regain the lease