User seperate ports for rabbitmq source sink integration tests (apach…

…e#9879) Co-authored-by: Ali Ahmed <[email protected]>
Jhanay · Mar 11, 2021 · d09dd9b · d09dd9b
1 parent 96c1402
commit d09dd9b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/RabbitMQBrokerManager.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/RabbitMQBrokerManager.java
@@ -28,20 +28,18 @@
 
 public class RabbitMQBrokerManager {
 
-    private final String PORT = "5672";
     private final Broker broker = new Broker();
 
-
-    public void startBroker() throws Exception {
-        BrokerOptions brokerOptions = getBrokerOptions();
+    public void startBroker(String port) throws Exception {
+        BrokerOptions brokerOptions = getBrokerOptions(port);
         broker.startup(brokerOptions);
     }
 
     public void stopBroker() {
         broker.shutdown();
     }
 
-    BrokerOptions getBrokerOptions() throws Exception {
+    BrokerOptions getBrokerOptions(String port) throws Exception {
         Path tmpFolder = Files.createTempDirectory("qpidWork");
         Path homeFolder = Files.createTempDirectory("qpidHome");
         File etc = new File(homeFolder.toFile(), "etc");
@@ -53,7 +51,7 @@ BrokerOptions getBrokerOptions() throws Exception {
         BrokerOptions brokerOptions = new BrokerOptions();
 
         brokerOptions.setConfigProperty("qpid.work_dir", tmpFolder.toAbsolutePath().toString());
-        brokerOptions.setConfigProperty("qpid.amqp_port", PORT);
+        brokerOptions.setConfigProperty("qpid.amqp_port", port);
         brokerOptions.setConfigProperty("qpid.home_dir", homeFolder.toAbsolutePath().toString());
         String configPath = getFile("qpid.json").getAbsolutePath();
         brokerOptions.setInitialConfigurationLocation(configPath);

diff --git a/...-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkConfigTest.java b/...-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkConfigTest.java
@@ -40,7 +40,7 @@ public final void loadFromYamlFileTest() throws IOException {
         RabbitMQSinkConfig config = RabbitMQSinkConfig.load(path);
         assertNotNull(config);
         assertEquals("localhost", config.getHost());
-        assertEquals(Integer.parseInt("5672"), config.getPort());
+        assertEquals(Integer.parseInt("5673"), config.getPort());
         assertEquals("/", config.getVirtualHost());
         assertEquals("guest", config.getUsername());
         assertEquals("guest", config.getPassword());
@@ -58,7 +58,7 @@ public final void loadFromYamlFileTest() throws IOException {
     public final void loadFromMapTest() throws IOException {
         Map<String, Object> map = new HashMap<>();
         map.put("host", "localhost");
-        map.put("port", "5672");
+        map.put("port", "5673");
         map.put("virtualHost", "/");
         map.put("username", "guest");
         map.put("password", "guest");
@@ -74,7 +74,7 @@ public final void loadFromMapTest() throws IOException {
         RabbitMQSinkConfig config = RabbitMQSinkConfig.load(map);
         assertNotNull(config);
         assertEquals("localhost", config.getHost());
-        assertEquals(Integer.parseInt("5672"), config.getPort());
+        assertEquals(Integer.parseInt("5673"), config.getPort());
         assertEquals("/", config.getVirtualHost());
         assertEquals("guest", config.getUsername());
         assertEquals("guest", config.getPassword());
@@ -92,7 +92,7 @@ public final void loadFromMapTest() throws IOException {
     public final void validValidateTest() throws IOException {
         Map<String, Object> map = new HashMap<>();
         map.put("host", "localhost");
-        map.put("port", "5672");
+        map.put("port", "5673");
         map.put("virtualHost", "/");
         map.put("username", "guest");
         map.put("password", "guest");
@@ -114,7 +114,7 @@ public final void validValidateTest() throws IOException {
     public final void missingExchangeValidateTest() throws IOException {
         Map<String, Object> map = new HashMap<>();
         map.put("host", "localhost");
-        map.put("port", "5672");
+        map.put("port", "5673");
         map.put("virtualHost", "/");
         map.put("username", "guest");
         map.put("password", "guest");

diff --git a/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java b/pulsar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/sink/RabbitMQSinkTest.java
@@ -37,19 +37,19 @@ public class RabbitMQSinkTest {
     @BeforeMethod
     public void setUp() throws Exception {
         rabbitMQBrokerManager = new RabbitMQBrokerManager();
-        rabbitMQBrokerManager.startBroker();
+        rabbitMQBrokerManager.startBroker("5673");
     }
 
     @AfterMethod(alwaysRun = true)
-    public void tearDown() throws Exception {
+    public void tearDown() {
         rabbitMQBrokerManager.stopBroker();
     }
 
     @Test
     public void TestOpenAndWriteSink() throws Exception {
         Map<String, Object> configs = new HashMap<>();
         configs.put("host", "localhost");
-        configs.put("port", "5672");
+        configs.put("port", "5673");
         configs.put("virtualHost", "default");
         configs.put("username", "guest");
         configs.put("password", "guest");

diff --git a/...rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceConfigTest.java b/...rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceConfigTest.java
@@ -27,6 +27,7 @@
 import java.util.Map;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 
 /**
@@ -52,8 +53,8 @@ public final void loadFromYamlFileTest() throws IOException {
         assertEquals(Integer.parseInt("10000"), config.getHandshakeTimeout());
         assertEquals(Integer.parseInt("60"), config.getRequestedHeartbeat());
         assertEquals(Integer.parseInt("0"), config.getPrefetchCount());
-        assertEquals(Boolean.parseBoolean("false"), config.isPrefetchGlobal());
-        assertEquals(Boolean.parseBoolean("false"), config.isPassive());
+        assertFalse(config.isPrefetchGlobal());
+        assertFalse(config.isPassive());
     }
 
     @Test
@@ -90,9 +91,9 @@ public final void loadFromMapTest() throws IOException {
         assertEquals(Integer.parseInt("10000"), config.getHandshakeTimeout());
         assertEquals(Integer.parseInt("60"), config.getRequestedHeartbeat());
         assertEquals(Integer.parseInt("0"), config.getPrefetchCount());
-        assertEquals(Boolean.parseBoolean("false"), config.isPrefetchGlobal());
-        assertEquals(Boolean.parseBoolean("false"), config.isPrefetchGlobal());
-        assertEquals(Boolean.parseBoolean("true"), config.isPassive());
+        assertEquals(false, config.isPrefetchGlobal());
+        assertEquals(false, config.isPrefetchGlobal());
+        assertEquals(true, config.isPassive());
     }
 
     @Test

diff --git a/...ar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceTest.java b/...ar-io/rabbitmq/src/test/java/org/apache/pulsar/io/rabbitmq/source/RabbitMQSourceTest.java
@@ -35,16 +35,16 @@ public class RabbitMQSourceTest {
     @BeforeMethod
     public void setUp() throws Exception {
         rabbitMQBrokerManager = new RabbitMQBrokerManager();
-        rabbitMQBrokerManager.startBroker();
+        rabbitMQBrokerManager.startBroker("5672");
     }
 
     @AfterMethod(alwaysRun = true)
-    public void tearDown() throws Exception {
+    public void tearDown() {
         rabbitMQBrokerManager.stopBroker();
     }
 
     @Test
-    public void TestOpenAndWriteSink() throws Exception {
+    public void TestOpenAndWriteSink() {
         Map<String, Object> configs = new HashMap<>();
         configs.put("host", "localhost");
         configs.put("port", "5672");

diff --git a/pulsar-io/rabbitmq/src/test/resources/sinkConfig.yaml b/pulsar-io/rabbitmq/src/test/resources/sinkConfig.yaml
@@ -19,7 +19,7 @@
 
 {
 "host": "localhost",
-"port": "5672",
+"port": "5673",
 "virtualHost": "/",
 "username": "guest",
 "password": "guest",