:fix: importing org.junit.Assert and explicitly referencing its metho…

…ds instead of having test classes extend it Signed-off-by: dseurotech <davide.salvador@eurotech.com>
eclipse · Oct 28, 2022 · a35019f · a35019f
1 parent cd383a0
commit a35019f
Show file tree

Hide file tree

Showing 59 changed files with 926 additions and 872 deletions.
diff --git a/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaChannelTest.java b/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaChannelTest.java
@@ -23,8 +23,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+
 @Category(JUnitTests.class)
-public class KapuaChannelTest extends Assert {
+public class KapuaChannelTest {
 
     KapuaDataChannel kapuaDataChannel;
 
@@ -42,7 +43,7 @@ public void semanticParts() throws Exception {
         kapuaDataChannel.setSemanticParts(semanticParts);
         List<String> getSemanticParts = kapuaDataChannel.getSemanticParts();
 
-        assertEquals(semanticParts, getSemanticParts);
+        Assert.assertEquals(semanticParts, getSemanticParts);
     }
 
     @Test
@@ -54,7 +55,7 @@ public void semanticPartsToString() throws Exception {
         kapuaDataChannel.setSemanticParts(semanticParts);
         String toString = kapuaDataChannel.toString();
 
-        assertEquals("part1/part2/part3", toString);
+        Assert.assertEquals("part1/part2/part3", toString);
     }
 
     @Test
@@ -64,7 +65,7 @@ public void semanticPartsToStringEmpty() throws Exception {
         kapuaDataChannel.setSemanticParts(semanticParts);
         String toString = kapuaDataChannel.toString();
 
-        assertEquals("", toString);
+        Assert.assertEquals("", toString);
     }
 
     @Test
@@ -73,7 +74,7 @@ public void semanticPartsToStringNull() throws Exception {
         kapuaDataChannel.setSemanticParts(null);
         String toString = kapuaDataChannel.toString();
 
-        assertEquals("", toString);
+        Assert.assertEquals("", toString);
     }
 
 }
diff --git a/...nternal/src/test/java/org/eclipse/kapua/message/internal/KapuaDataMessageFactoryTest.java b/...nternal/src/test/java/org/eclipse/kapua/message/internal/KapuaDataMessageFactoryTest.java
@@ -24,8 +24,9 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+
 @Category(JUnitTests.class)
-public class KapuaDataMessageFactoryTest extends Assert {
+public class KapuaDataMessageFactoryTest {
 
     private KapuaDataMessageFactory kapuaDataMessageFactory;
 
@@ -38,20 +39,20 @@ public void before() throws KapuaException {
     public void newMessage() throws Exception {
         KapuaDataMessage message = kapuaDataMessageFactory.newKapuaDataMessage();
 
-        assertNotNull(message);
+        Assert.assertNotNull(message);
     }
 
     @Test
     public void newChannel() throws Exception {
         KapuaDataChannel channel = kapuaDataMessageFactory.newKapuaDataChannel();
 
-        assertNotNull(channel);
+        Assert.assertNotNull(channel);
     }
 
     @Test
     public void newPayload() throws Exception {
         KapuaDataPayload payload = kapuaDataMessageFactory.newKapuaDataPayload();
 
-        assertNotNull(payload);
+        Assert.assertNotNull(payload);
     }
 }
diff --git a/...ge/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaMessageFactoryTest.java b/...ge/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaMessageFactoryTest.java
@@ -25,8 +25,9 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+
 @Category(JUnitTests.class)
-public class KapuaMessageFactoryTest extends Assert {
+public class KapuaMessageFactoryTest {
 
     private KapuaMessageFactory kapuaMessageFactory;
 
@@ -39,28 +40,28 @@ public void before() throws KapuaException {
     public void newMessage() throws Exception {
         KapuaMessage<?, ?> message = kapuaMessageFactory.newMessage();
 
-        assertNotNull(message);
+        Assert.assertNotNull(message);
     }
 
     @Test
     public void newChannel() throws Exception {
         KapuaChannel channel = kapuaMessageFactory.newChannel();
 
-        assertNotNull(channel);
+        Assert.assertNotNull(channel);
     }
 
     @Test
     public void newPayload() throws Exception {
         KapuaPayload payload = kapuaMessageFactory.newPayload();
 
-        assertNotNull(payload);
+        Assert.assertNotNull(payload);
     }
 
     @Test
     public void newPosition() throws Exception {
         KapuaPosition position = kapuaMessageFactory.newPosition();
 
-        assertNotNull(position);
+        Assert.assertNotNull(position);
     }
 
 }
diff --git a/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaMessageTest.java b/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaMessageTest.java
@@ -33,8 +33,9 @@
 import java.util.Date;
 import java.util.UUID;
 
+
 @Category(JUnitTests.class)
-public class KapuaMessageTest extends Assert {
+public class KapuaMessageTest {
 
     private static final String KAPUA_MESSAGE_XML_STR = "missing";
 
@@ -61,17 +62,17 @@ public void kapuaMessage() throws Exception {
         KapuaMessage<?, ?> kapuaMessage = new KapuaMessageImpl<>(kapuaChannel, kapuaMetrics);
         KapuaMessageUtil.populateKapuaMessage(kapuaMessage, referenceDate);
 
-        assertEquals(UUID.fromString("11111111-2222-3333-4444-555555555555"), kapuaMessage.getId());
-        assertEquals(new KapuaEid(BigInteger.ONE), kapuaMessage.getScopeId());
-        assertEquals(new KapuaEid(BigInteger.ONE), kapuaMessage.getDeviceId());
-        assertEquals(receivedDate, kapuaMessage.getReceivedOn());
-        assertEquals(sentDate, kapuaMessage.getSentOn());
-        assertEquals(capturedDate, kapuaMessage.getCapturedOn());
+        Assert.assertEquals(UUID.fromString("11111111-2222-3333-4444-555555555555"), kapuaMessage.getId());
+        Assert.assertEquals(new KapuaEid(BigInteger.ONE), kapuaMessage.getScopeId());
+        Assert.assertEquals(new KapuaEid(BigInteger.ONE), kapuaMessage.getDeviceId());
+        Assert.assertEquals(receivedDate, kapuaMessage.getReceivedOn());
+        Assert.assertEquals(sentDate, kapuaMessage.getSentOn());
+        Assert.assertEquals(capturedDate, kapuaMessage.getCapturedOn());
         KapuaPosition position = new KapuaPositionImpl();
         KapuaMessageUtil.populatePosition(position, referenceDate);
-        assertEquals(position.toDisplayString(), kapuaMessage.getPosition().toDisplayString());
-        assertEquals(kapuaChannel, kapuaMessage.getChannel());
-        assertEquals(kapuaMetrics, kapuaMessage.getPayload());
+        Assert.assertEquals(position.toDisplayString(), kapuaMessage.getPosition().toDisplayString());
+        Assert.assertEquals(kapuaChannel, kapuaMessage.getChannel());
+        Assert.assertEquals(kapuaMetrics, kapuaMessage.getPayload());
     }
 
     @Test
@@ -85,8 +86,8 @@ public void setMessageChannelAndPayload() throws Exception {
         kapuaMessage.setChannel(kapuaChannel);
         kapuaMessage.setPayload(kapuaPayload);
 
-        assertEquals(kapuaChannel, kapuaMessage.getChannel());
-        assertEquals(kapuaPayload, kapuaMessage.getPayload());
+        Assert.assertEquals(kapuaChannel, kapuaMessage.getChannel());
+        Assert.assertEquals(kapuaPayload, kapuaMessage.getPayload());
     }
 
     @Test
@@ -96,7 +97,7 @@ public void messageEquals() throws Exception {
         KapuaMessage<KapuaChannel, KapuaPayload> kapuaMessageSecond = new KapuaMessageImpl<>();
         KapuaMessageUtil.populateKapuaMessage(kapuaMessageSecond, referenceDate);
 
-        assertEquals(0, ((KapuaMessageImpl<KapuaChannel, KapuaPayload>) kapuaMessageFirst).
+        Assert.assertEquals(0, ((KapuaMessageImpl<KapuaChannel, KapuaPayload>) kapuaMessageFirst).
                 compareTo((KapuaMessageImpl<KapuaChannel, KapuaPayload>) kapuaMessageSecond));
     }
 
@@ -113,7 +114,7 @@ public void marshallMessage() throws Exception {
 
         StringWriter strWriter = new StringWriter();
         XmlUtil.marshal(kapuaMessage, strWriter);
-        assertEquals(KAPUA_MESSAGE_XML_STR, strWriter.toString());
+        Assert.assertEquals(KAPUA_MESSAGE_XML_STR, strWriter.toString());
     }
 
 }
diff --git a/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaPayloadTest.java b/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaPayloadTest.java
@@ -24,8 +24,9 @@
 import java.io.StringWriter;
 import java.util.Map;
 
+
 @Category(JUnitTests.class)
-public class KapuaPayloadTest extends Assert {
+public class KapuaPayloadTest {
 
     private static final String PAYLOAD_DISPLAY_STR = "Boolean=true~~Double=42.42~~Float=42.42~~Integer=42~~Long=43~~String=Big brown fox~~byte=Ym9keQA~~unknown=";
 
@@ -38,7 +39,7 @@ public void before() throws Exception {
 
     @Test
     public void neverGetNull() {
-        assertNotNull(new KapuaPayloadImpl().getMetrics());
+        Assert.assertNotNull(new KapuaPayloadImpl().getMetrics());
     }
 
     @Test
@@ -48,15 +49,15 @@ public void payloadGetterSetters() throws Exception {
 
         Map<String, Object> properties = kapuaPayload.getMetrics();
         byte[] body = kapuaPayload.getBody();
-        assertEquals("value1", properties.get("key1"));
-        assertEquals("value2", properties.get("key2"));
-        assertArrayEquals(new byte[]{'b', 'o', 'd', 'y'}, body);
+        Assert.assertEquals("value1", properties.get("key1"));
+        Assert.assertEquals("value2", properties.get("key2"));
+        Assert.assertArrayEquals(new byte[]{'b', 'o', 'd', 'y'}, body);
     }
 
     @Test
     public void displayStringEmpty() throws Exception {
         final KapuaPayload kapuaPayload = new KapuaPayloadImpl();
-        assertEquals("", kapuaPayload.toDisplayString());
+        Assert.assertEquals("", kapuaPayload.toDisplayString());
     }
 
     @Test
@@ -67,7 +68,7 @@ public void displayString() throws Exception {
         kapuaPayload.getMetrics().put("null", null);
 
         String displayStr = kapuaPayload.toDisplayString();
-        assertEquals(PAYLOAD_DISPLAY_STR, displayStr);
+        Assert.assertEquals(PAYLOAD_DISPLAY_STR, displayStr);
     }
 
     @Test
@@ -78,6 +79,6 @@ public void marshallPayload() throws Exception {
 
         StringWriter strWriter = new StringWriter();
         XmlUtil.marshal(kapuaPayload, strWriter);
-        assertEquals(KAPUA_PAYLOAD_XML_STR, strWriter.toString());
+        Assert.assertEquals(KAPUA_PAYLOAD_XML_STR, strWriter.toString());
     }
 }
diff --git a/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaPositionTest.java b/message/internal/src/test/java/org/eclipse/kapua/message/internal/KapuaPositionTest.java
@@ -25,8 +25,9 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
+
 @Category(JUnitTests.class)
-public class KapuaPositionTest extends Assert {
+public class KapuaPositionTest {
 
     private static final String NEWLINE = System.lineSeparator();
 
@@ -67,15 +68,15 @@ public void positionGetterSetters() throws Exception {
         KapuaPosition position = new KapuaPositionImpl();
         KapuaMessageUtil.populatePosition(position, referenceDate);
 
-        assertEquals(Double.valueOf("45.1111"), position.getLongitude());
-        assertEquals(Double.valueOf("15.3333"), position.getLatitude());
-        assertEquals(Double.valueOf("430.3"), position.getAltitude());
-        assertEquals(Double.valueOf("12.0"), position.getPrecision());
-        assertEquals(Double.valueOf("280.0"), position.getHeading());
-        assertEquals(Double.valueOf("60.2"), position.getSpeed());
-        assertNotNull(position.getTimestamp());
-        assertEquals(Integer.valueOf(5), position.getSatellites());
-        assertEquals(Integer.valueOf(4), position.getStatus());
+        Assert.assertEquals(Double.valueOf("45.1111"), position.getLongitude());
+        Assert.assertEquals(Double.valueOf("15.3333"), position.getLatitude());
+        Assert.assertEquals(Double.valueOf("430.3"), position.getAltitude());
+        Assert.assertEquals(Double.valueOf("12.0"), position.getPrecision());
+        Assert.assertEquals(Double.valueOf("280.0"), position.getHeading());
+        Assert.assertEquals(Double.valueOf("60.2"), position.getSpeed());
+        Assert.assertNotNull(position.getTimestamp());
+        Assert.assertEquals(Integer.valueOf(5), position.getSatellites());
+        Assert.assertEquals(Integer.valueOf(4), position.getStatus());
     }
 
     @Test
@@ -84,7 +85,7 @@ public void displayString() throws Exception {
         KapuaMessageUtil.populatePosition(position, referenceDate);
 
         String displayStr = position.toDisplayString();
-        assertTrue("\nExpected: " + POSITION_DISPLAY_STR +
+        Assert.assertTrue("\nExpected: " + POSITION_DISPLAY_STR +
                         "\nActual:   " + displayStr,
                 displayStr.matches(POSITION_DISPLAY_STR));
     }
@@ -94,7 +95,7 @@ public void displayEmptyPositionString() throws Exception {
         KapuaPosition position = new KapuaPositionImpl();
 
         String displayStr = position.toDisplayString();
-        assertNull(displayStr);
+        Assert.assertNull(displayStr);
     }
 
     @Test
@@ -104,6 +105,6 @@ public void marshallPosition() throws Exception {
 
         StringWriter strWriter = new StringWriter();
         XmlUtil.marshal(position, strWriter);
-        assertEquals(POSITION_XML_STR, strWriter.toString());
+        Assert.assertEquals(POSITION_XML_STR, strWriter.toString());
     }
 }
diff --git a/message/internal/src/test/java/org/eclipse/kapua/message/internal/MessageExceptionTest.java b/message/internal/src/test/java/org/eclipse/kapua/message/internal/MessageExceptionTest.java
@@ -18,31 +18,32 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+
 @Category(JUnitTests.class)
-public class MessageExceptionTest extends Assert {
+public class MessageExceptionTest {
 
     @Test
     public void invalidDestinationText() throws Exception {
         MessageException ex = new MessageException(MessageErrorCodes.INVALID_DESTINATION);
         String message = ex.getLocalizedMessage();
 
-        assertEquals("Invalid destination", message);
+        Assert.assertEquals("Invalid destination", message);
     }
 
     @Test
     public void invalidMessageText() throws Exception {
         MessageException ex = new MessageException(MessageErrorCodes.INVALID_MESSAGE);
         String message = ex.getLocalizedMessage();
 
-        assertEquals("Invalid message", message);
+        Assert.assertEquals("Invalid message", message);
     }
 
     @Test
     public void invalidMetricTypeText() throws Exception {
         MessageException ex = new MessageException(MessageErrorCodes.INVALID_METRIC_TYPE, "int");
         String message = ex.getLocalizedMessage();
 
-        assertEquals("Invalid metric type int", message);
+        Assert.assertEquals("Invalid metric type int", message);
     }
 
     @Test
@@ -52,6 +53,6 @@ public void invalidMetricValueText() throws Exception {
                 0);
         String message = ex.getLocalizedMessage();
 
-        assertEquals("Invalid metric value 0", message);
+        Assert.assertEquals("Invalid metric value 0", message);
     }
 }
diff --git a/...nal/src/test/java/org/eclipse/kapua/message/internal/device/data/KapuaDeviceDataTest.java b/...nal/src/test/java/org/eclipse/kapua/message/internal/device/data/KapuaDeviceDataTest.java
@@ -25,8 +25,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+
 @Category(JUnitTests.class)
-public class KapuaDeviceDataTest extends Assert {
+public class KapuaDeviceDataTest {
 
     private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();
     private static final KapuaDataMessageFactory KAPUA_DATA_MESSAGE_FACTORY = LOCATOR.getFactory(KapuaDataMessageFactory.class);
@@ -40,21 +41,21 @@ public void kapuaDataChanneltoString() throws Exception {
         semanticParts.add("part3");
 
         kapuaDataChannel.setSemanticParts(semanticParts);
-        assertEquals("part1/part2/part3", kapuaDataChannel.toString());
+        Assert.assertEquals("part1/part2/part3", kapuaDataChannel.toString());
     }
 
     @Test
     public void kapuaDataMesssageGetterSetters() {
         KapuaDataMessage kapuaDataMessage = KAPUA_DATA_MESSAGE_FACTORY.newKapuaDataMessage();
 
         kapuaDataMessage.setClientId("clientId-1");
-        assertEquals("clientId-1", kapuaDataMessage.getClientId());
+        Assert.assertEquals("clientId-1", kapuaDataMessage.getClientId());
     }
 
     @Test
     public void kapuaDataPayloadDefaultConstructor() {
         KapuaDataPayload kapuaDataPayload = KAPUA_DATA_MESSAGE_FACTORY.newKapuaDataPayload();
 
-        assertNotNull(kapuaDataPayload);
+        Assert.assertNotNull(kapuaDataPayload);
     }
 }