From ec259c0e4728d72811ed36718c49c8ea8ae975db Mon Sep 17 00:00:00 2001
From: Sean Mccauliff <smccauli@smccauli-ld2.linkedin.biz>
Date: Thu, 13 Jun 2019 14:29:26 -0700
Subject: [PATCH] Fix build. I forgot to test a merge after a cherry-pick which
 resulted in duplicate test mehods being defined in SenderTest.java :(

---
 .../producer/internals/SenderTest.java        | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java
index 3dc0292503bfd..500893f7897c3 100644
--- a/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/producer/internals/SenderTest.java
@@ -2134,44 +2134,6 @@ public void testExpiredBatchesInMultiplePartitions() throws Exception {
         }
     }
 
-    @Test
-    public void testExpiredBatchesInMultiplePartitions() throws Exception {
-        long deliveryTimeoutMs = 1500L;
-        setupWithTransactionState(null, true, null);
-
-        // Send multiple ProduceRequest across multiple partitions.
-        Future<RecordMetadata> request1 = accumulator.append(tp0, time.milliseconds(), "k1".getBytes(), "v1".getBytes(), null, null, MAX_BLOCK_TIMEOUT).future;
-        Future<RecordMetadata> request2 = accumulator.append(tp1, time.milliseconds(), "k2".getBytes(), "v2".getBytes(), null, null, MAX_BLOCK_TIMEOUT).future;
-
-        // Send request.
-        sender.run(time.milliseconds());
-        assertEquals(1, client.inFlightRequestCount());
-        assertEquals("Expect one in-flight batch in accumulator", 1, sender.inFlightBatches(tp0).size());
-
-        Map<TopicPartition, ProduceResponse.PartitionResponse> responseMap = new HashMap<>();
-        responseMap.put(tp0, new ProduceResponse.PartitionResponse(Errors.NONE, 0L, 0L, 0L));
-        client.respond(new ProduceResponse(responseMap));
-
-        // Successfully expire both batches.
-        time.sleep(deliveryTimeoutMs);
-        sender.run(time.milliseconds());
-        assertEquals("Expect zero in-flight batch in accumulator", 0, sender.inFlightBatches(tp0).size());
-
-        try {
-            request1.get();
-            fail("The expired batch should throw a TimeoutException");
-        } catch (ExecutionException e) {
-            assertTrue(e.getCause() instanceof TimeoutException);
-        }
-
-        try {
-            request2.get();
-            fail("The expired batch should throw a TimeoutException");
-        } catch (ExecutionException e) {
-            assertTrue(e.getCause() instanceof TimeoutException);
-        }
-    }
-
     private class MatchingBufferPool extends BufferPool {
         IdentityHashMap<ByteBuffer, Boolean> allocatedBuffers;
 
@@ -2343,8 +2305,4 @@ private void assertFutureFailure(Future<?> future, Class<? extends Exception> ex
             assertTrue("Unexpected cause " + causeType.getName(), expectedExceptionType.isAssignableFrom(causeType));
         }
     }
-
-    public void removeThisMethod() {
-
-    }
 }