Merge pull request #3272 from gbarbon/fix-KapuaLifeCycleConverterTest

Fixed KapuaLifeCycleConverterTest (JUnit tests)
eclipse-kapua · Mar 12, 2021 · f6ac4d3 · f6ac4d3
2 parents 3389a91 + e6e92fe
commit f6ac4d3
Show file tree

Hide file tree

Showing 9 changed files with 197 additions and 117 deletions.
diff --git a/...va/org/eclipse/kapua/broker/core/converter/DeviceManagementNotificationConverterTest.java b/...va/org/eclipse/kapua/broker/core/converter/DeviceManagementNotificationConverterTest.java
@@ -24,6 +24,7 @@
 import org.eclipse.kapua.broker.core.plugin.ConnectorDescriptor;
 import org.eclipse.kapua.broker.core.plugin.ConnectorDescriptorProvider;
 import org.eclipse.kapua.broker.core.plugin.ConnectorDescriptorProviders;
+import org.eclipse.kapua.broker.core.utils.Utils;
 import org.eclipse.kapua.commons.metric.MetricServiceFactory;
 import org.eclipse.kapua.message.KapuaMessage;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -34,6 +35,7 @@
 import org.eclipse.kapua.transport.message.jms.JmsPayload;
 import org.eclipse.kapua.transport.message.jms.JmsTopic;
 import org.hamcrest.core.IsInstanceOf;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,6 +70,7 @@ public void initialize() throws TranslateException {
         exchange = Mockito.mock(Exchange.class);
         camelKapuaMessage = Mockito.mock(CamelKapuaMessage.class);
         converterDeviceManagementNotificationMessage = MetricServiceFactory.getInstance().getCounter(ConverterMetrics.METRIC_MODULE_NAME, ConverterMetrics.METRIC_COMPONENT_NAME, ConverterMetrics.METRIC_KAPUA_MESSAGE, ConverterMetrics.METRIC_MESSAGES, ConverterMetrics.METRIC_NOTIFY, ConverterMetrics.METRIC_COUNT);
+        Utils.initCounter(converterDeviceManagementNotificationMessage);
         provider = ConnectorDescriptorProviders.getInstance();
         connectorDescriptor = provider.getDescriptor("foo");
         connectorDescriptorBytes = SerializationUtils.serialize(connectorDescriptor);
@@ -87,6 +90,11 @@ public void initialize() throws TranslateException {
         messageKapua = translator2.translate(jmsMessage);
     }
 
+    @After
+    public void tearDown() {
+        Utils.initCounter(converterDeviceManagementNotificationMessage);
+    }
+
     @Test
     public void convertToManagementNotificationNullTest() {
         assertEquals("Expected and actual values should be the same.", 0L, converterDeviceManagementNotificationMessage.getCount());
@@ -98,7 +106,6 @@ public void convertToManagementNotificationNullTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -112,7 +119,6 @@ public void convertToManagementNotificationNullExchangeTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -128,7 +134,6 @@ public void convertToManagementNotificationNullValueTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -164,7 +169,6 @@ public void convertToManagementNotificationOnExceptionNullTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -177,7 +181,6 @@ public void convertToManagementNotificationOnExceptionNullExchangeTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -193,7 +196,6 @@ public void convertToManagementNotificationOnExceptionNullObjectTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -206,7 +208,6 @@ public void convertToManagementNotificationOnExceptionCamelMessageTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
 
     @Test
@@ -230,6 +231,5 @@ public void convertToManagementNotificationOnExceptionObjectMessageTest() throws
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDeviceManagementNotificationMessage.getCount());
 
-        converterDeviceManagementNotificationMessage.dec();
     }
-}
+}
diff --git a/...er/core/src/test/java/org/eclipse/kapua/broker/core/converter/KapuaDataConverterTest.java b/...er/core/src/test/java/org/eclipse/kapua/broker/core/converter/KapuaDataConverterTest.java
@@ -25,6 +25,7 @@
 import org.eclipse.kapua.broker.core.plugin.ConnectorDescriptor;
 import org.eclipse.kapua.broker.core.plugin.ConnectorDescriptorProvider;
 import org.eclipse.kapua.broker.core.plugin.ConnectorDescriptorProviders;
+import org.eclipse.kapua.broker.core.utils.Utils;
 import org.eclipse.kapua.commons.metric.MetricServiceFactory;
 import org.eclipse.kapua.message.KapuaMessage;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -35,6 +36,7 @@
 import org.eclipse.kapua.transport.message.jms.JmsPayload;
 import org.eclipse.kapua.transport.message.jms.JmsTopic;
 import org.hamcrest.core.IsInstanceOf;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,6 +75,7 @@ public void initialize() throws TranslateException {
         kapuaDataConverter = new KapuaDataConverter();
         message = Mockito.mock(Message.class);
         converterDataMessage = MetricServiceFactory.getInstance().getCounter(ConverterMetrics.METRIC_MODULE_NAME, ConverterMetrics.METRIC_COMPONENT_NAME, ConverterMetrics.METRIC_KAPUA_MESSAGE, ConverterMetrics.METRIC_MESSAGES, ConverterMetrics.METRIC_DATA, ConverterMetrics.METRIC_COUNT);
+        Utils.initCounter(converterDataMessage);
         provider = ConnectorDescriptorProviders.getInstance();
         connectorDescriptor = provider.getDescriptor("foo");
         connectorDescriptorBytes = SerializationUtils.serialize(connectorDescriptor);
@@ -92,6 +95,11 @@ public void initialize() throws TranslateException {
         translator2.translate(jmsMessage);
     }
 
+    @After
+    public void tearDown() {
+        Utils.initCounter(converterDataMessage);
+    }
+
     @Test
     public void convertToDataNullTest() {
         assertEquals("Expected and actual values should be the same.", 0L, converterDataMessage.getCount());
@@ -102,7 +110,6 @@ public void convertToDataNullTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -115,7 +122,6 @@ public void convertToDataNullExchangeTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -130,7 +136,6 @@ public void convertToNullValueData() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -154,7 +159,6 @@ public void convertToDataTest() throws KapuaException {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -169,7 +173,6 @@ public void convertToDataObjectValueTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -182,7 +185,6 @@ public void convertToDataOnExceptionNullTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -195,7 +197,6 @@ public void convertToDataOnExceptionNullExchangeTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -210,7 +211,6 @@ public void convertToDataOnExceptionNullValueData() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -220,7 +220,6 @@ public void convertToDataOnExceptionEmptyDatastoreIdTest() throws KapuaException
         assertNull("Null expected.", kapuaDataConverter.convertToDataOnException(exchange, camelKapuaMessage).getDatastoreId());
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -231,7 +230,6 @@ public void convertToDataOnExceptionCamelKapuaMessageValueTest() throws KapuaExc
         assertEquals("Expected and actual values should be the same.", "message", kapuaDataConverter.convertToDataOnException(exchange, camelKapuaMessage).getDatastoreId());
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -246,7 +244,6 @@ public void convertToDataOnExceptionObjectValueTest() {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
 
     @Test
@@ -270,6 +267,5 @@ public void convertToDataOnExceptionTest() throws KapuaException {
         }
         assertEquals("Expected and actual values should be the same.", 1L, converterDataMessage.getCount());
 
-        converterDataMessage.dec();
     }
-}
+}