From 57e0b9515483ec0c268416400e9fd69d35271665 Mon Sep 17 00:00:00 2001
From: Baodi Shi <baodi@apache.org>
Date: Thu, 7 Sep 2023 16:58:31 +0800
Subject: [PATCH] Fix integration test. (#697)

---
 pom.xml                                              |  2 +-
 .../ecosystem/io/amqp/tests/IntegrationTest.java     | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 911e74d5..717ee87f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <junit.version>4.13.1</junit.version>
     <mockito.version>2.22.0</mockito.version>
     <powermock.version>2.0.0-beta.5</powermock.version>
-    <testcontainers.version>1.15.2</testcontainers.version>
+    <testcontainers.version>1.19.0</testcontainers.version>
     <awaitility.version>4.2.0</awaitility.version>
 
     <!-- build plugin dependencies -->
diff --git a/tests/src/test/java/org/apache/pulsar/ecosystem/io/amqp/tests/IntegrationTest.java b/tests/src/test/java/org/apache/pulsar/ecosystem/io/amqp/tests/IntegrationTest.java
index 37c34874..d1982fd5 100644
--- a/tests/src/test/java/org/apache/pulsar/ecosystem/io/amqp/tests/IntegrationTest.java
+++ b/tests/src/test/java/org/apache/pulsar/ecosystem/io/amqp/tests/IntegrationTest.java
@@ -46,8 +46,6 @@
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.Network;
-import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
-import org.testcontainers.shaded.com.fasterxml.jackson.databind.node.ObjectNode;
 
 
 /**
@@ -109,15 +107,9 @@ private void test(String sourceConfigYaml) throws Exception {
         waitForConnectorRunning(standaloneContainer, true, "amqp1_0-source");
         log.info("amqp1_0 source is running");
 
-        ObjectMapper objectMapper = new ObjectMapper();
-        ObjectNode objectNode = objectMapper.createObjectNode();
-        objectNode.put("user-op-queue-topic", "org.apache.pulsar.client.impl.schema.ByteBufferSchema");
-
         execResult = standaloneContainer.execInContainer(
                 "/pulsar/bin/pulsar-admin",
                 "sinks", "create",
-                "--custom-schema-inputs",
-                objectNode.toString(),
                 "--sink-config-file",
                 "/pulsar/amqp1_0-sink-config.yaml"
                 );
@@ -136,6 +128,10 @@ private void test(String sourceConfigYaml) throws Exception {
                 .atMost(30, TimeUnit.SECONDS)
                 .until(testSuccess::get);
         log.info("Finish the integration test.");
+
+        network.close();
+        standaloneContainer.close();
+        solaceContainer.close();
     }
 
     private void generateData(int count, String remoteUri) {