You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ni...@apache.org on 2022/05/11 17:06:30 UTC
[pulsar] branch branch-2.10 updated: [fix][tests] Add alwaysRun=true in some @Before* TestNG annotations (#15510)
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 967fdf6e827 [fix][tests] Add alwaysRun=true in some @Before* TestNG annotations (#15510)
967fdf6e827 is described below
commit 967fdf6e827344a9cd896424a10f158fda8f6696
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Wed May 11 16:57:45 2022 +0200
[fix][tests] Add alwaysRun=true in some @Before* TestNG annotations (#15510)
(cherry picked from commit b7912dfeae68106aa5b903d2a9831ae073d5023a)
---
.../pulsar/broker/service/PersistentTopicTest.java | 3 +--
.../org/apache/pulsar/broker/service/ServerCnxTest.java | 16 +++++++++++-----
.../pulsar/client/impl/ConsumerAckResponseTest.java | 5 +++--
.../pulsar/client/impl/ConsumerBuilderImplTest.java | 4 ++--
.../pulsar/client/impl/PartitionedProducerImplTest.java | 4 ++--
.../pulsar/client/impl/ProducerBuilderImplTest.java | 2 +-
.../pulsar/functions/instance/ContextImplTest.java | 5 +++--
.../worker/FunctionMetaDataTopicTailerTest.java | 14 +++++++-------
8 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
index 6c8b4d5f334..b75cffde81e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
@@ -164,13 +164,12 @@ public class PersistentTopicTest extends MockedBookKeeperTestCase {
final String failTopicName = "persistent://prop/use/ns-abc/failTopic";
final String successSubName = "successSub";
final String successSubName2 = "successSub2";
- final String successSubName3 = "successSub3";
private static final Logger log = LoggerFactory.getLogger(PersistentTopicTest.class);
private OrderedExecutor executor;
private EventLoopGroup eventLoopGroup;
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setup() throws Exception {
eventLoopGroup = new NioEventLoopGroup();
executor = OrderedExecutor.newBuilder().numThreads(1).build();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
index 7fee656e7aa..1772581baf5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
@@ -143,12 +143,12 @@ public class ServerCnxTest {
private final String nonExistentTopicName = "persistent://nonexistent-prop/nonexistent-cluster/nonexistent-namespace/successNonExistentTopic";
private final String topicWithNonLocalCluster = "persistent://prop/usw/ns-abc/successTopic";
- private final ManagedLedger ledgerMock = mock(ManagedLedger.class);
- private final ManagedCursor cursorMock = mock(ManagedCursor.class);
+ private ManagedLedger ledgerMock;
+ private ManagedCursor cursorMock;
private OrderedExecutor executor;
private EventLoopGroup eventLoopGroup;
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setup() throws Exception {
eventLoopGroup = new NioEventLoopGroup();
executor = OrderedExecutor.newBuilder().numThreads(1).build();
@@ -206,8 +206,12 @@ public class ServerCnxTest {
@AfterMethod(alwaysRun = true)
public void teardown() throws Exception {
- serverCnx.close();
- channel.close();
+ if (serverCnx != null) {
+ serverCnx.close();
+ }
+ if (channel != null) {
+ channel.close();
+ }
pulsar.close();
brokerService.close();
executor.shutdownNow();
@@ -1599,6 +1603,8 @@ public class ServerCnxTest {
}
private void setupMLAsyncCallbackMocks() {
+ ledgerMock = mock(ManagedLedger.class);
+ cursorMock = mock(ManagedCursor.class);
doReturn(new ArrayList<Object>()).when(ledgerMock).getCursors();
// call openLedgerComplete with ledgerMock on ML factory asyncOpen
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
index 698186539b3..f86bbabdd88 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ConsumerAckResponseTest.java
@@ -42,12 +42,13 @@ import org.testng.annotations.Test;
@Test(groups = "broker-impl")
public class ConsumerAckResponseTest extends ProducerConsumerBase {
- private static final TransactionImpl transaction = mock(TransactionImpl.class);
+ private TransactionImpl transaction;
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public void setup() throws Exception {
super.internalSetup();
super.producerBaseSetup();
+ transaction = mock(TransactionImpl.class);
doReturn(1L).when(transaction).getTxnIdLeastBits();
doReturn(1L).when(transaction).getTxnIdMostBits();
doReturn(TransactionImpl.State.OPEN).when(transaction).getState();
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
index e875da0907e..a04505ddee1 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
@@ -37,7 +37,7 @@ import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionInitialPosition;
import org.apache.pulsar.client.api.SubscriptionMode;
import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
@@ -48,7 +48,7 @@ public class ConsumerBuilderImplTest {
private static final String TOPIC_NAME = "testTopicName";
private ConsumerBuilderImpl consumerBuilderImpl;
- @BeforeTest
+ @BeforeMethod(alwaysRun = true)
public void setup() {
PulsarClientImpl client = mock(PulsarClientImpl.class);
ConsumerConfigurationData consumerConfigurationData = mock(ConsumerConfigurationData.class);
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
index b45f99d07cc..aceea081070 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PartitionedProducerImplTest.java
@@ -52,7 +52,7 @@ import org.apache.pulsar.client.impl.customroute.PartialRoundRobinMessageRouterI
import org.apache.pulsar.common.api.proto.MessageMetadata;
import org.apache.pulsar.common.util.netty.EventLoopUtil;
import org.assertj.core.util.Sets;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
@@ -67,7 +67,7 @@ public class PartitionedProducerImplTest {
private ProducerInterceptors producerInterceptors;
private CompletableFuture<Producer> producerCreatedFuture;
- @BeforeTest
+ @BeforeMethod(alwaysRun = true)
public void setup() {
client = mock(PulsarClientImpl.class);
schema = mock(Schema.class);
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java
index e964d9cbcc0..30025e684d6 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ProducerBuilderImplTest.java
@@ -49,7 +49,7 @@ public class ProducerBuilderImplTest {
private PulsarClientImpl client;
private ProducerBuilderImpl producerBuilderImpl;
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
public void setup() {
Producer producer = mock(Producer.class);
client = mock(PulsarClientImpl.class);
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java
index 675bc80c050..49bc4161c30 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/ContextImplTest.java
@@ -78,9 +78,9 @@ public class ContextImplTest {
private PulsarClientImpl client;
private PulsarAdmin pulsarAdmin;
private ContextImpl context;
- private Producer producer = mock(Producer.class);
+ private Producer producer;
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setup() throws PulsarClientException {
config = new InstanceConfig();
config.setExposePulsarAdminClientEnabled(true);
@@ -91,6 +91,7 @@ public class ContextImplTest {
logger = mock(Logger.class);
pulsarAdmin = mock(PulsarAdmin.class);
+ producer = mock(Producer.class);
client = mock(PulsarClientImpl.class);
when(client.newProducer()).thenReturn(new ProducerBuilderImpl(client, Schema.BYTES));
when(client.createProducerAsync(any(ProducerConfigurationData.class), any(), any()))
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java
index 775969ced88..713bfc41cb8 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/FunctionMetaDataTopicTailerTest.java
@@ -36,6 +36,7 @@ import org.apache.pulsar.functions.proto.Function.FunctionMetaData;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
@@ -44,14 +45,13 @@ import org.testng.annotations.Test;
@Slf4j
public class FunctionMetaDataTopicTailerTest {
- private static final String TEST_NAME = "test-fmt";
+ private Reader reader;
+ private ReaderBuilder readerBuilder;
+ private FunctionMetaDataManager fsm;
+ private FunctionMetaDataTopicTailer fsc;
- private final Reader reader;
- private final ReaderBuilder readerBuilder;
- private final FunctionMetaDataManager fsm;
- private final FunctionMetaDataTopicTailer fsc;
-
- public FunctionMetaDataTopicTailerTest() throws Exception {
+ @BeforeMethod(alwaysRun = true)
+ public void before() throws Exception {
this.reader = mock(Reader.class);
this.readerBuilder = mock(ReaderBuilder.class);
when(readerBuilder.topic(anyString())).thenReturn(readerBuilder);