[camel-kafka-connector] 04/05: Improve tests to Add/Remove connector in Catalog through API #573

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 61ba4e1d2e0c48590fda63b0ddc373b300f013e0
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Mon Oct 12 15:07:06 2020 +0200

    Improve tests to Add/Remove connector in Catalog through API #573
    
    Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
 .../catalog/CamelKafkaConnectorCatalogTest.java    | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 98fad46..7c5039a 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.kafkaconnector.catalog;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import java.util.List;
 import java.util.Map;
 
@@ -26,10 +24,13 @@ import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorOptionModel;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 class CamelKafkaConnectorCatalogTest {
 
     static CamelKafkaConnectorCatalog catalog;
-   @BeforeAll
+    
+    @BeforeAll
     public static void createCamelCatalog() {
         catalog = new CamelKafkaConnectorCatalog();
     }
@@ -76,8 +77,12 @@ class CamelKafkaConnectorCatalogTest {
                 + "    }\n"
                 + "}\n");
         
-        assertTrue(catalog.getConnectorsName().contains(connectorName));
-        assertNotNull(catalog.getConnectorsModel().get(connectorName));
+        assertTrue(catalog.getConnectorsName().contains(connectorName), "The new Connector wasn't added in the ConnectorNames list.");
+        assertNotNull(catalog.getConnectorsModel().get(connectorName), "The new Connector wasn't added in the ConnectorModel map.");
+        checkAddedConnectorContainsCorrectPropertyValues(connectorName);
+    }
+
+    private void checkAddedConnectorContainsCorrectPropertyValues(String connectorName) {
         CamelKafkaConnectorOptionModel camelKafkaConnectorOptionModel = catalog.getConnectorsModel().get(connectorName).getOptions().get(0);
         assertEquals("\"false\"", camelKafkaConnectorOptionModel.getDefaultValue());
         assertEquals("camel.component.my-test-connector.demo", camelKafkaConnectorOptionModel.getName());
@@ -100,13 +105,10 @@ class CamelKafkaConnectorCatalogTest {
                 + "    \"properties\": {}\n"
                 + "}\n");
         
-        assertTrue(catalog.getConnectorsName().contains(connectorName));
-        assertNotNull(catalog.getConnectorsModel().get(connectorName));
-        
         catalog.removeConnector(connectorName);
         
-        assertFalse(catalog.getConnectorsName().contains(connectorName));
-        assertNull(catalog.getConnectorsModel().get(connectorName));
+        assertFalse(catalog.getConnectorsName().contains(connectorName), "The connector is still present in ConnectorNames list.");
+        assertNull(catalog.getConnectorsModel().get(connectorName), "The connector model is still present in the ConnectorsModel map.");
     }
 
 }