You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/09/25 14:14:52 UTC
[camel] branch master updated: camel-cm-sms: fix warning about
deprecated methods in test code (#4297)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4927f0b camel-cm-sms: fix warning about deprecated methods in test code (#4297)
4927f0b is described below
commit 4927f0be927c4ff83ebf77528fd25e4d11f06f1b
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Fri Sep 25 16:14:27 2020 +0200
camel-cm-sms: fix warning about deprecated methods in test code (#4297)
---
.../component/cm/test/CMConfigurationTest.java | 12 ++--
.../camel/component/cm/test/CMMessageTest.java | 64 +++++++++++-----------
.../org/apache/camel/component/cm/test/CMTest.java | 3 +-
.../component/cm/test/CamelTestConfiguration.java | 2 +-
.../camel/component/cm/test/SMSMessageTest.java | 30 +++++-----
5 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
index 72bb47b..d688d82 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
@@ -59,7 +59,7 @@ public class CMConfigurationTest {
configuration.setTestConnectionOnStartup(false);
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = validator.validate(configuration);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -75,7 +75,7 @@ public class CMConfigurationTest {
configuration.setTestConnectionOnStartup(false);
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = validator.validate(configuration);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -91,7 +91,7 @@ public class CMConfigurationTest {
configuration.setTestConnectionOnStartup(false);
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = validator.validate(configuration);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -107,7 +107,7 @@ public class CMConfigurationTest {
configuration.setTestConnectionOnStartup(false);
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = validator.validate(configuration);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -121,7 +121,7 @@ public class CMConfigurationTest {
configuration.setTestConnectionOnStartup(false);
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = validator.validate(configuration);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -135,6 +135,6 @@ public class CMConfigurationTest {
configuration.setTestConnectionOnStartup(false);
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = validator.validate(configuration);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
}
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java
index 1e76c37..87af8cb 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMMessageTest.java
@@ -61,8 +61,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 1);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 1, "Call to getMultiparts() should have returned 1");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -77,8 +77,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 1);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 1, "Call to getMultiparts() should have returned 1");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -94,8 +94,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 2);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 2, "Call to getMultiparts() should have returned 2");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -109,8 +109,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 2);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 2, "Call to getMultiparts() should have returned 2");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -124,8 +124,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 2);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 2, "Call to getMultiparts() should have returned 2");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -139,8 +139,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 3);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 3, "Call to getMultiparts() should have returned 3");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -154,8 +154,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 8);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 8, "Call to getMultiparts() should have returned 8");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
@Test
@@ -169,8 +169,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 8);
- Assert.isTrue(!cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 8, "Call to getMultiparts() should have returned 8");
+ Assert.isTrue(!cmMessage.isUnicode(), "Should not be unicode");
}
/*
@@ -192,8 +192,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 1);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 1, "Call to getMultiparts() should have returned 1");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -210,8 +210,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 1);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 1, "Call to getMultiparts() should have returned 1");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -229,8 +229,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 2);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 2, "Call to getMultiparts() should have returned 2");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -246,8 +246,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 2);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 2, "Call to getMultiparts() should have returned 2");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -263,8 +263,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 2);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 2, "Call to getMultiparts() should have returned 2");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -280,8 +280,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 3);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 3, "Call to getMultiparts() should have returned 3");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -297,8 +297,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 8);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 8, "Call to getMultiparts() should have returned 8");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
@Test
@@ -314,8 +314,8 @@ public class CMMessageTest {
final CMMessage cmMessage = new CMMessage(validNumber, message.toString());
cmMessage.setUnicodeAndMultipart(CMConstants.DEFAULT_MULTIPARTS);
- Assert.isTrue(cmMessage.getMultiparts() == 8);
- Assert.isTrue(cmMessage.isUnicode());
+ Assert.isTrue(cmMessage.getMultiparts() == 8, "Call to getMultiparts() should have returned 8");
+ Assert.isTrue(cmMessage.isUnicode(), "Should have been unicode");
}
}
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
index 01d9973..2e1b842 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
@@ -330,7 +330,8 @@ public class CMTest {
// Change sending strategy
CMEndpoint endpoint
= (CMEndpoint) camelContext.getEndpoint(applicationContext.getBean(CamelTestConfiguration.class).getUri());
- Assert.isTrue(endpoint.getHost().equals(applicationContext.getEnvironment().getRequiredProperty("cm.url")));
+ Assert.isTrue(endpoint.getHost().equals(applicationContext.getEnvironment().getRequiredProperty("cm.url")),
+ "Endpoint host and environment property do not match");
}
@Test
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java
index d0ca68c..96a5dcb 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CamelTestConfiguration.java
@@ -44,7 +44,7 @@ public class CamelTestConfiguration extends SingleRouteCamelConfiguration {
@Override
public void configure() throws Exception {
- Assert.hasLength(uri);
+ Assert.hasLength(uri, "The URI string should not be empty or null");
log.debug("CM Component is an URI based component\nCM URI: {}", uri);
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
index 70aad38..30950a6 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
@@ -60,12 +60,12 @@ public class SMSMessageTest {
// Coverage ;)
SMSMessage message = new SMSMessage(null, null);
- Assert.isNull(message.getMessage());
- Assert.isNull(message.getPhoneNumber());
+ Assert.isNull(message.getMessage(), "SMS message should be null");
+ Assert.isNull(message.getPhoneNumber(), "Number null have been null");
message = new SMSMessage("idAsString", null, null, "MySelf");
- Assert.isTrue(message.getId().equals("idAsString"));
- Assert.isTrue(message.getFrom().equals("MySelf"));
+ Assert.isTrue(message.getId().equals("idAsString"), "Unexpected id");
+ Assert.isTrue(message.getFrom().equals("MySelf"), "Unexpected from");
}
@Test
@@ -74,7 +74,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage(null, validNumber);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -83,7 +83,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("Hello world!", null);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -94,7 +94,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("idAsString", "Hello World", validNumber, dynamicFrom);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -105,7 +105,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("idAsString", "Hello World", validNumber, zeroLengthDynamicFrom);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -116,7 +116,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage(idAsString, "Hello World", validNumber, "MySelf");
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -127,7 +127,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage(zeroLengthIdAsString, "Hello World", validNumber, "MySelf");
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -137,7 +137,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("Hello world!", phoneNumber);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -146,7 +146,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("Hello world!", validNumber);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(0 == constraintViolations.size());
+ Assert.isTrue(0 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -156,7 +156,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("Hello world!", phoneNumber);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -167,7 +167,7 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("Hello world!", phoneNumber);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
@Test
@@ -177,6 +177,6 @@ public class SMSMessageTest {
final SMSMessage m = new SMSMessage("Hello world!", phoneNumber);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = validator.validate(m);
- Assert.isTrue(1 == constraintViolations.size());
+ Assert.isTrue(1 == constraintViolations.size(), "Unexpected number of constraint violations");
}
}