From 270d4e1b55ea091d9f74bfb2676e1d56dd79ba9a Mon Sep 17 00:00:00 2001 From: manisha1997 Date: Tue, 13 May 2025 23:44:15 +0530 Subject: [PATCH 1/6] chore: Update to junit5 and doc upgrades --- examples/BearerTokenAuthentication.md | 50 +++++----- examples/Content.md | 4 +- examples/FetchMessageUsingOAuth.md | 2 +- examples/PreviewMessaging.md | 4 +- pom.xml | 20 +++- src/test/java/com/twilio/Assert.java | 2 +- src/test/java/com/twilio/ClusterTest.java | 27 +++--- src/test/java/com/twilio/TwilioTest.java | 25 ++--- src/test/java/com/twilio/base/ReaderTest.java | 40 ++++---- .../com/twilio/compliance/ComplianceTest.java | 8 +- .../converter/CurrencyDeserializerTest.java | 11 ++- .../twilio/converter/DateConverterTest.java | 52 ++++++----- .../converter/PrefixedCollapsibleMapTest.java | 12 +-- .../com/twilio/converter/PromoterTest.java | 12 +-- .../twilio/exception/ApiExceptionTest.java | 7 +- .../java/com/twilio/http/HttpUtilityTest.java | 6 +- .../twilio/http/NetworkHttpClientTest.java | 15 +-- .../java/com/twilio/http/RequestTest.java | 22 ++--- .../java/com/twilio/http/ResponseTest.java | 13 ++- .../com/twilio/http/TwilioRestClientTest.java | 15 +-- .../com/twilio/http/ValidationClientTest.java | 10 +- .../jwt/accesstoken/AccessTokenTest.java | 92 +++++++++---------- .../jwt/client/ClientCapabilityTest.java | 17 ++-- .../jwt/client/EventStreamScopeTest.java | 8 +- .../jwt/client/IncomingClientScopeTest.java | 8 +- .../jwt/client/OutgoingClientScopeTest.java | 8 +- .../com/twilio/jwt/taskrouter/PolicyTest.java | 8 +- .../jwt/taskrouter/PolicyUtilsTest.java | 9 +- .../taskrouter/TaskRouterCapabilityTest.java | 29 +++--- .../twilio/jwt/taskrouter/UrlUtilsTest.java | 42 +++++---- .../validation/RequestCanonicalizerTest.java | 52 ++++++----- .../jwt/validation/ValidationTokenTest.java | 48 +++++----- .../twilio/security/RequestValidatorTest.java | 37 ++++---- .../taskrouter/WorkflowRuleTargetTest.java | 24 ++--- .../com/twilio/taskrouter/WorkflowTest.java | 23 ++--- .../com/twilio/twiml/FaxResponseTest.java | 28 +++--- .../twilio/twiml/MessagingResponseTest.java | 30 +++--- .../com/twilio/twiml/VoiceResponseTest.java | 31 ++++--- .../com/twilio/twiml/fax/ReceiveTest.java | 24 ++--- .../com/twilio/twiml/messaging/BodyTest.java | 12 ++- .../com/twilio/twiml/messaging/MediaTest.java | 12 ++- .../twilio/twiml/messaging/MessageTest.java | 30 +++--- .../twilio/twiml/messaging/RedirectTest.java | 12 ++- .../twiml/voice/ApplicationSidTest.java | 12 ++- .../twilio/twiml/voice/ApplicationTest.java | 33 +++---- .../com/twilio/twiml/voice/AssistantTest.java | 32 ++++--- .../com/twilio/twiml/voice/AutopilotTest.java | 12 ++- .../com/twilio/twiml/voice/ClientTest.java | 33 +++---- .../twilio/twiml/voice/ConferenceTest.java | 11 +-- .../com/twilio/twiml/voice/ConfigTest.java | 22 ++--- .../com/twilio/twiml/voice/ConnectTest.java | 31 +++---- .../twiml/voice/ConversationRelayTest.java | 30 +++--- .../twilio/twiml/voice/ConversationTest.java | 23 +++-- .../java/com/twilio/twiml/voice/DialTest.java | 31 +++---- .../java/com/twilio/twiml/voice/EchoTest.java | 20 ++-- .../com/twilio/twiml/voice/EnqueueTest.java | 28 +++--- .../com/twilio/twiml/voice/GatherTest.java | 31 +++---- .../com/twilio/twiml/voice/HangupTest.java | 28 +++--- .../com/twilio/twiml/voice/IdentityTest.java | 10 +- .../com/twilio/twiml/voice/LanguageTest.java | 22 ++--- .../com/twilio/twiml/voice/LeaveTest.java | 20 ++-- .../com/twilio/twiml/voice/NumberTest.java | 11 +-- .../com/twilio/twiml/voice/ParameterTest.java | 22 ++--- .../com/twilio/twiml/voice/PauseTest.java | 22 ++--- .../java/com/twilio/twiml/voice/PayTest.java | 31 +++---- .../java/com/twilio/twiml/voice/PlayTest.java | 10 +- .../com/twilio/twiml/voice/PromptTest.java | 31 +++---- .../com/twilio/twiml/voice/QueueTest.java | 10 +- .../com/twilio/twiml/voice/RecordTest.java | 22 ++--- .../com/twilio/twiml/voice/RedirectTest.java | 10 +- .../com/twilio/twiml/voice/ReferSipTest.java | 10 +- .../com/twilio/twiml/voice/ReferTest.java | 28 +++--- .../com/twilio/twiml/voice/RejectTest.java | 30 +++--- .../java/com/twilio/twiml/voice/RoomTest.java | 10 +- .../java/com/twilio/twiml/voice/SayTest.java | 30 +++--- .../java/com/twilio/twiml/voice/SimTest.java | 10 +- .../java/com/twilio/twiml/voice/SipTest.java | 10 +- .../com/twilio/twiml/voice/SiprecTest.java | 30 +++--- .../java/com/twilio/twiml/voice/SmsTest.java | 10 +- .../com/twilio/twiml/voice/SsmlBreakTest.java | 22 ++--- .../twilio/twiml/voice/SsmlEmphasisTest.java | 30 +++--- .../com/twilio/twiml/voice/SsmlLangTest.java | 30 +++--- .../com/twilio/twiml/voice/SsmlPTest.java | 30 +++--- .../twilio/twiml/voice/SsmlPhonemeTest.java | 10 +- .../twilio/twiml/voice/SsmlProsodyTest.java | 30 +++--- .../com/twilio/twiml/voice/SsmlSTest.java | 30 +++--- .../com/twilio/twiml/voice/SsmlSayAsTest.java | 10 +- .../com/twilio/twiml/voice/SsmlSubTest.java | 10 +- .../com/twilio/twiml/voice/SsmlWTest.java | 30 +++--- .../com/twilio/twiml/voice/StartTest.java | 30 +++--- .../java/com/twilio/twiml/voice/StopTest.java | 28 +++--- .../com/twilio/twiml/voice/StreamTest.java | 30 +++--- .../java/com/twilio/twiml/voice/TaskTest.java | 10 +- .../twilio/twiml/voice/TranscriptionTest.java | 30 +++--- .../twilio/twiml/voice/VirtualAgentTest.java | 30 +++--- src/test/java/com/twilio/type/ClientTest.java | 13 +-- .../com/twilio/type/FeedbackIssueTest.java | 10 +- .../java/com/twilio/type/IceServerTest.java | 14 +-- .../com/twilio/type/InboundCallPriceTest.java | 22 ++--- .../com/twilio/type/InboundSmsPriceTest.java | 17 ++-- .../twilio/type/OutboundCallPriceTest.java | 9 +- .../twilio/type/OutboundPrefixPriceTest.java | 12 +-- .../com/twilio/type/OutboundSmsPriceTest.java | 12 +-- .../type/PhoneNumberCapabilitiesTest.java | 18 ++-- .../com/twilio/type/PhoneNumberPriceTest.java | 16 ++-- .../com/twilio/type/RecordingRuleTest.java | 26 +++--- .../com/twilio/type/SubscribeRuleTest.java | 30 +++--- 107 files changed, 1187 insertions(+), 1109 deletions(-) diff --git a/examples/BearerTokenAuthentication.md b/examples/BearerTokenAuthentication.md index 2618436b32..f14840a315 100644 --- a/examples/BearerTokenAuthentication.md +++ b/examples/BearerTokenAuthentication.md @@ -1,26 +1,28 @@ +```java class BearerTokenAuthenticationExamples { - public static void main { - - private static final String GRANT_TYPE = "grant_type_to_be_used"; - private static final String CLIENT_SID = + public static void main { + + private static final String GRANT_TYPE = "grant_type_to_be_used"; + private static final String CLIENT_SID = "client_id_of_the_organization"; - private static final String CLIENT_SECRET = "client_secret_of_organization"; - private static final String ORGANISATION_ID = "id_of_the_organization"; - - //Getting access token - Method #1 - TwilioOrgsTokenAuth.init(GRANT_TYPE, CLIENT_ID, CLIENT_SECRET); - - //Getting access token - Method #2 - //To provide custom token manager implementation - //Need not call init method if customer token manager is passed - //TwilioOrgsTokenAuth.setTokenManager(new CustomTokenManagerImpl(GRANT_TYPE, CLIENT_ID, CLIENT_SECRET)); - - fetchAccountDetails(); - } - - private static void fetchAccountDetails() { - ResourceSet accountSet = Account.reader(ORGANISATION_ID).read(); - String accountSid = accountSet.iterator().next().getAccountSid(); - System.out.println(accountSid); - } - } \ No newline at end of file + private static final String CLIENT_SECRET = "client_secret_of_organization"; + private static final String ORGANISATION_ID = "id_of_the_organization"; + + //Getting access token - Method #1 + TwilioOrgsTokenAuth.init(GRANT_TYPE, CLIENT_ID, CLIENT_SECRET); + + //Getting access token - Method #2 + //To provide custom token manager implementation + //Need not call init method if customer token manager is passed + //TwilioOrgsTokenAuth.setTokenManager(new CustomTokenManagerImpl(GRANT_TYPE, CLIENT_ID, CLIENT_SECRET)); + + fetchAccountDetails(); + } + + private static void fetchAccountDetails() { + ResourceSet accountSet = Account.reader(ORGANISATION_ID).read(); + String accountSid = accountSet.iterator().next().getAccountSid(); + System.out.println(accountSid); + } +} +``` diff --git a/examples/Content.md b/examples/Content.md index b9c7298a4f..d541cd08ab 100644 --- a/examples/Content.md +++ b/examples/Content.md @@ -1,3 +1,4 @@ +```java public class ContentExamples { public static void main { Twilio.init(ACCOUNT_SID, AUTH_TOKEN); @@ -22,4 +23,5 @@ public class ContentExamples { Content newContent = Content.creator(createRequest).create(); } -} \ No newline at end of file +} +``` diff --git a/examples/FetchMessageUsingOAuth.md b/examples/FetchMessageUsingOAuth.md index ec667f1ab0..47c9d639b7 100644 --- a/examples/FetchMessageUsingOAuth.md +++ b/examples/FetchMessageUsingOAuth.md @@ -1,4 +1,4 @@ -``` +```java import com.twilio.Twilio; import com.twilio.credential.ClientCredentialProvider; import com.twilio.rest.api.v2010.account.Message; diff --git a/examples/PreviewMessaging.md b/examples/PreviewMessaging.md index 401ae3231d..86d4ee6c18 100644 --- a/examples/PreviewMessaging.md +++ b/examples/PreviewMessaging.md @@ -1,3 +1,4 @@ +```java class PreviewMessagingExamples { public static void main { Twilio.init(ACCOUNT_SID, AUTH_TOKEN); @@ -25,4 +26,5 @@ class PreviewMessagingExamples { Message message = Message.creator(createMessagesRequest).create(); } -} \ No newline at end of file +} +``` diff --git a/pom.xml b/pom.xml index a74a856267..14295d86d0 100644 --- a/pom.xml +++ b/pom.xml @@ -264,9 +264,21 @@ 1.7.30 - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-engine + 5.12.0 + test + + + org.hamcrest + hamcrest-junit + 2.0.0.0 + test + + + org.mockito + mockito-junit-jupiter + 2.17.0 test @@ -496,4 +508,4 @@ oss-parent 7 - \ No newline at end of file + diff --git a/src/test/java/com/twilio/Assert.java b/src/test/java/com/twilio/Assert.java index 6a03b127a5..7e3069bf74 100644 --- a/src/test/java/com/twilio/Assert.java +++ b/src/test/java/com/twilio/Assert.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class Assert { diff --git a/src/test/java/com/twilio/ClusterTest.java b/src/test/java/com/twilio/ClusterTest.java index 328609a1c5..f53550a473 100644 --- a/src/test/java/com/twilio/ClusterTest.java +++ b/src/test/java/com/twilio/ClusterTest.java @@ -1,8 +1,12 @@ package com.twilio; +import static org.hamcrest.junit.MatcherAssume.assumeThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.twilio.base.Page; import com.twilio.base.bearertoken.ResourceSet; -import com.twilio.credential.ClientCredentialProvider; import com.twilio.http.CustomHttpClient; import com.twilio.http.TwilioRestClient; import com.twilio.rest.api.v2010.account.IncomingPhoneNumber; @@ -14,18 +18,13 @@ import com.twilio.rest.events.v1.Subscription; import com.twilio.rest.previewiam.organizations.Account; import org.hamcrest.CoreMatchers; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ClusterTest { String fromNumber; @@ -38,13 +37,13 @@ public class ClusterTest { String clientSecret; String messageSid; TwilioRestClient customRestClient; - + String accountSid; - @Before + @BeforeEach public void setUp() { // only run when ClusterTest property is passed (mvn test -Dtest="ClusterTest"), skip test run on mvn test - Assume.assumeThat(System.getProperty("Test"), CoreMatchers.is("ClusterTest")); + assumeThat(System.getProperty("Test"), CoreMatchers.is("ClusterTest")); fromNumber = System.getenv("TWILIO_FROM_NUMBER"); toNumber = System.getenv("TWILIO_TO_NUMBER"); String apiKey = System.getenv("TWILIO_API_KEY"); @@ -57,11 +56,11 @@ public void setUp() { orgsClientSecret = System.getenv("TWILIO_ORGS_CLIENT_SECRET"); organisationSid = System.getenv("TWILIO_ORG_SID"); TwilioOrgsTokenAuth.init(grantType, orgsClientId, orgsClientSecret); - + clientId = System.getenv("TWILIO_CLIENT_ID"); clientSecret = System.getenv("TWILIO_CLIENT_SECRET"); messageSid = System.getenv("TWILIO_MESSAGE_SID"); - + // CustomHttpClient customRestClient = new TwilioRestClient.Builder(apiKey, secret).accountSid(accountSid).httpClient(new CustomHttpClient()).build(); } @@ -175,7 +174,7 @@ public void testMultiPartFormData() { // @Test // public void testPublicOAuthFetchMessage() { // Twilio.init(new ClientCredentialProvider(clientId, clientSecret), accountSid); -// // Fetching an existing message; if this test fails, the SID might be deleted, +// // Fetching an existing message; if this test fails, the SID might be deleted, // // in that case, change TWILIO_MESSAGE_SID in twilio-java repo env variables // Message message = Message.fetcher(messageSid).fetch(); // assertNotNull(message); diff --git a/src/test/java/com/twilio/TwilioTest.java b/src/test/java/com/twilio/TwilioTest.java index 550f2d491f..d6f17c1ea5 100644 --- a/src/test/java/com/twilio/TwilioTest.java +++ b/src/test/java/com/twilio/TwilioTest.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import java.util.List; import java.util.concurrent.ExecutorService; @@ -20,11 +20,12 @@ import org.mockito.MockitoAnnotations; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; public class TwilioTest { @@ -45,7 +46,7 @@ public static String serialize(List list) { @Mock private NetworkHttpClient networkHttpClient; - @Before + @BeforeEach public void init() { MockitoAnnotations.initMocks(this); } @@ -55,23 +56,23 @@ public void testGetExecutorService() { assertNotNull(Twilio.getExecutorService()); } - @Test(expected = AuthenticationException.class) + @Test public void testGetRestClientNullAccountSid() { Twilio.setRestClient(null); Twilio.setUsername(null); Twilio.setPassword(null); - Twilio.getRestClient(); + assertThrows(AuthenticationException.class, () -> Twilio.getRestClient()); fail("AuthenticationException was expected"); } - @Test(expected = AuthenticationException.class) + @Test public void testSetAccountSidNull() { Twilio.setUsername(null); fail("AuthenticationException was expected"); } - @Test(expected = AuthenticationException.class) + @Test public void testSetAuthTokenNull() { Twilio.setPassword(null); fail("AuthenticationException was expected"); diff --git a/src/test/java/com/twilio/base/ReaderTest.java b/src/test/java/com/twilio/base/ReaderTest.java index ebc34675fb..95dfa22db4 100644 --- a/src/test/java/com/twilio/base/ReaderTest.java +++ b/src/test/java/com/twilio/base/ReaderTest.java @@ -3,12 +3,14 @@ import com.twilio.http.TwilioRestClient; import com.twilio.rest.api.v2010.account.Call; import com.twilio.rest.api.v2010.account.CallReader; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collections; import static org.mockito.Mockito.when; @@ -21,7 +23,7 @@ public class ReaderTest { @Mock Page page; - @Before + @BeforeEach public void init() { MockitoAnnotations.initMocks(this); } @@ -29,43 +31,43 @@ public void init() { @Test public void testNoPagingDefaults() { Reader reader = new CallReader(); - Assert.assertNull(reader.getLimit()); - Assert.assertNull(reader.getPageSize()); + assertNull(reader.getLimit()); + assertNull(reader.getPageSize()); } @Test public void testSetPageSize() { Reader reader = new CallReader().pageSize(100); - Assert.assertEquals(100, reader.getPageSize().intValue()); - Assert.assertNull(reader.getLimit()); + assertEquals(100, reader.getPageSize().intValue()); + assertNull(reader.getLimit()); } @Test public void testMaxPageSize() { Reader reader = new CallReader().pageSize(Integer.MAX_VALUE); - Assert.assertEquals(Integer.MAX_VALUE, reader.getPageSize().intValue()); - Assert.assertNull(reader.getLimit()); + assertEquals(Integer.MAX_VALUE, reader.getPageSize().intValue()); + assertNull(reader.getLimit()); } @Test public void testSetLimit() { Reader reader = new CallReader().limit(100); - Assert.assertEquals(100, reader.getLimit().intValue()); - Assert.assertEquals(100, reader.getPageSize().intValue()); + assertEquals(100, reader.getLimit().intValue()); + assertEquals(100, reader.getPageSize().intValue()); } @Test public void testSetLimitMaxPageSize() { Reader reader = new CallReader().limit(Integer.MAX_VALUE); - Assert.assertEquals(Integer.MAX_VALUE, reader.getLimit().intValue()); - Assert.assertEquals(Integer.MAX_VALUE, reader.getPageSize().intValue()); + assertEquals(Integer.MAX_VALUE, reader.getLimit().intValue()); + assertEquals(Integer.MAX_VALUE, reader.getPageSize().intValue()); } @Test public void testSetPageSizeLimit() { Reader reader = new CallReader().limit(1000).pageSize(5); - Assert.assertEquals(1000, reader.getLimit().intValue()); - Assert.assertEquals(5, reader.getPageSize().intValue()); + assertEquals(1000, reader.getLimit().intValue()); + assertEquals(5, reader.getPageSize().intValue()); } @Test @@ -74,7 +76,7 @@ public void testNoPageLimit() { Reader reader = new CallReader(); ResourceSet set = new ResourceSet<>(reader, client, page); - Assert.assertEquals(Long.MAX_VALUE, set.getPageLimit()); + assertEquals(Long.MAX_VALUE, set.getPageLimit()); } @@ -85,7 +87,7 @@ public void testHasPageLimit() { Reader reader = new CallReader().limit(100); ResourceSet set = new ResourceSet<>(reader, client, page); - Assert.assertEquals(2, set.getPageLimit()); + assertEquals(2, set.getPageLimit()); } @Test public void testUnevenHasPageLimit() { @@ -93,7 +95,7 @@ public void testUnevenHasPageLimit() { when(page.getPageSize()).thenReturn(50); Reader reader = new CallReader().limit(125); ResourceSet set = new ResourceSet<>(reader, client, page); - Assert.assertEquals(3, set.getPageLimit()); + assertEquals(3, set.getPageLimit()); } } diff --git a/src/test/java/com/twilio/compliance/ComplianceTest.java b/src/test/java/com/twilio/compliance/ComplianceTest.java index bee9fc8b42..f0f888fe2e 100644 --- a/src/test/java/com/twilio/compliance/ComplianceTest.java +++ b/src/test/java/com/twilio/compliance/ComplianceTest.java @@ -19,9 +19,9 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.library.GeneralCodingRules.*; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; -import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -43,7 +43,7 @@ public boolean apply(final JavaClass input) { }; } - @Before + @BeforeEach public void setUp() { assertTrue(twilioClasses.size() > 0); assertTrue(resourceClasses.size() > 1); diff --git a/src/test/java/com/twilio/converter/CurrencyDeserializerTest.java b/src/test/java/com/twilio/converter/CurrencyDeserializerTest.java index da96d62a1a..b6a17f609d 100644 --- a/src/test/java/com/twilio/converter/CurrencyDeserializerTest.java +++ b/src/test/java/com/twilio/converter/CurrencyDeserializerTest.java @@ -4,8 +4,9 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Currency; @@ -21,15 +22,15 @@ public void testDeserialize() throws IOException { ObjectMapper mapper = new ObjectMapper(); Container c = Container.fromJson(json, mapper); - Assert.assertEquals("USD", c.currency.getCurrencyCode()); + assertEquals("USD", c.currency.getCurrencyCode()); } - @Test(expected = JsonMappingException.class) + @Test public void testInvalidCurrency() throws IOException { String json = "{ \"currency\": \"poo\" }"; ObjectMapper mapper = new ObjectMapper(); - Container.fromJson(json, mapper); + assertThrows(JsonMappingException.class, () -> Container.fromJson(json, mapper)); } private static class Container { diff --git a/src/test/java/com/twilio/converter/DateConverterTest.java b/src/test/java/com/twilio/converter/DateConverterTest.java index 63097da7bb..63ffa5c917 100644 --- a/src/test/java/com/twilio/converter/DateConverterTest.java +++ b/src/test/java/com/twilio/converter/DateConverterTest.java @@ -2,8 +2,10 @@ import java.time.ZonedDateTime; import java.time.LocalDate; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; import java.util.Locale; @@ -16,79 +18,79 @@ public class DateConverterTest { public void testRfc2822() { ZonedDateTime dt = DateConverter.rfc2822DateTimeFromString("Tue, 29 Mar 2016 13:00:05 +0000"); - Assert.assertEquals(2, dt.getDayOfWeek().getValue()); - Assert.assertEquals(29, dt.getDayOfMonth()); - Assert.assertEquals(3, dt.getMonthValue()); - Assert.assertEquals(2016, dt.getYear()); - Assert.assertEquals(13, dt.getHour()); - Assert.assertEquals(0, dt.getMinute()); - Assert.assertEquals(5, dt.getSecond()); + assertEquals(2, dt.getDayOfWeek().getValue()); + assertEquals(29, dt.getDayOfMonth()); + assertEquals(3, dt.getMonthValue()); + assertEquals(2016, dt.getYear()); + assertEquals(13, dt.getHour()); + assertEquals(0, dt.getMinute()); + assertEquals(5, dt.getSecond()); } @Test public void testInvalidRfc2822() { ZonedDateTime dt = DateConverter.rfc2822DateTimeFromString("gibberish"); - Assert.assertNull(dt); + assertNull(dt); } @Test public void testIso8601() { ZonedDateTime dt = DateConverter.iso8601DateTimeFromString("2016-01-15T21:49:24Z"); - Assert.assertEquals(15, dt.getDayOfMonth()); - Assert.assertEquals(1, dt.getMonthValue()); - Assert.assertEquals(2016, dt.getYear()); - Assert.assertEquals(21, dt.getHour()); - Assert.assertEquals(49, dt.getMinute()); - Assert.assertEquals(24, dt.getSecond()); + assertEquals(15, dt.getDayOfMonth()); + assertEquals(1, dt.getMonthValue()); + assertEquals(2016, dt.getYear()); + assertEquals(21, dt.getHour()); + assertEquals(49, dt.getMinute()); + assertEquals(24, dt.getSecond()); } @Test public void testInvalidIso8601() { ZonedDateTime dt = DateConverter.iso8601DateTimeFromString("blanks"); - Assert.assertNull(dt); + assertNull(dt); } @Test public void testLocalDate() { LocalDate ld = DateConverter.localDateFromString("2016-11-11"); - Assert.assertEquals(2016, ld.getYear()); - Assert.assertEquals(11, ld.getMonthValue()); - Assert.assertEquals(11, ld.getDayOfMonth()); + assertEquals(2016, ld.getYear()); + assertEquals(11, ld.getMonthValue()); + assertEquals(11, ld.getDayOfMonth()); } @Test public void testInvalidLocalDate() { LocalDate date = DateConverter.localDateFromString("bad"); - Assert.assertNull(date); + assertNull(date); } @Test public void testLocalDateToString() { String date = DateConverter.dateStringFromLocalDate(LocalDate.of(2016, 9, 21)); - Assert.assertEquals("2016-09-21", date); + assertEquals("2016-09-21", date); } @Test public void testDifferentLocaleRFC2822() { Locale.setDefault(new Locale("fr", "CA")); ZonedDateTime dateTime = DateConverter.rfc2822DateTimeFromString("Tue, 29 Mar 2016 13:00:05 +0000"); - Assert.assertNotNull(dateTime); + assertNotNull(dateTime); } @Test public void testDifferentLocaleISO8601() { Locale.setDefault(new Locale("fr", "CA")); ZonedDateTime dateTime = DateConverter.iso8601DateTimeFromString("2016-01-15T21:49:24Z"); - Assert.assertNotNull(dateTime); + assertNotNull(dateTime); } @Test public void testISO8601DateTimeConversion() { String dateTimeString = "2016-01-15T21:49:00Z"; ZonedDateTime dateTime = DateConverter.iso8601DateTimeFromString(dateTimeString); - Assert.assertEquals(dateTimeString, dateTime.toInstant().toString()); + assertEquals(dateTimeString, dateTime.toInstant().toString()); } } diff --git a/src/test/java/com/twilio/converter/PrefixedCollapsibleMapTest.java b/src/test/java/com/twilio/converter/PrefixedCollapsibleMapTest.java index 3a57088d14..ce8c9c26d4 100644 --- a/src/test/java/com/twilio/converter/PrefixedCollapsibleMapTest.java +++ b/src/test/java/com/twilio/converter/PrefixedCollapsibleMapTest.java @@ -1,8 +1,8 @@ package com.twilio.converter; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; @@ -16,7 +16,7 @@ public class PrefixedCollapsibleMapTest { @Test public void testNull() { Map actual = PrefixedCollapsibleMap.serialize(null, "Prefix"); - Assert.assertEquals(Collections.emptyMap(), actual); + assertEquals(Collections.emptyMap(), actual); } @Test @@ -29,7 +29,7 @@ public void testSingleKey() { Map expected = new HashMap<>(); expected.put("Prefix.foo", "bar"); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -44,7 +44,7 @@ public void testNestedKeys() { Map expected = new HashMap<>(); expected.put("Prefix.foo.bar", "baz"); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -67,7 +67,7 @@ public void testMultipleKeys() { expected.put("Prefix.watson.language", "en"); expected.put("Prefix.watson.alice", "bob"); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } } diff --git a/src/test/java/com/twilio/converter/PromoterTest.java b/src/test/java/com/twilio/converter/PromoterTest.java index 398cc75a95..fa65dde56f 100644 --- a/src/test/java/com/twilio/converter/PromoterTest.java +++ b/src/test/java/com/twilio/converter/PromoterTest.java @@ -2,8 +2,8 @@ import com.twilio.type.PhoneNumber; import com.twilio.type.Twiml; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; import java.net.URI; import java.util.Collections; @@ -16,7 +16,7 @@ public class PromoterTest { @Test public void testPromoteUri() { URI uri = Promoter.uriFromString("https://trunking.twilio.com/v1/Trunks/TK123/OriginationUrls"); - Assert.assertEquals( + assertEquals( "https://trunking.twilio.com/v1/Trunks/TK123/OriginationUrls", uri.toString() ); @@ -25,19 +25,19 @@ public void testPromoteUri() { @Test public void testPhoneNumberFromString() { PhoneNumber pn = Promoter.phoneNumberFromString("+12345678910"); - Assert.assertEquals(new PhoneNumber("+12345678910"), pn); + assertEquals(new PhoneNumber("+12345678910"), pn); } @Test public void testTwimlFromString() { Twiml twiml = Promoter.twimlFromString("Ahoy!"); - Assert.assertEquals(new Twiml("Ahoy!"), twiml); + assertEquals(new Twiml("Ahoy!"), twiml); } @Test public void testPromoteList() { String s = "hi"; - Assert.assertEquals( + assertEquals( Collections.singletonList(s), Promoter.listOfOne(s) ); diff --git a/src/test/java/com/twilio/exception/ApiExceptionTest.java b/src/test/java/com/twilio/exception/ApiExceptionTest.java index 53f97dcb0a..165e85be3c 100644 --- a/src/test/java/com/twilio/exception/ApiExceptionTest.java +++ b/src/test/java/com/twilio/exception/ApiExceptionTest.java @@ -4,11 +4,10 @@ import java.util.Collections; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; @SuppressWarnings("ThrowableInstanceNeverThrown") public class ApiExceptionTest { diff --git a/src/test/java/com/twilio/http/HttpUtilityTest.java b/src/test/java/com/twilio/http/HttpUtilityTest.java index 3f9c9e06ef..a6c67d2a4d 100644 --- a/src/test/java/com/twilio/http/HttpUtilityTest.java +++ b/src/test/java/com/twilio/http/HttpUtilityTest.java @@ -1,13 +1,13 @@ package com.twilio.http; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; public class HttpUtilityTest { private List userAgentExtensionsEmpty = new ArrayList<>(); diff --git a/src/test/java/com/twilio/http/NetworkHttpClientTest.java b/src/test/java/com/twilio/http/NetworkHttpClientTest.java index ee5c9050f4..06dadf3b17 100644 --- a/src/test/java/com/twilio/http/NetworkHttpClientTest.java +++ b/src/test/java/com/twilio/http/NetworkHttpClientTest.java @@ -7,8 +7,8 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; @@ -18,7 +18,10 @@ import java.io.InputStream; import java.net.URL; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; @@ -47,7 +50,7 @@ public class NetworkHttpClientTest { @Mock private HttpEntity mockEntity; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); @@ -88,7 +91,7 @@ public void testGet() throws IOException { assertEquals(resp.getContent(), "frobozz"); } - @Test(expected = ApiConnectionException.class) + @Test public void testMakeRequestIOException() throws IOException { when(mockBuilder.build()).thenReturn(mockClient); @@ -99,7 +102,7 @@ public void testMakeRequestIOException() throws IOException { when(mockClient.execute(any())).thenThrow(new ApiConnectionException("foo")); client = new NetworkHttpClient(mockBuilder); client.makeRequest(mockRequest); - fail("ApiConnectionException was expected"); + assertThrows(ApiConnectionException.class, () -> client.makeRequest(mockRequest)); } @Test diff --git a/src/test/java/com/twilio/http/RequestTest.java b/src/test/java/com/twilio/http/RequestTest.java index cb9aa8b9c8..361f1df83d 100644 --- a/src/test/java/com/twilio/http/RequestTest.java +++ b/src/test/java/com/twilio/http/RequestTest.java @@ -7,21 +7,21 @@ import java.time.ZoneId; import java.time.ZoneOffset; import java.time.LocalDate; -import org.junit.Test; import java.net.MalformedURLException; import java.net.URL; +import org.junit.jupiter.api.Test; import static com.twilio.Assert.assertQueryStringsEqual; import static com.twilio.Assert.assertUrlsEqual; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class RequestTest { @@ -41,10 +41,10 @@ public void testConstructURL() throws MalformedURLException { assertUrlsEqual(expected, url); } - @Test(expected = ApiException.class) + @Test public void testConstructURLURISyntaxException() { Request request = new Request(HttpMethod.DELETE, "http://{"); - request.constructURL(); + assertThrows(ApiException.class, () -> request.constructURL()); fail("ApiException was expected"); } diff --git a/src/test/java/com/twilio/http/ResponseTest.java b/src/test/java/com/twilio/http/ResponseTest.java index ca9b64bc31..1dd2a7cc61 100644 --- a/src/test/java/com/twilio/http/ResponseTest.java +++ b/src/test/java/com/twilio/http/ResponseTest.java @@ -1,15 +1,18 @@ package com.twilio.http; -import org.junit.Test; -import org.junit.runner.RunWith; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; + import java.io.InputStream; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.Assert.assertEquals; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ResponseTest { @Mock diff --git a/src/test/java/com/twilio/http/TwilioRestClientTest.java b/src/test/java/com/twilio/http/TwilioRestClientTest.java index f2bdfc466d..d318b34223 100644 --- a/src/test/java/com/twilio/http/TwilioRestClientTest.java +++ b/src/test/java/com/twilio/http/TwilioRestClientTest.java @@ -1,9 +1,10 @@ package com.twilio.http; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.ObjectMapper; @@ -12,8 +13,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -32,7 +33,7 @@ public class TwilioRestClientTest { private static final String URI = "/2010-04-01/Accounts/AC123/Messages/MM123.json"; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); twilioRestClient = new TwilioRestClient(new TwilioRestClient.Builder("AC123", "AUTH TOKEN").httpClient(httpClient)); diff --git a/src/test/java/com/twilio/http/ValidationClientTest.java b/src/test/java/com/twilio/http/ValidationClientTest.java index 3415786a65..f482d3236b 100644 --- a/src/test/java/com/twilio/http/ValidationClientTest.java +++ b/src/test/java/com/twilio/http/ValidationClientTest.java @@ -1,7 +1,10 @@ package com.twilio.http; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.twilio.constant.EnumConstants; -import org.junit.Test; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -10,10 +13,7 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class ValidationClientTest { @Test diff --git a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java index f829590422..5ac8206523 100644 --- a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java +++ b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java @@ -1,26 +1,26 @@ package com.twilio.jwt.accesstoken; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.fasterxml.jackson.databind.ObjectMapper; import com.twilio.jwt.Jwt; import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jws; -import io.jsonwebtoken.JwsHeader; -import io.jsonwebtoken.JwtParser; -import io.jsonwebtoken.JwtParserBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; import java.io.IOException; -import java.security.KeyPair; -import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.junit.Assert; -import org.junit.Test; + import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; /** * Test class for {@link AccessToken}. @@ -44,15 +44,15 @@ public class AccessTokenTest { } private void validateToken(Claims claims) { - Assert.assertEquals(SIGNING_KEY_SID, claims.getIssuer()); - Assert.assertEquals(ACCOUNT_SID, claims.getSubject()); + assertEquals(SIGNING_KEY_SID, claims.getIssuer()); + assertEquals(ACCOUNT_SID, claims.getSubject()); - Assert.assertNotNull(claims.getExpiration()); - Assert.assertNotNull(claims.getId()); - Assert.assertNotNull(claims.get("grants")); + assertNotNull(claims.getExpiration()); + assertNotNull(claims.getId()); + assertNotNull(claims.get("grants")); - Assert.assertTrue(claims.getId().startsWith(claims.getIssuer() + "-")); - Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime()); + assertTrue(claims.getId().startsWith(claims.getIssuer() + "-")); + assertTrue(claims.getExpiration().getTime() > new Date().getTime()); } private Claims getClaimFromJwtToken(Jwt token) throws IOException { @@ -82,17 +82,17 @@ private void testVoiceToken(Boolean allow) throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map pvgGrant = (Map) decodedGrants.get("voice"); Map incoming = (Map) pvgGrant.get("incoming"); - Assert.assertEquals(allow, incoming.get("allow")); + assertEquals(allow, incoming.get("allow")); Map outgoing = (Map) pvgGrant.get("outgoing"); Map outgoingParams = (Map) outgoing.get("params"); - Assert.assertEquals("AP123", outgoing.get("application_sid")); - Assert.assertEquals("bar", outgoingParams.get("foo")); + assertEquals("AP123", outgoing.get("application_sid")); + assertEquals("bar", outgoingParams.get("foo")); } @Test @@ -117,7 +117,7 @@ public void testOptionalValues() throws IOException { Claims claims = getClaimFromJwtToken(token); validateToken(claims); - Assert.assertTrue(claims.getNotBefore().getTime() <= new Date().getTime()); + assertTrue(claims.getNotBefore().getTime() <= new Date().getTime()); } @Test @@ -131,7 +131,7 @@ public void testRegion() { .build() .parse(token.toJwt()); - Assert.assertEquals("foo", jwts.getHeader().get("twr")); + assertEquals("foo", jwts.getHeader().get("twr")); } @Test @@ -143,7 +143,7 @@ public void testEmptyRegion() { .build() .parse(token.toJwt()); - Assert.assertEquals(null, jwts.getHeader().get("twr")); + assertEquals(null, jwts.getHeader().get("twr")); } @Test @@ -159,10 +159,10 @@ public void testVideoGrant() throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map grant = (Map) decodedGrants.get("video"); - Assert.assertEquals("RM123", grant.get("room")); + assertEquals("RM123", grant.get("room")); } @Test @@ -182,13 +182,13 @@ public void testChatGrant() throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map grant = (Map) decodedGrants.get("chat"); - Assert.assertEquals("RL123", grant.get("deployment_role_sid")); - Assert.assertEquals("foobar", grant.get("endpoint_id")); - Assert.assertEquals("CR123", grant.get("push_credential_sid")); - Assert.assertEquals("IS123", grant.get("service_sid")); + assertEquals("RL123", grant.get("deployment_role_sid")); + assertEquals("foobar", grant.get("endpoint_id")); + assertEquals("CR123", grant.get("push_credential_sid")); + assertEquals("IS123", grant.get("service_sid")); } @Test @@ -206,11 +206,11 @@ public void testSyncGrant() throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map grant = (Map) decodedGrants.get("data_sync"); - Assert.assertEquals("foobar", grant.get("endpoint_id")); - Assert.assertEquals("IS123", grant.get("service_sid")); + assertEquals("foobar", grant.get("endpoint_id")); + assertEquals("IS123", grant.get("service_sid")); } @Test @@ -231,12 +231,12 @@ public void testPlaybackGrant() throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map grant = (Map) decodedGrants.get("player"); - Assert.assertNull(grant.get("requestCredentials")); - Assert.assertEquals("https://000.us-east-1.playback.live-video.net/api/video/v1/us-east-000.channel.000?token=xxxxx", grant.get("playbackUrl")); - Assert.assertEquals("VJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", grant.get("playerStreamerSid")); + assertNull(grant.get("requestCredentials")); + assertEquals("https://000.us-east-1.playback.live-video.net/api/video/v1/us-east-000.channel.000?token=xxxxx", grant.get("playbackUrl")); + assertEquals("VJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", grant.get("playerStreamerSid")); } @Test @@ -256,12 +256,12 @@ public void testTaskRouterGrant() throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map grant = (Map) decodedGrants.get("task_router"); - Assert.assertEquals("WS123", grant.get("workspace_sid")); - Assert.assertEquals("WK123", grant.get("worker_sid")); - Assert.assertEquals("worker", grant.get("role")); + assertEquals("WS123", grant.get("workspace_sid")); + assertEquals("WK123", grant.get("worker_sid")); + assertEquals("worker", grant.get("role")); } @Test @@ -287,16 +287,16 @@ public void testVoiceTokenWithoutIncoming() throws IOException { validateToken(claims); Map decodedGrants = (Map) claims.get("grants"); - Assert.assertEquals(1, decodedGrants.size()); + assertEquals(1, decodedGrants.size()); Map pvgGrant = (Map) decodedGrants.get("voice"); - Assert.assertEquals(null, pvgGrant.get("incoming")); + assertEquals(null, pvgGrant.get("incoming")); Map outgoing = (Map) pvgGrant.get("outgoing"); Map outgoingParams = (Map) outgoing.get("params"); - Assert.assertEquals("AP123", outgoing.get("application_sid")); - Assert.assertEquals("bar", outgoingParams.get("foo")); + assertEquals("AP123", outgoing.get("application_sid")); + assertEquals("bar", outgoingParams.get("foo")); } @Test() @@ -314,7 +314,7 @@ public void testNullValues() throws IOException { Map decodedGrants = (Map) claims.get("grants"); Map grant = (Map) decodedGrants.get("chat"); - Assert.assertEquals("RL123", grant.get("deployment_role_sid")); - Assert.assertFalse(grant.containsKey("endpoint_id")); + assertEquals("RL123", grant.get("deployment_role_sid")); + assertFalse(grant.containsKey("endpoint_id")); } } diff --git a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java index 3d6319faaa..4960f33d35 100644 --- a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java @@ -1,5 +1,8 @@ package com.twilio.jwt.client; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.twilio.jwt.Jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -9,12 +12,12 @@ import java.security.NoSuchAlgorithmException; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.junit.Assert; -import org.junit.Test; + import java.util.Arrays; import java.util.Date; import java.util.List; +import org.junit.jupiter.api.Test; /** * Test class for {@link ClientCapability}. @@ -50,8 +53,8 @@ public void testEmptyToken() throws IOException { Claims claims = getClaims(jwt); - Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); - Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime()); + assertEquals(ACCOUNT_SID, claims.getIssuer()); + assertTrue(claims.getExpiration().getTime() > new Date().getTime()); } @Test @@ -65,10 +68,10 @@ public void testToken() throws IOException { Claims claims = getClaims(jwt); - Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); - Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime()); + assertEquals(ACCOUNT_SID, claims.getIssuer()); + assertTrue(claims.getExpiration().getTime() > new Date().getTime()); - Assert.assertEquals( + assertEquals( "scope:client:incoming?clientName=incomingClient " + "scope:stream:subscribe?path=/2010-04-01/Events " + "scope:client:outgoing?appSid=AP123", diff --git a/src/test/java/com/twilio/jwt/client/EventStreamScopeTest.java b/src/test/java/com/twilio/jwt/client/EventStreamScopeTest.java index 3f50ef7fb7..bbad829dec 100644 --- a/src/test/java/com/twilio/jwt/client/EventStreamScopeTest.java +++ b/src/test/java/com/twilio/jwt/client/EventStreamScopeTest.java @@ -1,11 +1,13 @@ package com.twilio.jwt.client; -import org.junit.Assert; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; /** * Test class for {@link EventStreamScope}. @@ -21,7 +23,7 @@ public void testGenerate() throws UnsupportedEncodingException { .filters(filters) .build(); - Assert.assertEquals( + assertEquals( "scope:stream:subscribe?path=/2010-04-01/Events&appParams=foo%3Dbar", scope.getPayload() ); diff --git a/src/test/java/com/twilio/jwt/client/IncomingClientScopeTest.java b/src/test/java/com/twilio/jwt/client/IncomingClientScopeTest.java index eb4eaf69a5..42e70c2217 100644 --- a/src/test/java/com/twilio/jwt/client/IncomingClientScopeTest.java +++ b/src/test/java/com/twilio/jwt/client/IncomingClientScopeTest.java @@ -1,9 +1,11 @@ package com.twilio.jwt.client; -import org.junit.Assert; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.UnsupportedEncodingException; +import org.junit.jupiter.api.Test; /** * Test class for {@link IncomingClientScope}. @@ -13,7 +15,7 @@ public class IncomingClientScopeTest { @Test public void testGenerate() throws UnsupportedEncodingException { Scope scope = new IncomingClientScope("foobar"); - Assert.assertEquals( + assertEquals( "scope:client:incoming?clientName=foobar", scope.getPayload() ); diff --git a/src/test/java/com/twilio/jwt/client/OutgoingClientScopeTest.java b/src/test/java/com/twilio/jwt/client/OutgoingClientScopeTest.java index bd4979b7fc..6a6d15f7c0 100644 --- a/src/test/java/com/twilio/jwt/client/OutgoingClientScopeTest.java +++ b/src/test/java/com/twilio/jwt/client/OutgoingClientScopeTest.java @@ -1,11 +1,13 @@ package com.twilio.jwt.client; -import org.junit.Assert; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; /** * Test class for {@link OutgoingClientScope}. @@ -22,7 +24,7 @@ public void testGenerate() throws UnsupportedEncodingException { .params(params) .build(); - Assert.assertEquals( + assertEquals( "scope:client:outgoing?appSid=AP123&clientName=CL123&appParams=foo%3Dbar", scope.getPayload() ); diff --git a/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java b/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java index 30f62950c7..b81ff26a8a 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java @@ -1,13 +1,15 @@ package com.twilio.jwt.taskrouter; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; + import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; /** * Test class for {@link Policy}. @@ -26,7 +28,7 @@ public void testToJson() throws IOException { .queryFilter(filter) .build(); - Assert.assertEquals( + assertEquals( "{\"allow\":true,\"method\":\"GET\",\"post_filter\":{},\"query_filter\":{\"foo\":{\"required\":true}},\"url\":\"http://localhost\"}", p.toJson()); } diff --git a/src/test/java/com/twilio/jwt/taskrouter/PolicyUtilsTest.java b/src/test/java/com/twilio/jwt/taskrouter/PolicyUtilsTest.java index 6fda95d9e4..747be5bddd 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/PolicyUtilsTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/PolicyUtilsTest.java @@ -1,11 +1,12 @@ package com.twilio.jwt.taskrouter; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; import java.util.Arrays; import java.util.List; +import org.junit.jupiter.api.Test; /** * Test class for {@link PolicyUtils}. @@ -42,7 +43,7 @@ public void testDefaultWorkerPolicies() { .build(); List policies = Arrays.asList(activities, tasks, reservations, workerFetch); - Assert.assertEquals( + assertEquals( policies, PolicyUtils.defaultWorkerPolicies(workspaceSid, workerSid) ); @@ -58,7 +59,7 @@ public void testDefaultEventBridgePolicies() { Policy post = new Policy.Builder().url(url).method(HttpMethod.POST).allowed(true).build(); List policies = Arrays.asList(get, post); - Assert.assertEquals( + assertEquals( policies, PolicyUtils.defaultEventBridgePolicies(accountSid, channelId) ); diff --git a/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java b/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java index 40498b57cc..1e7a56c6d9 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java @@ -1,5 +1,8 @@ package com.twilio.jwt.taskrouter; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.jsonwebtoken.impl.DefaultClaims; import io.jsonwebtoken.security.Keys; import java.io.IOException; @@ -12,14 +15,14 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.junit.Assert; -import org.junit.Test; + import com.twilio.http.HttpMethod; import com.twilio.jwt.Jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; +import org.junit.jupiter.api.Test; /** * Test class for {@link TaskRouterCapability}. @@ -64,11 +67,11 @@ public void testToken() throws IOException { .build(); Claims claims = getClaims(jwt); - Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); - Assert.assertEquals(WORKER_SID, claims.get("channel")); - Assert.assertEquals(ACCOUNT_SID, claims.get("account_sid")); - Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); - Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime()); + assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); + assertEquals(WORKER_SID, claims.get("channel")); + assertEquals(ACCOUNT_SID, claims.get("account_sid")); + assertEquals(ACCOUNT_SID, claims.getIssuer()); + assertTrue(claims.getExpiration().getTime() > new Date().getTime()); } @Test @@ -103,14 +106,14 @@ public void testWorkerToken() throws IOException { .build(); final Claims claims = getClaims(jwt); - Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); - Assert.assertEquals(WORKER_SID, claims.get("channel")); - Assert.assertEquals(ACCOUNT_SID, claims.get("account_sid")); - Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); - Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime()); + assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); + assertEquals(WORKER_SID, claims.get("channel")); + assertEquals(ACCOUNT_SID, claims.get("account_sid")); + assertEquals(ACCOUNT_SID, claims.getIssuer()); + assertTrue(claims.getExpiration().getTime() > new Date().getTime()); final List claimedPolicies = (List) claims.get("policies"); final int connectionPolicies = 2; - Assert.assertEquals(policies.size() + connectionPolicies, claimedPolicies.size()); + assertEquals(policies.size() + connectionPolicies, claimedPolicies.size()); } } diff --git a/src/test/java/com/twilio/jwt/taskrouter/UrlUtilsTest.java b/src/test/java/com/twilio/jwt/taskrouter/UrlUtilsTest.java index c4eec242f1..a5887ca198 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/UrlUtilsTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/UrlUtilsTest.java @@ -1,7 +1,9 @@ package com.twilio.jwt.taskrouter; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; /** * Test class for {@link UrlUtils}. @@ -17,7 +19,7 @@ public class UrlUtilsTest { @Test public void testWorkspaces() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces", UrlUtils.workspaces() ); @@ -25,7 +27,7 @@ public void testWorkspaces() { @Test public void testAllWorkspaces() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/**", UrlUtils.allWorkspaces() ); @@ -33,7 +35,7 @@ public void testAllWorkspaces() { @Test public void testWorkspace() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123", UrlUtils.workspace(WORKSPACE_SID) ); @@ -41,7 +43,7 @@ public void testWorkspace() { @Test public void testTaskQueues() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/TaskQueues", UrlUtils.taskQueues(WORKSPACE_SID) ); @@ -49,7 +51,7 @@ public void testTaskQueues() { @Test public void testAllTaskQueues() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/TaskQueues/**", UrlUtils.allTaskQueues(WORKSPACE_SID) ); @@ -57,7 +59,7 @@ public void testAllTaskQueues() { @Test public void testTaskQueue() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/TaskQueues/TQ123", UrlUtils.taskQueue(WORKSPACE_SID, TASK_QUEUE_SID) ); @@ -65,7 +67,7 @@ public void testTaskQueue() { @Test public void testTasks() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Tasks", UrlUtils.tasks(WORKSPACE_SID) ); @@ -73,7 +75,7 @@ public void testTasks() { @Test public void testAllTasks() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Tasks/**", UrlUtils.allTasks(WORKSPACE_SID) ); @@ -81,7 +83,7 @@ public void testAllTasks() { @Test public void testTask() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Tasks/TK123", UrlUtils.task(WORKSPACE_SID, TASK_SID) ); @@ -89,7 +91,7 @@ public void testTask() { @Test public void testActivities() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Activities", UrlUtils.activities(WORKSPACE_SID) ); @@ -97,7 +99,7 @@ public void testActivities() { @Test public void testAllActivities() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Activities/**", UrlUtils.allActivities(WORKSPACE_SID) ); @@ -105,7 +107,7 @@ public void testAllActivities() { @Test public void testActivity() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Activities/AC123", UrlUtils.activity(WORKSPACE_SID, ACTIVITY_SID) ); @@ -113,7 +115,7 @@ public void testActivity() { @Test public void testWorkers() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workers", UrlUtils.workers(WORKSPACE_SID) ); @@ -121,7 +123,7 @@ public void testWorkers() { @Test public void testAllWorkers() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workers/**", UrlUtils.allWorkers(WORKSPACE_SID) ); @@ -129,7 +131,7 @@ public void testAllWorkers() { @Test public void testWorker() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workers/WK123", UrlUtils.worker(WORKSPACE_SID, WORKER_SID) ); @@ -137,7 +139,7 @@ public void testWorker() { @Test public void testReservations() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workers/WK123/Reservations", UrlUtils.reservations(WORKSPACE_SID, WORKER_SID) ); @@ -145,7 +147,7 @@ public void testReservations() { @Test public void testAllReservations() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workers/WK123/Reservations/**", UrlUtils.allReservations(WORKSPACE_SID, WORKER_SID) ); @@ -153,7 +155,7 @@ public void testAllReservations() { @Test public void testReservation() { - Assert.assertEquals( + assertEquals( "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workers/WK123/Reservations/WR123", UrlUtils.reservation(WORKSPACE_SID, WORKER_SID, RESERVATION_SID) ); diff --git a/src/test/java/com/twilio/jwt/validation/RequestCanonicalizerTest.java b/src/test/java/com/twilio/jwt/validation/RequestCanonicalizerTest.java index 0042b32709..9ed1b46407 100644 --- a/src/test/java/com/twilio/jwt/validation/RequestCanonicalizerTest.java +++ b/src/test/java/com/twilio/jwt/validation/RequestCanonicalizerTest.java @@ -1,14 +1,16 @@ package com.twilio.jwt.validation; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.twilio.exception.InvalidRequestException; import org.apache.http.Header; import org.apache.http.message.BasicHeader; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.util.Arrays; import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class RequestCanonicalizerTest { @@ -19,7 +21,7 @@ public class RequestCanonicalizerTest { private Header[] headers; - @Before + @BeforeEach public void setup() { headers = new Header[4]; headers[0] = new BasicHeader("host", "api.twilio.com"); @@ -34,7 +36,7 @@ public void testCreateCanonicalRequest() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("GET\n" + // action + assertEquals("GET\n" + // action "/Messages\n" + // path "Limit=10&PageSize=5\n" + //queryParams "authorization:foobar\n" + // included header #1 @@ -53,7 +55,7 @@ public void testCreateCanonicalRequestWithHostPort() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("GET\n" + // action + assertEquals("GET\n" + // action "/Messages\n" + // path "Limit=10&PageSize=5\n" + //queryParams "authorization:foobar\n" + // included header #1 @@ -71,7 +73,7 @@ public void testReplacesEncodedWhitespaceInQueryParams() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("key%20with%20whitespace=value%20with%20whitespace", + assertEquals("key%20with%20whitespace=value%20with%20whitespace", getLine(QUERY_LINE, canonicalRequest)); } @@ -81,7 +83,7 @@ public void testDecodesEncodedTildeInQueryParams() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("a~a=b~b", getLine(QUERY_LINE, canonicalRequest)); + assertEquals("a~a=b~b", getLine(QUERY_LINE, canonicalRequest)); } @Test @@ -90,7 +92,7 @@ public void testEncodesMultiplyInQueryParams() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("a%2Aa=b%2Ab", getLine(QUERY_LINE, canonicalRequest)); + assertEquals("a%2Aa=b%2Ab", getLine(QUERY_LINE, canonicalRequest)); } @Test @@ -99,7 +101,7 @@ public void testDoesNotEncodeUriEncodedSpace() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("a%20a=b%20b", getLine(QUERY_LINE, canonicalRequest)); + assertEquals("a%20a=b%20b", getLine(QUERY_LINE, canonicalRequest)); } @Test @@ -108,7 +110,7 @@ public void testDoesNotEncodeEncodedMultiplyInQueryParams() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("a%2Aa=b%2Ab", getLine(QUERY_LINE, canonicalRequest)); + assertEquals("a%2Aa=b%2Ab", getLine(QUERY_LINE, canonicalRequest)); } @Test @@ -117,7 +119,7 @@ public void testEmptyQuery() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("", getLine(QUERY_LINE, canonicalRequest)); + assertEquals("", getLine(QUERY_LINE, canonicalRequest)); } @Test @@ -129,7 +131,7 @@ public void testScriptUsedAsQueryMatchesWithServer() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("a=%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww" + + assertEquals("a=%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww" + ".w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20100%20100%22%3E%3Cpath%20d%3D%22M10%2C10" + "%20H90%20L50%2C70%22%2F%3E%3Ctext%20y%3D%2290%22%3E%22%20%27%20%23%20%25%20%26amp%3B%20" + "%C2%BF%20%F0%9F%94%A3%3C%2Ftext%3E%3C%2Fsvg%3E%0A", @@ -143,7 +145,7 @@ public void testCharacterMapMatchesWithServer() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("a=-_.~%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%3F%40" + + assertEquals("a=-_.~%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%3F%40" + "%20ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", getLine(QUERY_LINE, canonicalRequest)); } @@ -154,7 +156,7 @@ public void testMultipleQueryParamsSortsParams() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("query%20Param1=a%2A~%2F%3Db&queryParam2=Hello%20World&queryParam3=1%3D1", + assertEquals("query%20Param1=a%2A~%2F%3Db&queryParam2=Hello%20World&queryParam3=1%3D1", getLine(QUERY_LINE, canonicalRequest)); } @@ -164,15 +166,15 @@ public void testMultipleQueryParamsSortsParamsWithIdenticalKey() { String canonicalRequest = canonicalizeWithQueryParams(queryParams); - Assert.assertEquals("param=value1¶m=value2", + assertEquals("param=value1¶m=value2", getLine(QUERY_LINE, canonicalRequest)); } - @Test(expected = InvalidRequestException.class) + @Test public void testInvalidUriPathPassedToRequestCanonicalizer() { String path = "/this is a bad path"; - canonicalizeWithPath(path); + assertThrows(InvalidRequestException.class, () -> canonicalizeWithPath(path)); } @Test @@ -181,7 +183,7 @@ public void testNormalizesPath() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/v1/test", getLine(PATH_LINE, canonicalRequest)); + assertEquals("/v1/test", getLine(PATH_LINE, canonicalRequest)); } @Test @@ -190,7 +192,7 @@ public void testNormalizesPath2() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/v1/Workspaces/test", getLine(PATH_LINE, canonicalRequest)); + assertEquals("/v1/Workspaces/test", getLine(PATH_LINE, canonicalRequest)); } @Test @@ -199,7 +201,7 @@ public void testEmptyPath() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/", getLine(PATH_LINE, canonicalRequest)); + assertEquals("/", getLine(PATH_LINE, canonicalRequest)); } @Test @@ -208,7 +210,7 @@ public void testPathHasUnreservedCharacters() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/start%20%2A~%2Bend", + assertEquals("/start%20%2A~%2Bend", getLine(PATH_LINE, canonicalRequest)); } @@ -218,7 +220,7 @@ public void testPathHasEncodedCharacters() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/v1/Workspaces/test%28%29%2B%C3%A4/Workers", + assertEquals("/v1/Workspaces/test%28%29%2B%C3%A4/Workers", getLine(PATH_LINE, canonicalRequest)); } @@ -228,7 +230,7 @@ public void testPathHasNotEncodedCharactersAndControlCharacters() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/v1/Services/IS7f2d1594c3dd4d368d6669981a649659/Channels/%C3%A9%28%29%2B", + assertEquals("/v1/Services/IS7f2d1594c3dd4d368d6669981a649659/Channels/%C3%A9%28%29%2B", getLine(PATH_LINE, canonicalRequest)); } @@ -238,7 +240,7 @@ public void testPathHasEncodedCharactersAndControlCharacters() { String canonicalRequest = canonicalizeWithPath(path); - Assert.assertEquals("/v1/Services/IS7f2d1594c3dd4d368d6669981a649659/Channels/%C3%A9%28%29%2B", + assertEquals("/v1/Services/IS7f2d1594c3dd4d368d6669981a649659/Channels/%C3%A9%28%29%2B", getLine(PATH_LINE, canonicalRequest)); } diff --git a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java index fc312b256d..bf6e62ce57 100644 --- a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java +++ b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java @@ -6,15 +6,12 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import io.jsonwebtoken.security.InvalidKeyException; -import io.jsonwebtoken.security.Keys; import org.apache.http.*; import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHttpRequest; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -31,6 +28,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.AssertionsKt.assertNotNull; import static org.mockito.Mockito.when; import static io.jsonwebtoken.SignatureAlgorithm.PS256; @@ -64,7 +66,7 @@ public class ValidationTokenTest { @Mock private HttpEntity entity; - @Before + @BeforeEach public void setup() throws Exception { MockitoAnnotations.initMocks(this); headers = new Header[2]; @@ -102,8 +104,8 @@ public void testTokenBuilder() throws IOException { Claims claims = getClaimFromJwtToken(jwt); this.validateToken(claims); - Assert.assertEquals("authorization;host", claims.get("hrh")); - Assert.assertEquals("4dc9b67bed579647914587b0e22a1c65c1641d8674797cd82de65e766cce5f80", claims.get("rqh")); + assertEquals("authorization;host", claims.get("hrh")); + assertEquals("4dc9b67bed579647914587b0e22a1c65c1641d8674797cd82de65e766cce5f80", claims.get("rqh")); } @Test @@ -125,7 +127,7 @@ public void testTokenValidAlgorithms() throws IOException { } } - @Test(expected = IllegalArgumentException.class) + @Test public void testTokenInvalidAlgorithms() throws IOException { List validAlgorithms = Arrays.asList(SignatureAlgorithm.HS256, SignatureAlgorithm.ES256, RS384, RS512, PS384, PS512); for (SignatureAlgorithm alg : validAlgorithms) { @@ -140,7 +142,7 @@ public void testTokenInvalidAlgorithms() throws IOException { .build(); - getClaimFromJwtToken(jwt); + assertThrows(IllegalArgumentException.class, () -> getClaimFromJwtToken(jwt)); } } @@ -156,8 +158,8 @@ public void testTokenFromHttpRequest() throws IOException { Claims claims = getClaimFromJwtToken(jwt); this.validateToken(claims); - Assert.assertEquals("authorization;host", claims.get("hrh")); - Assert.assertEquals("712fbbec9dcb4fe58ed8caecf925d2fe10889f5d3f4b48e748157a4a1113697d", claims.get("rqh")); + assertEquals("authorization;host", claims.get("hrh")); + assertEquals("712fbbec9dcb4fe58ed8caecf925d2fe10889f5d3f4b48e748157a4a1113697d", claims.get("rqh")); } @Test @@ -174,8 +176,8 @@ public void testTokenFromEntityRequest() throws IOException { Claims claims = getClaimFromJwtToken(jwt); this.validateToken(claims); - Assert.assertEquals("authorization;host", claims.get("hrh")); - Assert.assertEquals("bd792c967c20d546c738b94068f5f72758a10d26c12979677501e1eefe58c65a", claims.get("rqh")); + assertEquals("authorization;host", claims.get("hrh")); + assertEquals("bd792c967c20d546c738b94068f5f72758a10d26c12979677501e1eefe58c65a", claims.get("rqh")); } @Test @@ -192,8 +194,8 @@ public void testTokenFromHttpRequestWithHostPort() throws IOException { this.validateToken(claims); - Assert.assertEquals("authorization;host", claims.get("hrh")); - Assert.assertEquals("4b3d2666845a38f00259a5231a08765bb2d12564bc4469fd5b2816204c588967", claims.get("rqh")); + assertEquals("authorization;host", claims.get("hrh")); + assertEquals("4b3d2666845a38f00259a5231a08765bb2d12564bc4469fd5b2816204c588967", claims.get("rqh")); } @Test @@ -211,7 +213,7 @@ public void run() { i.process(getBasicRequest(), new HttpClientContext()); } catch (Exception e) { e.printStackTrace(); - Assert.fail(e.getMessage()); + fail(e.getMessage()); } } })); @@ -231,14 +233,14 @@ private BasicHttpRequest getBasicRequest() { } private void validateToken(Claims claims) { - Assert.assertEquals(SIGNING_KEY_SID, claims.getIssuer()); - Assert.assertEquals(ACCOUNT_SID, claims.getSubject()); + assertEquals(SIGNING_KEY_SID, claims.getIssuer()); + assertEquals(ACCOUNT_SID, claims.getSubject()); - Assert.assertNotNull(claims.getExpiration()); - Assert.assertNotNull(claims.get("hrh")); - Assert.assertNotNull(claims.get("rqh")); + assertNotNull(claims.getExpiration()); + assertNotNull(claims.get("hrh")); + assertNotNull(claims.get("rqh")); - Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime()); + assertTrue(claims.getExpiration().getTime() > new Date().getTime()); } } diff --git a/src/test/java/com/twilio/security/RequestValidatorTest.java b/src/test/java/com/twilio/security/RequestValidatorTest.java index a97418277c..9bdf8ad8dd 100644 --- a/src/test/java/com/twilio/security/RequestValidatorTest.java +++ b/src/test/java/com/twilio/security/RequestValidatorTest.java @@ -1,12 +1,15 @@ package com.twilio.security; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test class for {@link RequestValidator}. @@ -19,7 +22,7 @@ public class RequestValidatorTest { private String body = "{\"property\": \"value\", \"boolean\": true}"; private String bodyHash = "0a1ff7634d9ab3b95db5c9a2dfe9416e41502b283a80c7cf19632632f96e6620"; - @Before + @BeforeEach public void setUp() { params.put("Digits", "1234"); params.put("CallSid", "CA1234567890ABCDE"); @@ -30,7 +33,7 @@ public void setUp() { @Test public void testValidate() { - Assert.assertTrue("Request does not match provided signature", validator.validate(url, params, signature)); + assertTrue(validator.validate(url, params, signature)); } @Test @@ -38,21 +41,21 @@ public void testFailsWhenIncorrect() { signature = "NOTRSOYDt4T1cUTdK1PDd93/VVr8B8="; boolean isValid = validator.validate(url, params, signature); - Assert.assertFalse("Request should have failed validation, but didn't", isValid); + assertFalse(isValid); } @Test public void testValidateBody() { boolean isValid = validator.validateBody(body, bodyHash); - Assert.assertTrue("Body validation failed", isValid); + assertTrue(isValid); } @Test public void testValidateBodyFailsWhenWrong() { boolean isValid = validator.validateBody(body, "WRONG"); - Assert.assertFalse("Body validation should have failed, but didn't", isValid); + assertFalse(isValid); } @Test @@ -61,7 +64,7 @@ public void testValidateWithBody() throws URISyntaxException { String signatureWithHash = "a9nBmqA0ju/hNViExpshrM61xv4="; boolean isValid = validator.validate(url, body, signatureWithHash); - Assert.assertTrue("Body validation failed", isValid); + assertTrue(isValid); } @Test @@ -70,14 +73,14 @@ public void testValidateWithNoOtherParameters() throws URISyntaxException { String signatureWithHash = "y77kIzt2vzLz71DgmJGsen2scGs="; boolean isValid = validator.validate(url, body, signatureWithHash); - Assert.assertTrue("Body validation failed", isValid); + assertTrue(isValid); } @Test public void testValidateBodyWithoutSignature() throws URISyntaxException { boolean isValid = validator.validate(url, body, signature); - Assert.assertFalse("Validation should have failed with no bodySHA256", isValid); + assertFalse(isValid); } @Test @@ -85,7 +88,7 @@ public void testValidateRemovesPortHttps() { String url = this.url.replace(".com", ".com:1234"); boolean isValid = validator.validate(url, params, signature); - Assert.assertTrue("Validator did not strip port from url", isValid); + assertTrue(isValid); } @Test @@ -94,24 +97,24 @@ public void testValidateRemovesPortHttp() { String expectedSignature = "Zmvh+3yNM1Phv2jhDCwEM3q5ebU="; // hash of http uri with port 1234 boolean isValid = validator.validate(url, params, expectedSignature); - Assert.assertTrue("Validator did not strip port from url", isValid); + assertTrue(isValid); } @Test public void testValidateAddsPortHttps() { String expectedSignature = "kvajT1Ptam85bY51eRf/AJRuM3w="; // hash of https uri with port 443 boolean isValid = validator.validate(url, params, expectedSignature); - - Assert.assertTrue("Validator did not add port 443 to https url", isValid); + + assertTrue(isValid); } - + @Test public void testValidateAddsPortHttp() { String url = this.url.replace("https", "http"); String expectedSignature = "0ZXoZLH/DfblKGATFgpif+LLRf4="; // hash of http uri with port 80 boolean isValid = validator.validate(url, params, expectedSignature); - Assert.assertTrue("Validator did not add port 80 to http url", isValid); + assertTrue(isValid); } } diff --git a/src/test/java/com/twilio/taskrouter/WorkflowRuleTargetTest.java b/src/test/java/com/twilio/taskrouter/WorkflowRuleTargetTest.java index b8b0f3068d..df7f2dd4ad 100644 --- a/src/test/java/com/twilio/taskrouter/WorkflowRuleTargetTest.java +++ b/src/test/java/com/twilio/taskrouter/WorkflowRuleTargetTest.java @@ -1,9 +1,11 @@ package com.twilio.taskrouter; -import org.junit.Assert; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; +import org.junit.jupiter.api.Test; /** * Test class for {@link WorkflowRuleTarget} @@ -22,7 +24,7 @@ public void testToJson() throws IOException { .knownWorkerFriendlyName("task.requested_agent") .build(); - Assert.assertEquals( + assertEquals( "{\"queue\":\"QS123\",\"expression\":\"1==1\",\"priority\":5,\"timeout\":30,\"order_by\":\"worker.english_level ASC\",\"skip_if\":\"workers.available == 0\",\"known_worker_sid\":\"task.requested_agent_id\",\"known_worker_friendly_name\":\"task.requested_agent\"}", target.toJson() ); @@ -33,13 +35,13 @@ public void testFromJson() throws IOException { WorkflowRuleTarget target = WorkflowRuleTarget.fromJson("{\"queue\":\"QS123\",\"expression\":\"1==1\",\"priority\":5,\"timeout\":30,\"order_by\":\"worker.english_level ASC\",\"skip_if\":\"workers.available == 0\",\"known_worker_friendly_name\":\"task.requested_agent\",\"known_worker_sid\":\"task.requested_agent_id\"}"); - Assert.assertEquals("QS123", target.getQueue()); - Assert.assertEquals("1==1", target.getExpression()); - Assert.assertEquals(5, (int)target.getPriority()); - Assert.assertEquals(30, (int)target.getTimeout()); - Assert.assertEquals("worker.english_level ASC", target.getOrderBy()); - Assert.assertEquals("workers.available == 0", target.getSkipIf()); - Assert.assertEquals("task.requested_agent", target.getKnownWorkerFriendlyName()); - Assert.assertEquals("task.requested_agent_id", target.getKnownWorkerSid()); + assertEquals("QS123", target.getQueue()); + assertEquals("1==1", target.getExpression()); + assertEquals(5, (int)target.getPriority()); + assertEquals(30, (int)target.getTimeout()); + assertEquals("worker.english_level ASC", target.getOrderBy()); + assertEquals("workers.available == 0", target.getSkipIf()); + assertEquals("task.requested_agent", target.getKnownWorkerFriendlyName()); + assertEquals("task.requested_agent_id", target.getKnownWorkerSid()); } } diff --git a/src/test/java/com/twilio/taskrouter/WorkflowTest.java b/src/test/java/com/twilio/taskrouter/WorkflowTest.java index 5efde64f8c..c3f0e5c1fc 100644 --- a/src/test/java/com/twilio/taskrouter/WorkflowTest.java +++ b/src/test/java/com/twilio/taskrouter/WorkflowTest.java @@ -1,11 +1,12 @@ package com.twilio.taskrouter; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.Test; /** * Test class for {@link Workflow} @@ -26,7 +27,7 @@ public void testToJson() throws IOException { WorkflowRuleTarget defaultTarget = new WorkflowRuleTarget.Builder("WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").build(); Workflow workflow = new Workflow(rules, defaultTarget); - Assert.assertEquals("{\"task_routing\":{\"filters\":[{\"expression\":\"skill == \\\"HR\\\"\",\"targets\":[{\"queue\":\"WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"priority\":54333,\"timeout\":30}],\"friendlyName\":\"4354\"}],\"default_filter\":{\"queue\":\"WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}}}", workflow.toJson()); + assertEquals("{\"task_routing\":{\"filters\":[{\"expression\":\"skill == \\\"HR\\\"\",\"targets\":[{\"queue\":\"WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"priority\":54333,\"timeout\":30}],\"friendlyName\":\"4354\"}],\"default_filter\":{\"queue\":\"WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}}}", workflow.toJson()); } @Test @@ -51,22 +52,22 @@ public void testFromJson() throws IOException { Workflow workflow = Workflow.fromJson(json); WorkflowRuleTarget defaultTarget = workflow.getDefaultTarget(); - Assert.assertEquals("WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", defaultTarget.getQueue()); + assertEquals("WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", defaultTarget.getQueue()); List rules = workflow.getWorkflowRules(); - Assert.assertEquals(1, rules.size()); + assertEquals(1, rules.size()); WorkflowRule rule = rules.get(0); - Assert.assertEquals("skill == \"HR\"", rule.getExpression()); - Assert.assertEquals("4354", rule.getFriendlyName()); + assertEquals("skill == \"HR\"", rule.getExpression()); + assertEquals("4354", rule.getFriendlyName()); List targets = rule.getWorkflowRuleTargets(); - Assert.assertEquals(1, targets.size()); + assertEquals(1, targets.size()); WorkflowRuleTarget target = targets.get(0); - Assert.assertEquals("WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", target.getQueue()); - Assert.assertEquals(54333, (int) target.getPriority()); - Assert.assertEquals(30, (int) target.getTimeout()); + assertEquals("WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", target.getQueue()); + assertEquals(54333, (int) target.getPriority()); + assertEquals(30, (int) target.getTimeout()); } } diff --git a/src/test/java/com/twilio/twiml/FaxResponseTest.java b/src/test/java/com/twilio/twiml/FaxResponseTest.java index f221f31c38..d7d354b476 100644 --- a/src/test/java/com/twilio/twiml/FaxResponseTest.java +++ b/src/test/java/com/twilio/twiml/FaxResponseTest.java @@ -9,10 +9,10 @@ import com.twilio.http.HttpMethod; import com.twilio.twiml.fax.Receive; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; +import org.junit.jupiter.api.Test; /** * Test class for {@link FaxResponse} @@ -22,7 +22,7 @@ public class FaxResponseTest { public void testEmptyElement() { FaxResponse elem = new FaxResponse.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -33,14 +33,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { FaxResponse elem = new FaxResponse.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CResponse%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CResponse%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { FaxResponse elem = new FaxResponse.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -61,7 +61,7 @@ public void testElementWithChildren() { FaxResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -78,7 +78,7 @@ public void testElementWithTextNode() { FaxResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -98,7 +98,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -118,7 +118,7 @@ public void testElementWithGenericNode() { FaxResponse.Builder builder = new FaxResponse.Builder(); FaxResponse elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -137,7 +137,7 @@ public void testElementWithGenericNodeAttributes() { FaxResponse.Builder builder = new FaxResponse.Builder(); FaxResponse elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -152,7 +152,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final FaxResponse elem = new FaxResponse.Builder().build(); - Assert.assertEquals( + assertEquals( FaxResponse.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -172,7 +172,7 @@ public void testXmlChildrenDeserialization() { final FaxResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( FaxResponse.Builder.fromXml("" + "" + "").build().toXml(), @@ -188,11 +188,11 @@ public void testXmlEmptyChildrenDeserialization() { final FaxResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( FaxResponse.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/MessagingResponseTest.java b/src/test/java/com/twilio/twiml/MessagingResponseTest.java index 1fcdf1b707..f33e6db412 100644 --- a/src/test/java/com/twilio/twiml/MessagingResponseTest.java +++ b/src/test/java/com/twilio/twiml/MessagingResponseTest.java @@ -7,13 +7,15 @@ package com.twilio.twiml; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.http.HttpMethod; import com.twilio.twiml.messaging.Message; import com.twilio.twiml.messaging.Redirect; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; +import org.junit.jupiter.api.Test; /** * Test class for {@link MessagingResponse} @@ -23,7 +25,7 @@ public class MessagingResponseTest { public void testEmptyElement() { MessagingResponse elem = new MessagingResponse.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -34,14 +36,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { MessagingResponse elem = new MessagingResponse.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CResponse%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CResponse%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { MessagingResponse elem = new MessagingResponse.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -64,7 +66,7 @@ public void testElementWithChildren() { MessagingResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "body" + @@ -82,7 +84,7 @@ public void testElementWithTextNode() { MessagingResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -102,7 +104,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -122,7 +124,7 @@ public void testElementWithGenericNode() { MessagingResponse.Builder builder = new MessagingResponse.Builder(); MessagingResponse elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -141,7 +143,7 @@ public void testElementWithGenericNodeAttributes() { MessagingResponse.Builder builder = new MessagingResponse.Builder(); MessagingResponse elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -156,7 +158,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final MessagingResponse elem = new MessagingResponse.Builder().build(); - Assert.assertEquals( + assertEquals( MessagingResponse.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -178,7 +180,7 @@ public void testXmlChildrenDeserialization() { final MessagingResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( MessagingResponse.Builder.fromXml("" + "body" + "https://example.com" + @@ -195,11 +197,11 @@ public void testXmlEmptyChildrenDeserialization() { final MessagingResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( MessagingResponse.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/VoiceResponseTest.java b/src/test/java/com/twilio/twiml/VoiceResponseTest.java index 7937854960..5cb31edf9e 100644 --- a/src/test/java/com/twilio/twiml/VoiceResponseTest.java +++ b/src/test/java/com/twilio/twiml/VoiceResponseTest.java @@ -7,6 +7,8 @@ package com.twilio.twiml; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.voice.Connect; @@ -29,11 +31,10 @@ import com.twilio.twiml.voice.Sms; import com.twilio.twiml.voice.Start; import com.twilio.twiml.voice.Stop; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; -import java.util.List; +import org.junit.jupiter.api.Test; /** * Test class for {@link VoiceResponse} @@ -43,7 +44,7 @@ public class VoiceResponseTest { public void testEmptyElement() { VoiceResponse elem = new VoiceResponse.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -54,14 +55,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { VoiceResponse elem = new VoiceResponse.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CResponse%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CResponse%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { VoiceResponse elem = new VoiceResponse.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -208,7 +209,7 @@ public void testElementWithChildren() { VoiceResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -244,7 +245,7 @@ public void testElementWithTextNode() { VoiceResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -264,7 +265,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -284,7 +285,7 @@ public void testElementWithGenericNode() { VoiceResponse.Builder builder = new VoiceResponse.Builder(); VoiceResponse elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -303,7 +304,7 @@ public void testElementWithGenericNodeAttributes() { VoiceResponse.Builder builder = new VoiceResponse.Builder(); VoiceResponse elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -318,7 +319,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final VoiceResponse elem = new VoiceResponse.Builder().build(); - Assert.assertEquals( + assertEquals( VoiceResponse.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -464,7 +465,7 @@ public void testXmlChildrenDeserialization() { final VoiceResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( VoiceResponse.Builder.fromXml("" + "" + "number" + @@ -529,7 +530,7 @@ public void testXmlEmptyChildrenDeserialization() { final VoiceResponse elem = builder.build(); - Assert.assertEquals( + assertEquals( VoiceResponse.Builder.fromXml("" + "" + "" + @@ -551,4 +552,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/fax/ReceiveTest.java b/src/test/java/com/twilio/twiml/fax/ReceiveTest.java index 6a94655b00..7890d19139 100644 --- a/src/test/java/com/twilio/twiml/fax/ReceiveTest.java +++ b/src/test/java/com/twilio/twiml/fax/ReceiveTest.java @@ -7,12 +7,14 @@ package com.twilio.twiml.fax; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; +import org.junit.jupiter.api.Test; /** * Test class for {@link Receive} @@ -22,7 +24,7 @@ public class ReceiveTest { public void testEmptyElement() { Receive elem = new Receive.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -33,7 +35,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Receive elem = new Receive.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CReceive%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CReceive%2F%3E", elem.toUrl()); } @Test @@ -46,7 +48,7 @@ public void testElementWithParams() { .storeMedia(true) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -57,7 +59,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Receive elem = new Receive.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -72,7 +74,7 @@ public void testElementWithTextNode() { Receive elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -92,7 +94,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -112,7 +114,7 @@ public void testElementWithGenericNode() { Receive.Builder builder = new Receive.Builder(); Receive elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -133,9 +135,9 @@ public void testXmlAttributesDeserialization() { .storeMedia(true) .build(); - Assert.assertEquals( + assertEquals( Receive.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/messaging/BodyTest.java b/src/test/java/com/twilio/twiml/messaging/BodyTest.java index afc0267955..4f9bd2f0f9 100644 --- a/src/test/java/com/twilio/twiml/messaging/BodyTest.java +++ b/src/test/java/com/twilio/twiml/messaging/BodyTest.java @@ -7,8 +7,10 @@ package com.twilio.twiml.messaging; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; /** * Test class for {@link Body} @@ -18,7 +20,7 @@ public class BodyTest { public void testElementWithParams() { Body elem = new Body.Builder("message").build(); - Assert.assertEquals( + assertEquals( "" + "message", elem.toXml() @@ -29,9 +31,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Body elem = new Body.Builder("message").build(); - Assert.assertEquals( + assertEquals( Body.Builder.fromXml("message").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/messaging/MediaTest.java b/src/test/java/com/twilio/twiml/messaging/MediaTest.java index ab6bfe0bd2..453b7e7f09 100644 --- a/src/test/java/com/twilio/twiml/messaging/MediaTest.java +++ b/src/test/java/com/twilio/twiml/messaging/MediaTest.java @@ -7,10 +7,12 @@ package com.twilio.twiml.messaging; -import org.junit.Assert; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; +import org.junit.jupiter.api.Test; /** * Test class for {@link Media} @@ -20,7 +22,7 @@ public class MediaTest { public void testElementWithParams() { Media elem = new Media.Builder(URI.create("https://example.com")).build(); - Assert.assertEquals( + assertEquals( "" + "https://example.com", elem.toXml() @@ -31,9 +33,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Media elem = new Media.Builder(URI.create("https://example.com")).build(); - Assert.assertEquals( + assertEquals( Media.Builder.fromXml("https://example.com").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/messaging/MessageTest.java b/src/test/java/com/twilio/twiml/messaging/MessageTest.java index a79a70b9dd..1c600bc198 100644 --- a/src/test/java/com/twilio/twiml/messaging/MessageTest.java +++ b/src/test/java/com/twilio/twiml/messaging/MessageTest.java @@ -7,12 +7,14 @@ package com.twilio.twiml.messaging; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; +import org.junit.jupiter.api.Test; /** * Test class for {@link Message} @@ -22,7 +24,7 @@ public class MessageTest { public void testEmptyElement() { Message elem = new Message.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -33,7 +35,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Message elem = new Message.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CMessage%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CMessage%2F%3E", elem.toUrl()); } @Test @@ -46,7 +48,7 @@ public void testElementWithParams() { .statusCallback(URI.create("https://example.com")) .build(); - Assert.assertEquals( + assertEquals( "" + "body", elem.toXml() @@ -57,7 +59,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Message elem = new Message.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -74,7 +76,7 @@ public void testElementWithChildren() { Message elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "message" + @@ -92,7 +94,7 @@ public void testElementWithTextNode() { Message elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -112,7 +114,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -132,7 +134,7 @@ public void testElementWithGenericNode() { Message.Builder builder = new Message.Builder(); Message elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -151,7 +153,7 @@ public void testElementWithGenericNodeAttributes() { Message.Builder builder = new Message.Builder(); Message elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -172,7 +174,7 @@ public void testXmlAttributesDeserialization() { .statusCallback(URI.create("https://example.com")) .build(); - Assert.assertEquals( + assertEquals( Message.Builder.fromXml("body").build().toXml(), elem.toXml() ); @@ -188,7 +190,7 @@ public void testXmlChildrenDeserialization() { final Message elem = builder.build(); - Assert.assertEquals( + assertEquals( Message.Builder.fromXml("" + "message" + "https://example.com" + @@ -196,4 +198,4 @@ public void testXmlChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/messaging/RedirectTest.java b/src/test/java/com/twilio/twiml/messaging/RedirectTest.java index cdf0530730..2d8b4b8db0 100644 --- a/src/test/java/com/twilio/twiml/messaging/RedirectTest.java +++ b/src/test/java/com/twilio/twiml/messaging/RedirectTest.java @@ -7,11 +7,13 @@ package com.twilio.twiml.messaging; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; +import org.junit.jupiter.api.Test; /** * Test class for {@link Redirect} @@ -21,7 +23,7 @@ public class RedirectTest { public void testElementWithParams() { Redirect elem = new Redirect.Builder(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( "" + "https://example.com", elem.toXml() @@ -32,9 +34,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Redirect elem = new Redirect.Builder(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( Redirect.Builder.fromXml("https://example.com").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ApplicationSidTest.java b/src/test/java/com/twilio/twiml/voice/ApplicationSidTest.java index 762148227e..0628ebf5fc 100644 --- a/src/test/java/com/twilio/twiml/voice/ApplicationSidTest.java +++ b/src/test/java/com/twilio/twiml/voice/ApplicationSidTest.java @@ -7,8 +7,10 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; /** * Test class for {@link ApplicationSid} @@ -18,7 +20,7 @@ public class ApplicationSidTest { public void testElementWithParams() { ApplicationSid elem = new ApplicationSid.Builder("sid").build(); - Assert.assertEquals( + assertEquals( "" + "sid", elem.toXml() @@ -29,9 +31,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final ApplicationSid elem = new ApplicationSid.Builder("sid").build(); - Assert.assertEquals( + assertEquals( ApplicationSid.Builder.fromXml("sid").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ApplicationTest.java b/src/test/java/com/twilio/twiml/voice/ApplicationTest.java index d8fd17ecea..f6edc434a6 100644 --- a/src/test/java/com/twilio/twiml/voice/ApplicationTest.java +++ b/src/test/java/com/twilio/twiml/voice/ApplicationTest.java @@ -7,14 +7,15 @@ package com.twilio.twiml.voice; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; -import java.util.List; +import org.junit.jupiter.api.Test; /** * Test class for {@link Application} @@ -24,7 +25,7 @@ public class ApplicationTest { public void testEmptyElement() { Application elem = new Application.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,7 +36,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Application elem = new Application.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CApplication%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CApplication%2F%3E", elem.toUrl()); } @Test @@ -50,7 +51,7 @@ public void testElementWithParams() { .copyParentTo(true) .build(); - Assert.assertEquals( + assertEquals( "" + "application_sid", elem.toXml() @@ -61,7 +62,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Application elem = new Application.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -78,7 +79,7 @@ public void testElementWithChildren() { Application elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "sid" + @@ -96,7 +97,7 @@ public void testElementWithTextNode() { Application elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -116,7 +117,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -136,7 +137,7 @@ public void testElementWithGenericNode() { Application.Builder builder = new Application.Builder(); Application elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -155,7 +156,7 @@ public void testElementWithGenericNodeAttributes() { Application.Builder builder = new Application.Builder(); Application elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -178,7 +179,7 @@ public void testXmlAttributesDeserialization() { .copyParentTo(true) .build(); - Assert.assertEquals( + assertEquals( Application.Builder.fromXml("application_sid").build().toXml(), elem.toXml() ); @@ -194,7 +195,7 @@ public void testXmlChildrenDeserialization() { final Application elem = builder.build(); - Assert.assertEquals( + assertEquals( Application.Builder.fromXml("" + "sid" + "" + @@ -211,11 +212,11 @@ public void testXmlEmptyChildrenDeserialization() { final Application elem = builder.build(); - Assert.assertEquals( + assertEquals( Application.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/AssistantTest.java b/src/test/java/com/twilio/twiml/voice/AssistantTest.java index dd25c4bf62..09d86ab56e 100644 --- a/src/test/java/com/twilio/twiml/voice/AssistantTest.java +++ b/src/test/java/com/twilio/twiml/voice/AssistantTest.java @@ -7,9 +7,11 @@ package com.twilio.twiml.voice; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + /** * Test class for {@link Assistant} @@ -19,7 +21,7 @@ public class AssistantTest { public void testEmptyElement() { Assistant elem = new Assistant.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,7 +32,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Assistant elem = new Assistant.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CAssistant%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CAssistant%2F%3E", elem.toUrl()); } @Test @@ -54,7 +56,7 @@ public void testElementWithParams() { .debug(true) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -65,7 +67,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Assistant elem = new Assistant.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -88,7 +90,7 @@ public void testElementWithChildren() { Assistant elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -106,7 +108,7 @@ public void testElementWithTextNode() { Assistant elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -126,7 +128,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -146,7 +148,7 @@ public void testElementWithGenericNode() { Assistant.Builder builder = new Assistant.Builder(); Assistant elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -165,7 +167,7 @@ public void testElementWithGenericNodeAttributes() { Assistant.Builder builder = new Assistant.Builder(); Assistant elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -197,7 +199,7 @@ public void testXmlAttributesDeserialization() { .debug(true) .build(); - Assert.assertEquals( + assertEquals( Assistant.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -219,7 +221,7 @@ public void testXmlChildrenDeserialization() { final Assistant elem = builder.build(); - Assert.assertEquals( + assertEquals( Assistant.Builder.fromXml("" + "" + "" + @@ -238,7 +240,7 @@ public void testXmlEmptyChildrenDeserialization() { final Assistant elem = builder.build(); - Assert.assertEquals( + assertEquals( Assistant.Builder.fromXml("" + "" + "" + @@ -246,4 +248,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/AutopilotTest.java b/src/test/java/com/twilio/twiml/voice/AutopilotTest.java index 8cb317ff6a..3e3aaf93fc 100644 --- a/src/test/java/com/twilio/twiml/voice/AutopilotTest.java +++ b/src/test/java/com/twilio/twiml/voice/AutopilotTest.java @@ -7,8 +7,10 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; /** * Test class for {@link Autopilot} @@ -18,7 +20,7 @@ public class AutopilotTest { public void testElementWithParams() { Autopilot elem = new Autopilot.Builder("name").build(); - Assert.assertEquals( + assertEquals( "" + "name", elem.toXml() @@ -29,9 +31,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Autopilot elem = new Autopilot.Builder("name").build(); - Assert.assertEquals( + assertEquals( Autopilot.Builder.fromXml("name").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ClientTest.java b/src/test/java/com/twilio/twiml/voice/ClientTest.java index 2b239ec103..29de6d5f62 100644 --- a/src/test/java/com/twilio/twiml/voice/ClientTest.java +++ b/src/test/java/com/twilio/twiml/voice/ClientTest.java @@ -7,14 +7,15 @@ package com.twilio.twiml.voice; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; + import java.net.URI; -import java.util.List; +import org.junit.jupiter.api.Test; /** * Test class for {@link Client} @@ -24,7 +25,7 @@ public class ClientTest { public void testEmptyElement() { Client elem = new Client.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,7 +36,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Client elem = new Client.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CClient%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CClient%2F%3E", elem.toUrl()); } @Test @@ -48,7 +49,7 @@ public void testElementWithParams() { .statusCallbackMethod(HttpMethod.GET) .build(); - Assert.assertEquals( + assertEquals( "" + "identity", elem.toXml() @@ -59,7 +60,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Client elem = new Client.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -76,7 +77,7 @@ public void testElementWithChildren() { Client elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "client_identity" + @@ -94,7 +95,7 @@ public void testElementWithTextNode() { Client elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -114,7 +115,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -134,7 +135,7 @@ public void testElementWithGenericNode() { Client.Builder builder = new Client.Builder(); Client elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -153,7 +154,7 @@ public void testElementWithGenericNodeAttributes() { Client.Builder builder = new Client.Builder(); Client elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -174,7 +175,7 @@ public void testXmlAttributesDeserialization() { .statusCallbackMethod(HttpMethod.GET) .build(); - Assert.assertEquals( + assertEquals( Client.Builder.fromXml("identity").build().toXml(), elem.toXml() ); @@ -190,7 +191,7 @@ public void testXmlChildrenDeserialization() { final Client elem = builder.build(); - Assert.assertEquals( + assertEquals( Client.Builder.fromXml("" + "client_identity" + "" + @@ -207,11 +208,11 @@ public void testXmlEmptyChildrenDeserialization() { final Client elem = builder.build(); - Assert.assertEquals( + assertEquals( Client.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ConferenceTest.java b/src/test/java/com/twilio/twiml/voice/ConferenceTest.java index 15d68c07e8..75867a82b3 100644 --- a/src/test/java/com/twilio/twiml/voice/ConferenceTest.java +++ b/src/test/java/com/twilio/twiml/voice/ConferenceTest.java @@ -9,11 +9,10 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; import java.net.URI; -import java.util.List; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Conference} @@ -44,7 +43,7 @@ public void testElementWithParams() { .participantLabel("participant_label") .build(); - Assert.assertEquals( + assertEquals( "" + "name", elem.toXml() @@ -76,9 +75,9 @@ public void testXmlAttributesDeserialization() { .participantLabel("participant_label") .build(); - Assert.assertEquals( + assertEquals( Conference.Builder.fromXml("name").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ConfigTest.java b/src/test/java/com/twilio/twiml/voice/ConfigTest.java index 0639e73ea2..abbbe3757d 100644 --- a/src/test/java/com/twilio/twiml/voice/ConfigTest.java +++ b/src/test/java/com/twilio/twiml/voice/ConfigTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Config} @@ -19,7 +19,7 @@ public class ConfigTest { public void testEmptyElement() { Config elem = new Config.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Config elem = new Config.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConfig%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConfig%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Config elem = new Config.Builder().name("name").value("value").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Config elem = new Config.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -63,7 +63,7 @@ public void testElementWithTextNode() { Config elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -83,7 +83,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -103,7 +103,7 @@ public void testElementWithGenericNode() { Config.Builder builder = new Config.Builder(); Config elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -118,9 +118,9 @@ public void testElementWithGenericNode() { public void testXmlAttributesDeserialization() { final Config elem = new Config.Builder().name("name").value("value").build(); - Assert.assertEquals( + assertEquals( Config.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ConnectTest.java b/src/test/java/com/twilio/twiml/voice/ConnectTest.java index a612d244c4..d0729028d4 100644 --- a/src/test/java/com/twilio/twiml/voice/ConnectTest.java +++ b/src/test/java/com/twilio/twiml/voice/ConnectTest.java @@ -10,11 +10,10 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Connect} @@ -24,7 +23,7 @@ public class ConnectTest { public void testEmptyElement() { Connect elem = new Connect.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,14 +34,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Connect elem = new Connect.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConnect%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConnect%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Connect elem = new Connect.Builder().action(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -53,7 +52,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Connect elem = new Connect.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -142,7 +141,7 @@ public void testElementWithChildren() { Connect elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "name" + @@ -165,7 +164,7 @@ public void testElementWithTextNode() { Connect elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -185,7 +184,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -205,7 +204,7 @@ public void testElementWithGenericNode() { Connect.Builder builder = new Connect.Builder(); Connect elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -224,7 +223,7 @@ public void testElementWithGenericNodeAttributes() { Connect.Builder builder = new Connect.Builder(); Connect elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -239,7 +238,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Connect elem = new Connect.Builder().action(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( Connect.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -327,7 +326,7 @@ public void testXmlChildrenDeserialization() { final Connect elem = builder.build(); - Assert.assertEquals( + assertEquals( Connect.Builder.fromXml("" + "name" + "name" + @@ -357,7 +356,7 @@ public void testXmlEmptyChildrenDeserialization() { final Connect elem = builder.build(); - Assert.assertEquals( + assertEquals( Connect.Builder.fromXml("" + "" + "" + @@ -368,4 +367,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java b/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java index 6b219cbdd2..81d6deacd6 100644 --- a/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java +++ b/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link ConversationRelay} @@ -19,7 +19,7 @@ public class ConversationRelayTest { public void testEmptyElement() { ConversationRelay elem = new ConversationRelay.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,7 +30,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { ConversationRelay elem = new ConversationRelay.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConversationRelay%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConversationRelay%2F%3E", elem.toUrl()); } @Test @@ -54,7 +54,7 @@ public void testElementWithParams() { .debug(true) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -65,7 +65,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { ConversationRelay elem = new ConversationRelay.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -88,7 +88,7 @@ public void testElementWithChildren() { ConversationRelay elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -106,7 +106,7 @@ public void testElementWithTextNode() { ConversationRelay elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -126,7 +126,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -146,7 +146,7 @@ public void testElementWithGenericNode() { ConversationRelay.Builder builder = new ConversationRelay.Builder(); ConversationRelay elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -165,7 +165,7 @@ public void testElementWithGenericNodeAttributes() { ConversationRelay.Builder builder = new ConversationRelay.Builder(); ConversationRelay elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -197,7 +197,7 @@ public void testXmlAttributesDeserialization() { .debug(true) .build(); - Assert.assertEquals( + assertEquals( ConversationRelay.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -219,7 +219,7 @@ public void testXmlChildrenDeserialization() { final ConversationRelay elem = builder.build(); - Assert.assertEquals( + assertEquals( ConversationRelay.Builder.fromXml("" + "" + "" + @@ -238,7 +238,7 @@ public void testXmlEmptyChildrenDeserialization() { final ConversationRelay elem = builder.build(); - Assert.assertEquals( + assertEquals( ConversationRelay.Builder.fromXml("" + "" + "" + @@ -246,4 +246,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ConversationTest.java b/src/test/java/com/twilio/twiml/voice/ConversationTest.java index 343002ef46..7d360ec80d 100644 --- a/src/test/java/com/twilio/twiml/voice/ConversationTest.java +++ b/src/test/java/com/twilio/twiml/voice/ConversationTest.java @@ -10,11 +10,10 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Conversation} @@ -24,7 +23,7 @@ public class ConversationTest { public void testEmptyElement() { Conversation elem = new Conversation.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,7 +34,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Conversation elem = new Conversation.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConversation%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CConversation%2F%3E", elem.toUrl()); } @Test @@ -57,7 +56,7 @@ public void testElementWithParams() { .statusCallbackEvents(Promoter.listOfOne(Conversation.Event.CALL_INITIATED)) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -68,7 +67,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Conversation elem = new Conversation.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -83,7 +82,7 @@ public void testElementWithTextNode() { Conversation elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -103,7 +102,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -123,7 +122,7 @@ public void testElementWithGenericNode() { Conversation.Builder builder = new Conversation.Builder(); Conversation elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -153,9 +152,9 @@ public void testXmlAttributesDeserialization() { .statusCallbackEvents(Promoter.listOfOne(Conversation.Event.CALL_INITIATED)) .build(); - Assert.assertEquals( + assertEquals( Conversation.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/DialTest.java b/src/test/java/com/twilio/twiml/voice/DialTest.java index df5e2d3b31..7959fd8c30 100644 --- a/src/test/java/com/twilio/twiml/voice/DialTest.java +++ b/src/test/java/com/twilio/twiml/voice/DialTest.java @@ -10,11 +10,10 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Dial} @@ -24,7 +23,7 @@ public class DialTest { public void testEmptyElement() { Dial elem = new Dial.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,7 +34,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Dial elem = new Dial.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CDial%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CDial%2F%3E", elem.toUrl()); } @Test @@ -61,7 +60,7 @@ public void testElementWithParams() { .events(Dial.Events.CALL_PROGRESS_EVENT) .build(); - Assert.assertEquals( + assertEquals( "" + "number", elem.toXml() @@ -72,7 +71,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Dial elem = new Dial.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -169,7 +168,7 @@ public void testElementWithChildren() { Dial elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "identity" + @@ -192,7 +191,7 @@ public void testElementWithTextNode() { Dial elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -212,7 +211,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -232,7 +231,7 @@ public void testElementWithGenericNode() { Dial.Builder builder = new Dial.Builder(); Dial elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -251,7 +250,7 @@ public void testElementWithGenericNodeAttributes() { Dial.Builder builder = new Dial.Builder(); Dial elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -285,7 +284,7 @@ public void testXmlAttributesDeserialization() { .events(Dial.Events.CALL_PROGRESS_EVENT) .build(); - Assert.assertEquals( + assertEquals( Dial.Builder.fromXml("number").build().toXml(), elem.toXml() ); @@ -381,7 +380,7 @@ public void testXmlChildrenDeserialization() { final Dial elem = builder.build(); - Assert.assertEquals( + assertEquals( Dial.Builder.fromXml("" + "identity" + "name" + @@ -405,7 +404,7 @@ public void testXmlEmptyChildrenDeserialization() { final Dial elem = builder.build(); - Assert.assertEquals( + assertEquals( Dial.Builder.fromXml("" + "" + "" + @@ -413,4 +412,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/EchoTest.java b/src/test/java/com/twilio/twiml/voice/EchoTest.java index 8888655ef9..e6f6edd4d5 100644 --- a/src/test/java/com/twilio/twiml/voice/EchoTest.java +++ b/src/test/java/com/twilio/twiml/voice/EchoTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Echo} @@ -19,7 +19,7 @@ public class EchoTest { public void testEmptyElement() { Echo elem = new Echo.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Echo elem = new Echo.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CEcho%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CEcho%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { Echo elem = new Echo.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -52,7 +52,7 @@ public void testElementWithTextNode() { Echo elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -72,7 +72,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -92,7 +92,7 @@ public void testElementWithGenericNode() { Echo.Builder builder = new Echo.Builder(); Echo elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -107,9 +107,9 @@ public void testElementWithGenericNode() { public void testXmlAttributesDeserialization() { final Echo elem = new Echo.Builder().build(); - Assert.assertEquals( + assertEquals( Echo.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/EnqueueTest.java b/src/test/java/com/twilio/twiml/voice/EnqueueTest.java index 36d9c9841d..eabcaeef7a 100644 --- a/src/test/java/com/twilio/twiml/voice/EnqueueTest.java +++ b/src/test/java/com/twilio/twiml/voice/EnqueueTest.java @@ -9,8 +9,8 @@ import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -22,7 +22,7 @@ public class EnqueueTest { public void testEmptyElement() { Enqueue elem = new Enqueue.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -33,7 +33,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Enqueue elem = new Enqueue.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CEnqueue%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CEnqueue%2F%3E", elem.toUrl()); } @Test @@ -47,7 +47,7 @@ public void testElementWithParams() { .workflowSid("workflow_sid") .build(); - Assert.assertEquals( + assertEquals( "" + "name", elem.toXml() @@ -58,7 +58,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Enqueue elem = new Enqueue.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -73,7 +73,7 @@ public void testElementWithChildren() { Enqueue elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "body" + @@ -90,7 +90,7 @@ public void testElementWithTextNode() { Enqueue elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -110,7 +110,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -130,7 +130,7 @@ public void testElementWithGenericNode() { Enqueue.Builder builder = new Enqueue.Builder(); Enqueue elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -149,7 +149,7 @@ public void testElementWithGenericNodeAttributes() { Enqueue.Builder builder = new Enqueue.Builder(); Enqueue elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -171,7 +171,7 @@ public void testXmlAttributesDeserialization() { .workflowSid("workflow_sid") .build(); - Assert.assertEquals( + assertEquals( Enqueue.Builder.fromXml("name").build().toXml(), elem.toXml() ); @@ -185,11 +185,11 @@ public void testXmlChildrenDeserialization() { final Enqueue elem = builder.build(); - Assert.assertEquals( + assertEquals( Enqueue.Builder.fromXml("" + "body" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/GatherTest.java b/src/test/java/com/twilio/twiml/voice/GatherTest.java index 4640fbc97c..12e966645a 100644 --- a/src/test/java/com/twilio/twiml/voice/GatherTest.java +++ b/src/test/java/com/twilio/twiml/voice/GatherTest.java @@ -10,11 +10,10 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Gather} @@ -24,7 +23,7 @@ public class GatherTest { public void testEmptyElement() { Gather elem = new Gather.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,7 +34,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Gather elem = new Gather.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CGather%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CGather%2F%3E", elem.toUrl()); } @Test @@ -61,7 +60,7 @@ public void testElementWithParams() { .enhanced(true) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -72,7 +71,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Gather elem = new Gather.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -91,7 +90,7 @@ public void testElementWithChildren() { Gather elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "message" + @@ -110,7 +109,7 @@ public void testElementWithTextNode() { Gather elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -130,7 +129,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -150,7 +149,7 @@ public void testElementWithGenericNode() { Gather.Builder builder = new Gather.Builder(); Gather elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -169,7 +168,7 @@ public void testElementWithGenericNodeAttributes() { Gather.Builder builder = new Gather.Builder(); Gather elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -203,7 +202,7 @@ public void testXmlAttributesDeserialization() { .enhanced(true) .build(); - Assert.assertEquals( + assertEquals( Gather.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -221,7 +220,7 @@ public void testXmlChildrenDeserialization() { final Gather elem = builder.build(); - Assert.assertEquals( + assertEquals( Gather.Builder.fromXml("" + "message" + "" + @@ -241,7 +240,7 @@ public void testXmlEmptyChildrenDeserialization() { final Gather elem = builder.build(); - Assert.assertEquals( + assertEquals( Gather.Builder.fromXml("" + "" + "" + @@ -249,4 +248,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/HangupTest.java b/src/test/java/com/twilio/twiml/voice/HangupTest.java index 798c5dc59c..2aad535af5 100644 --- a/src/test/java/com/twilio/twiml/voice/HangupTest.java +++ b/src/test/java/com/twilio/twiml/voice/HangupTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Hangup} @@ -19,7 +19,7 @@ public class HangupTest { public void testEmptyElement() { Hangup elem = new Hangup.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Hangup elem = new Hangup.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CHangup%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CHangup%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { Hangup elem = new Hangup.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -52,7 +52,7 @@ public void testElementWithChildren() { Hangup elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -69,7 +69,7 @@ public void testElementWithTextNode() { Hangup elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -89,7 +89,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -109,7 +109,7 @@ public void testElementWithGenericNode() { Hangup.Builder builder = new Hangup.Builder(); Hangup elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -128,7 +128,7 @@ public void testElementWithGenericNodeAttributes() { Hangup.Builder builder = new Hangup.Builder(); Hangup elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -143,7 +143,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Hangup elem = new Hangup.Builder().build(); - Assert.assertEquals( + assertEquals( Hangup.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -157,7 +157,7 @@ public void testXmlChildrenDeserialization() { final Hangup elem = builder.build(); - Assert.assertEquals( + assertEquals( Hangup.Builder.fromXml("" + "" + "").build().toXml(), @@ -173,11 +173,11 @@ public void testXmlEmptyChildrenDeserialization() { final Hangup elem = builder.build(); - Assert.assertEquals( + assertEquals( Hangup.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/IdentityTest.java b/src/test/java/com/twilio/twiml/voice/IdentityTest.java index bd9e751947..2bd3029f21 100644 --- a/src/test/java/com/twilio/twiml/voice/IdentityTest.java +++ b/src/test/java/com/twilio/twiml/voice/IdentityTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Identity} @@ -18,7 +18,7 @@ public class IdentityTest { public void testElementWithParams() { Identity elem = new Identity.Builder("client_identity").build(); - Assert.assertEquals( + assertEquals( "" + "client_identity", elem.toXml() @@ -29,9 +29,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Identity elem = new Identity.Builder("client_identity").build(); - Assert.assertEquals( + assertEquals( Identity.Builder.fromXml("client_identity").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/LanguageTest.java b/src/test/java/com/twilio/twiml/voice/LanguageTest.java index ffd54bb6fd..558e621094 100644 --- a/src/test/java/com/twilio/twiml/voice/LanguageTest.java +++ b/src/test/java/com/twilio/twiml/voice/LanguageTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Language} @@ -19,7 +19,7 @@ public class LanguageTest { public void testEmptyElement() { Language elem = new Language.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,7 +30,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Language elem = new Language.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CLanguage%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CLanguage%2F%3E", elem.toUrl()); } @Test @@ -43,7 +43,7 @@ public void testElementWithParams() { .speechModel("speech_model") .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -54,7 +54,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Language elem = new Language.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -69,7 +69,7 @@ public void testElementWithTextNode() { Language elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -89,7 +89,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -109,7 +109,7 @@ public void testElementWithGenericNode() { Language.Builder builder = new Language.Builder(); Language elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -130,9 +130,9 @@ public void testXmlAttributesDeserialization() { .speechModel("speech_model") .build(); - Assert.assertEquals( + assertEquals( Language.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/LeaveTest.java b/src/test/java/com/twilio/twiml/voice/LeaveTest.java index dac0ea50a3..15e36310e6 100644 --- a/src/test/java/com/twilio/twiml/voice/LeaveTest.java +++ b/src/test/java/com/twilio/twiml/voice/LeaveTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Leave} @@ -19,7 +19,7 @@ public class LeaveTest { public void testEmptyElement() { Leave elem = new Leave.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Leave elem = new Leave.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CLeave%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CLeave%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { Leave elem = new Leave.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -52,7 +52,7 @@ public void testElementWithTextNode() { Leave elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -72,7 +72,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -92,7 +92,7 @@ public void testElementWithGenericNode() { Leave.Builder builder = new Leave.Builder(); Leave elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -107,9 +107,9 @@ public void testElementWithGenericNode() { public void testXmlAttributesDeserialization() { final Leave elem = new Leave.Builder().build(); - Assert.assertEquals( + assertEquals( Leave.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/NumberTest.java b/src/test/java/com/twilio/twiml/voice/NumberTest.java index 5ba0061501..ad4d898e83 100644 --- a/src/test/java/com/twilio/twiml/voice/NumberTest.java +++ b/src/test/java/com/twilio/twiml/voice/NumberTest.java @@ -9,11 +9,10 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Number} @@ -38,7 +37,7 @@ public void testElementWithParams() { .machineDetectionSilenceTimeout(1) .build(); - Assert.assertEquals( + assertEquals( "" + "+15017122661", elem.toXml() @@ -64,9 +63,9 @@ public void testXmlAttributesDeserialization() { .machineDetectionSilenceTimeout(1) .build(); - Assert.assertEquals( + assertEquals( Number.Builder.fromXml("+15017122661").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ParameterTest.java b/src/test/java/com/twilio/twiml/voice/ParameterTest.java index e7e978c8d9..1c01c94d8e 100644 --- a/src/test/java/com/twilio/twiml/voice/ParameterTest.java +++ b/src/test/java/com/twilio/twiml/voice/ParameterTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Parameter} @@ -19,7 +19,7 @@ public class ParameterTest { public void testEmptyElement() { Parameter elem = new Parameter.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Parameter elem = new Parameter.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CParameter%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CParameter%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Parameter elem = new Parameter.Builder().name("name").value("value").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Parameter elem = new Parameter.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -63,7 +63,7 @@ public void testElementWithTextNode() { Parameter elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -83,7 +83,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -103,7 +103,7 @@ public void testElementWithGenericNode() { Parameter.Builder builder = new Parameter.Builder(); Parameter elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -118,9 +118,9 @@ public void testElementWithGenericNode() { public void testXmlAttributesDeserialization() { final Parameter elem = new Parameter.Builder().name("name").value("value").build(); - Assert.assertEquals( + assertEquals( Parameter.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/PauseTest.java b/src/test/java/com/twilio/twiml/voice/PauseTest.java index 0659ebb54a..bce4a110c3 100644 --- a/src/test/java/com/twilio/twiml/voice/PauseTest.java +++ b/src/test/java/com/twilio/twiml/voice/PauseTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Pause} @@ -19,7 +19,7 @@ public class PauseTest { public void testEmptyElement() { Pause elem = new Pause.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Pause elem = new Pause.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CPause%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CPause%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Pause elem = new Pause.Builder().length(1).build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Pause elem = new Pause.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -63,7 +63,7 @@ public void testElementWithTextNode() { Pause elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -83,7 +83,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -103,7 +103,7 @@ public void testElementWithGenericNode() { Pause.Builder builder = new Pause.Builder(); Pause elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -118,9 +118,9 @@ public void testElementWithGenericNode() { public void testXmlAttributesDeserialization() { final Pause elem = new Pause.Builder().length(1).build(); - Assert.assertEquals( + assertEquals( Pause.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/PayTest.java b/src/test/java/com/twilio/twiml/voice/PayTest.java index 33811f20af..fedbbab2c6 100644 --- a/src/test/java/com/twilio/twiml/voice/PayTest.java +++ b/src/test/java/com/twilio/twiml/voice/PayTest.java @@ -9,11 +9,10 @@ import com.twilio.converter.Promoter; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Pay} @@ -23,7 +22,7 @@ public class PayTest { public void testEmptyElement() { Pay elem = new Pay.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -34,7 +33,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Pay elem = new Pay.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CPay%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CPay%2F%3E", elem.toUrl()); } @Test @@ -60,7 +59,7 @@ public void testElementWithParams() { .language(Pay.Language.DE_DE) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -71,7 +70,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Pay elem = new Pay.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -94,7 +93,7 @@ public void testElementWithChildren() { Pay elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -112,7 +111,7 @@ public void testElementWithTextNode() { Pay elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -132,7 +131,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -152,7 +151,7 @@ public void testElementWithGenericNode() { Pay.Builder builder = new Pay.Builder(); Pay elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -171,7 +170,7 @@ public void testElementWithGenericNodeAttributes() { Pay.Builder builder = new Pay.Builder(); Pay elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -205,7 +204,7 @@ public void testXmlAttributesDeserialization() { .language(Pay.Language.DE_DE) .build(); - Assert.assertEquals( + assertEquals( Pay.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -227,7 +226,7 @@ public void testXmlChildrenDeserialization() { final Pay elem = builder.build(); - Assert.assertEquals( + assertEquals( Pay.Builder.fromXml("" + "" + "" + @@ -246,7 +245,7 @@ public void testXmlEmptyChildrenDeserialization() { final Pay elem = builder.build(); - Assert.assertEquals( + assertEquals( Pay.Builder.fromXml("" + "" + "" + @@ -254,4 +253,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/PlayTest.java b/src/test/java/com/twilio/twiml/voice/PlayTest.java index c9734b80a5..fad90db501 100644 --- a/src/test/java/com/twilio/twiml/voice/PlayTest.java +++ b/src/test/java/com/twilio/twiml/voice/PlayTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -20,7 +20,7 @@ public class PlayTest { public void testElementWithParams() { Play elem = new Play.Builder(URI.create("https://example.com")).loop(1).digits("digits").build(); - Assert.assertEquals( + assertEquals( "" + "https://example.com", elem.toXml() @@ -31,9 +31,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Play elem = new Play.Builder(URI.create("https://example.com")).loop(1).digits("digits").build(); - Assert.assertEquals( + assertEquals( Play.Builder.fromXml("https://example.com").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/PromptTest.java b/src/test/java/com/twilio/twiml/voice/PromptTest.java index 987d245369..58c26c2531 100644 --- a/src/test/java/com/twilio/twiml/voice/PromptTest.java +++ b/src/test/java/com/twilio/twiml/voice/PromptTest.java @@ -9,11 +9,10 @@ import com.twilio.converter.Promoter; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; -import java.util.List; /** * Test class for {@link Prompt} @@ -23,7 +22,7 @@ public class PromptTest { public void testEmptyElement() { Prompt elem = new Prompt.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -34,7 +33,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Prompt elem = new Prompt.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CPrompt%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CPrompt%2F%3E", elem.toUrl()); } @Test @@ -47,7 +46,7 @@ public void testElementWithParams() { .requireMatchingInputs(true) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -58,7 +57,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Prompt elem = new Prompt.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -77,7 +76,7 @@ public void testElementWithChildren() { Prompt elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "message" + @@ -96,7 +95,7 @@ public void testElementWithTextNode() { Prompt elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -116,7 +115,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -136,7 +135,7 @@ public void testElementWithGenericNode() { Prompt.Builder builder = new Prompt.Builder(); Prompt elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -155,7 +154,7 @@ public void testElementWithGenericNodeAttributes() { Prompt.Builder builder = new Prompt.Builder(); Prompt elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -176,7 +175,7 @@ public void testXmlAttributesDeserialization() { .requireMatchingInputs(true) .build(); - Assert.assertEquals( + assertEquals( Prompt.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -194,7 +193,7 @@ public void testXmlChildrenDeserialization() { final Prompt elem = builder.build(); - Assert.assertEquals( + assertEquals( Prompt.Builder.fromXml("" + "message" + "https://example.com" + @@ -214,7 +213,7 @@ public void testXmlEmptyChildrenDeserialization() { final Prompt elem = builder.build(); - Assert.assertEquals( + assertEquals( Prompt.Builder.fromXml("" + "" + "" + @@ -222,4 +221,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/QueueTest.java b/src/test/java/com/twilio/twiml/voice/QueueTest.java index 48454e00ad..a50c291005 100644 --- a/src/test/java/com/twilio/twiml/voice/QueueTest.java +++ b/src/test/java/com/twilio/twiml/voice/QueueTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -26,7 +26,7 @@ public void testElementWithParams() { .postWorkActivitySid("post_work_activity_sid") .build(); - Assert.assertEquals( + assertEquals( "" + "name", elem.toXml() @@ -42,9 +42,9 @@ public void testXmlAttributesDeserialization() { .postWorkActivitySid("post_work_activity_sid") .build(); - Assert.assertEquals( + assertEquals( Queue.Builder.fromXml("name").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/RecordTest.java b/src/test/java/com/twilio/twiml/voice/RecordTest.java index b6769cb50e..8cc9892bbd 100644 --- a/src/test/java/com/twilio/twiml/voice/RecordTest.java +++ b/src/test/java/com/twilio/twiml/voice/RecordTest.java @@ -10,8 +10,8 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; import java.util.List; @@ -24,7 +24,7 @@ public class RecordTest { public void testEmptyElement() { Record elem = new Record.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -35,7 +35,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Record elem = new Record.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CRecord%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CRecord%2F%3E", elem.toUrl()); } @Test @@ -55,7 +55,7 @@ public void testElementWithParams() { .transcribeCallback(URI.create("https://example.com")) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -66,7 +66,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Record elem = new Record.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -81,7 +81,7 @@ public void testElementWithTextNode() { Record elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -101,7 +101,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -121,7 +121,7 @@ public void testElementWithGenericNode() { Record.Builder builder = new Record.Builder(); Record elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -149,9 +149,9 @@ public void testXmlAttributesDeserialization() { .transcribeCallback(URI.create("https://example.com")) .build(); - Assert.assertEquals( + assertEquals( Record.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/RedirectTest.java b/src/test/java/com/twilio/twiml/voice/RedirectTest.java index 9268810664..38b6006ff6 100644 --- a/src/test/java/com/twilio/twiml/voice/RedirectTest.java +++ b/src/test/java/com/twilio/twiml/voice/RedirectTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -21,7 +21,7 @@ public class RedirectTest { public void testElementWithParams() { Redirect elem = new Redirect.Builder(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( "" + "https://example.com", elem.toXml() @@ -32,9 +32,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Redirect elem = new Redirect.Builder(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( Redirect.Builder.fromXml("https://example.com").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ReferSipTest.java b/src/test/java/com/twilio/twiml/voice/ReferSipTest.java index 941ca0fdcf..7d02a1dc64 100644 --- a/src/test/java/com/twilio/twiml/voice/ReferSipTest.java +++ b/src/test/java/com/twilio/twiml/voice/ReferSipTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -20,7 +20,7 @@ public class ReferSipTest { public void testElementWithParams() { ReferSip elem = new ReferSip.Builder(URI.create("https://example.com")).build(); - Assert.assertEquals( + assertEquals( "" + "https://example.com", elem.toXml() @@ -31,9 +31,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final ReferSip elem = new ReferSip.Builder(URI.create("https://example.com")).build(); - Assert.assertEquals( + assertEquals( ReferSip.Builder.fromXml("https://example.com").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/ReferTest.java b/src/test/java/com/twilio/twiml/voice/ReferTest.java index 6c880d41e0..8c36c79dc1 100644 --- a/src/test/java/com/twilio/twiml/voice/ReferTest.java +++ b/src/test/java/com/twilio/twiml/voice/ReferTest.java @@ -9,8 +9,8 @@ import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -22,7 +22,7 @@ public class ReferTest { public void testEmptyElement() { Refer elem = new Refer.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -33,14 +33,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Refer elem = new Refer.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CRefer%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CRefer%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Refer elem = new Refer.Builder().action(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -51,7 +51,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Refer elem = new Refer.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -66,7 +66,7 @@ public void testElementWithChildren() { Refer elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "https://example.com" + @@ -83,7 +83,7 @@ public void testElementWithTextNode() { Refer elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -103,7 +103,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -123,7 +123,7 @@ public void testElementWithGenericNode() { Refer.Builder builder = new Refer.Builder(); Refer elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -142,7 +142,7 @@ public void testElementWithGenericNodeAttributes() { Refer.Builder builder = new Refer.Builder(); Refer elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -157,7 +157,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Refer elem = new Refer.Builder().action(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( Refer.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -171,11 +171,11 @@ public void testXmlChildrenDeserialization() { final Refer elem = builder.build(); - Assert.assertEquals( + assertEquals( Refer.Builder.fromXml("" + "https://example.com" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/RejectTest.java b/src/test/java/com/twilio/twiml/voice/RejectTest.java index 4902e8626a..46c1328e7f 100644 --- a/src/test/java/com/twilio/twiml/voice/RejectTest.java +++ b/src/test/java/com/twilio/twiml/voice/RejectTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Reject} @@ -19,7 +19,7 @@ public class RejectTest { public void testEmptyElement() { Reject elem = new Reject.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Reject elem = new Reject.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CReject%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CReject%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Reject elem = new Reject.Builder().reason(Reject.Reason.REJECTED).build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Reject elem = new Reject.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -63,7 +63,7 @@ public void testElementWithChildren() { Reject elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -80,7 +80,7 @@ public void testElementWithTextNode() { Reject elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -100,7 +100,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -120,7 +120,7 @@ public void testElementWithGenericNode() { Reject.Builder builder = new Reject.Builder(); Reject elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -139,7 +139,7 @@ public void testElementWithGenericNodeAttributes() { Reject.Builder builder = new Reject.Builder(); Reject elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -154,7 +154,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Reject elem = new Reject.Builder().reason(Reject.Reason.REJECTED).build(); - Assert.assertEquals( + assertEquals( Reject.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -168,7 +168,7 @@ public void testXmlChildrenDeserialization() { final Reject elem = builder.build(); - Assert.assertEquals( + assertEquals( Reject.Builder.fromXml("" + "" + "").build().toXml(), @@ -184,11 +184,11 @@ public void testXmlEmptyChildrenDeserialization() { final Reject elem = builder.build(); - Assert.assertEquals( + assertEquals( Reject.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/RoomTest.java b/src/test/java/com/twilio/twiml/voice/RoomTest.java index e5a7f32c11..d110ea0fdc 100644 --- a/src/test/java/com/twilio/twiml/voice/RoomTest.java +++ b/src/test/java/com/twilio/twiml/voice/RoomTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Room} @@ -18,7 +18,7 @@ public class RoomTest { public void testElementWithParams() { Room elem = new Room.Builder("name").participantIdentity("participant_identity").build(); - Assert.assertEquals( + assertEquals( "" + "name", elem.toXml() @@ -29,9 +29,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Room elem = new Room.Builder("name").participantIdentity("participant_identity").build(); - Assert.assertEquals( + assertEquals( Room.Builder.fromXml("name").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SayTest.java b/src/test/java/com/twilio/twiml/voice/SayTest.java index a9cea7a3e8..cd289a7fb9 100644 --- a/src/test/java/com/twilio/twiml/voice/SayTest.java +++ b/src/test/java/com/twilio/twiml/voice/SayTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Say} @@ -19,7 +19,7 @@ public class SayTest { public void testEmptyElement() { Say elem = new Say.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Say elem = new Say.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CSay%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CSay%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Say elem = new Say.Builder("message").voice(Say.Voice.MAN).loop(1).language(Say.Language.AF_ZA).build(); - Assert.assertEquals( + assertEquals( "" + "message", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Say elem = new Say.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -84,7 +84,7 @@ public void testElementWithChildren() { Say elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -110,7 +110,7 @@ public void testElementWithTextNode() { Say elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -130,7 +130,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -150,7 +150,7 @@ public void testElementWithGenericNode() { Say.Builder builder = new Say.Builder(); Say elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -169,7 +169,7 @@ public void testElementWithGenericNodeAttributes() { Say.Builder builder = new Say.Builder(); Say elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -184,7 +184,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Say elem = new Say.Builder("message").voice(Say.Voice.MAN).loop(1).language(Say.Language.AF_ZA).build(); - Assert.assertEquals( + assertEquals( Say.Builder.fromXml("message").build().toXml(), elem.toXml() ); @@ -219,7 +219,7 @@ public void testXmlChildrenDeserialization() { final Say elem = builder.build(); - Assert.assertEquals( + assertEquals( Say.Builder.fromXml("" + "" + "words" + @@ -256,7 +256,7 @@ public void testXmlEmptyChildrenDeserialization() { final Say elem = builder.build(); - Assert.assertEquals( + assertEquals( Say.Builder.fromXml("" + "" + "" + @@ -269,4 +269,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SimTest.java b/src/test/java/com/twilio/twiml/voice/SimTest.java index bc3a00c2a3..97d6a77434 100644 --- a/src/test/java/com/twilio/twiml/voice/SimTest.java +++ b/src/test/java/com/twilio/twiml/voice/SimTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Sim} @@ -18,7 +18,7 @@ public class SimTest { public void testElementWithParams() { Sim elem = new Sim.Builder("DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").build(); - Assert.assertEquals( + assertEquals( "" + "DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", elem.toXml() @@ -29,9 +29,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Sim elem = new Sim.Builder("DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").build(); - Assert.assertEquals( + assertEquals( Sim.Builder.fromXml("DEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SipTest.java b/src/test/java/com/twilio/twiml/voice/SipTest.java index 9c372ec95b..aa4844e5f8 100644 --- a/src/test/java/com/twilio/twiml/voice/SipTest.java +++ b/src/test/java/com/twilio/twiml/voice/SipTest.java @@ -9,8 +9,8 @@ import com.twilio.converter.Promoter; import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; import java.util.List; @@ -38,7 +38,7 @@ public void testElementWithParams() { .machineDetectionSilenceTimeout(1) .build(); - Assert.assertEquals( + assertEquals( "" + "https://example.com", elem.toXml() @@ -64,9 +64,9 @@ public void testXmlAttributesDeserialization() { .machineDetectionSilenceTimeout(1) .build(); - Assert.assertEquals( + assertEquals( Sip.Builder.fromXml("https://example.com").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SiprecTest.java b/src/test/java/com/twilio/twiml/voice/SiprecTest.java index 41bfe005e3..e4474ba353 100644 --- a/src/test/java/com/twilio/twiml/voice/SiprecTest.java +++ b/src/test/java/com/twilio/twiml/voice/SiprecTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Siprec} @@ -19,7 +19,7 @@ public class SiprecTest { public void testEmptyElement() { Siprec elem = new Siprec.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,7 +30,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Siprec elem = new Siprec.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CSiprec%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CSiprec%2F%3E", elem.toUrl()); } @Test @@ -43,7 +43,7 @@ public void testElementWithParams() { .statusCallbackMethod(Siprec.StatusCallbackMethod.GET) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -54,7 +54,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Siprec elem = new Siprec.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -69,7 +69,7 @@ public void testElementWithChildren() { Siprec elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -86,7 +86,7 @@ public void testElementWithTextNode() { Siprec elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -106,7 +106,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -126,7 +126,7 @@ public void testElementWithGenericNode() { Siprec.Builder builder = new Siprec.Builder(); Siprec elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -145,7 +145,7 @@ public void testElementWithGenericNodeAttributes() { Siprec.Builder builder = new Siprec.Builder(); Siprec elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -166,7 +166,7 @@ public void testXmlAttributesDeserialization() { .statusCallbackMethod(Siprec.StatusCallbackMethod.GET) .build(); - Assert.assertEquals( + assertEquals( Siprec.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -180,7 +180,7 @@ public void testXmlChildrenDeserialization() { final Siprec elem = builder.build(); - Assert.assertEquals( + assertEquals( Siprec.Builder.fromXml("" + "" + "").build().toXml(), @@ -196,11 +196,11 @@ public void testXmlEmptyChildrenDeserialization() { final Siprec elem = builder.build(); - Assert.assertEquals( + assertEquals( Siprec.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SmsTest.java b/src/test/java/com/twilio/twiml/voice/SmsTest.java index cf3c72466d..07357187ae 100644 --- a/src/test/java/com/twilio/twiml/voice/SmsTest.java +++ b/src/test/java/com/twilio/twiml/voice/SmsTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.http.HttpMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -27,7 +27,7 @@ public void testElementWithParams() { .statusCallback(URI.create("https://example.com")) .build(); - Assert.assertEquals( + assertEquals( "" + "message", elem.toXml() @@ -44,9 +44,9 @@ public void testXmlAttributesDeserialization() { .statusCallback(URI.create("https://example.com")) .build(); - Assert.assertEquals( + assertEquals( Sms.Builder.fromXml("message").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlBreakTest.java b/src/test/java/com/twilio/twiml/voice/SsmlBreakTest.java index 837fbe4b11..7e5cf99163 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlBreakTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlBreakTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlBreak} @@ -19,7 +19,7 @@ public class SsmlBreakTest { public void testEmptyElement() { SsmlBreak elem = new SsmlBreak.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlBreak elem = new SsmlBreak.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cbreak%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cbreak%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlBreak elem = new SsmlBreak.Builder().strength(SsmlBreak.Strength.NONE).time("time").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlBreak elem = new SsmlBreak.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -63,7 +63,7 @@ public void testElementWithTextNode() { SsmlBreak elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -83,7 +83,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -103,7 +103,7 @@ public void testElementWithGenericNode() { SsmlBreak.Builder builder = new SsmlBreak.Builder(); SsmlBreak elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -118,9 +118,9 @@ public void testElementWithGenericNode() { public void testXmlAttributesDeserialization() { final SsmlBreak elem = new SsmlBreak.Builder().strength(SsmlBreak.Strength.NONE).time("time").build(); - Assert.assertEquals( + assertEquals( SsmlBreak.Builder.fromXml("").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlEmphasisTest.java b/src/test/java/com/twilio/twiml/voice/SsmlEmphasisTest.java index 8f6c29b580..fffe9e636d 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlEmphasisTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlEmphasisTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlEmphasis} @@ -19,7 +19,7 @@ public class SsmlEmphasisTest { public void testEmptyElement() { SsmlEmphasis elem = new SsmlEmphasis.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlEmphasis elem = new SsmlEmphasis.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cemphasis%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cemphasis%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlEmphasis elem = new SsmlEmphasis.Builder("words").level(SsmlEmphasis.Level.STRONG).build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlEmphasis elem = new SsmlEmphasis.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -80,7 +80,7 @@ public void testElementWithChildren() { SsmlEmphasis elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -104,7 +104,7 @@ public void testElementWithTextNode() { SsmlEmphasis elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -124,7 +124,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -144,7 +144,7 @@ public void testElementWithGenericNode() { SsmlEmphasis.Builder builder = new SsmlEmphasis.Builder(); SsmlEmphasis elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -163,7 +163,7 @@ public void testElementWithGenericNodeAttributes() { SsmlEmphasis.Builder builder = new SsmlEmphasis.Builder(); SsmlEmphasis elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -178,7 +178,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final SsmlEmphasis elem = new SsmlEmphasis.Builder("words").level(SsmlEmphasis.Level.STRONG).build(); - Assert.assertEquals( + assertEquals( SsmlEmphasis.Builder.fromXml("words").build().toXml(), elem.toXml() ); @@ -209,7 +209,7 @@ public void testXmlChildrenDeserialization() { final SsmlEmphasis elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlEmphasis.Builder.fromXml("" + "" + "words" + @@ -240,7 +240,7 @@ public void testXmlEmptyChildrenDeserialization() { final SsmlEmphasis elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlEmphasis.Builder.fromXml("" + "" + "" + @@ -251,4 +251,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlLangTest.java b/src/test/java/com/twilio/twiml/voice/SsmlLangTest.java index a9cddf73d4..f4dae70be2 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlLangTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlLangTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlLang} @@ -19,7 +19,7 @@ public class SsmlLangTest { public void testEmptyElement() { SsmlLang elem = new SsmlLang.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlLang elem = new SsmlLang.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Clang%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Clang%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlLang elem = new SsmlLang.Builder("words").xmlLang(SsmlLang.XmlLang.ARB).build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlLang elem = new SsmlLang.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -84,7 +84,7 @@ public void testElementWithChildren() { SsmlLang elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -110,7 +110,7 @@ public void testElementWithTextNode() { SsmlLang elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -130,7 +130,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -150,7 +150,7 @@ public void testElementWithGenericNode() { SsmlLang.Builder builder = new SsmlLang.Builder(); SsmlLang elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -169,7 +169,7 @@ public void testElementWithGenericNodeAttributes() { SsmlLang.Builder builder = new SsmlLang.Builder(); SsmlLang elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -184,7 +184,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final SsmlLang elem = new SsmlLang.Builder("words").xmlLang(SsmlLang.XmlLang.ARB).build(); - Assert.assertEquals( + assertEquals( SsmlLang.Builder.fromXml("words").build().toXml(), elem.toXml() ); @@ -219,7 +219,7 @@ public void testXmlChildrenDeserialization() { final SsmlLang elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlLang.Builder.fromXml("" + "" + "words" + @@ -256,7 +256,7 @@ public void testXmlEmptyChildrenDeserialization() { final SsmlLang elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlLang.Builder.fromXml("" + "" + "" + @@ -269,4 +269,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlPTest.java b/src/test/java/com/twilio/twiml/voice/SsmlPTest.java index 49aaae4da2..5235775bf9 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlPTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlPTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlP} @@ -19,7 +19,7 @@ public class SsmlPTest { public void testEmptyElement() { SsmlP elem = new SsmlP.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "

", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlP elem = new SsmlP.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cp%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cp%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlP elem = new SsmlP.Builder("words").build(); - Assert.assertEquals( + assertEquals( "" + "

words

", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlP elem = new SsmlP.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "

", elem.toXml() @@ -82,7 +82,7 @@ public void testElementWithChildren() { SsmlP elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "

" + "" + @@ -107,7 +107,7 @@ public void testElementWithTextNode() { SsmlP elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "

" + "Hey no tags!" + @@ -127,7 +127,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "

" + "before" + @@ -147,7 +147,7 @@ public void testElementWithGenericNode() { SsmlP.Builder builder = new SsmlP.Builder(); SsmlP elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "

" + "" + @@ -166,7 +166,7 @@ public void testElementWithGenericNodeAttributes() { SsmlP.Builder builder = new SsmlP.Builder(); SsmlP elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "

" + "" + @@ -181,7 +181,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final SsmlP elem = new SsmlP.Builder("words").build(); - Assert.assertEquals( + assertEquals( SsmlP.Builder.fromXml("

words

").build().toXml(), elem.toXml() ); @@ -214,7 +214,7 @@ public void testXmlChildrenDeserialization() { final SsmlP elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlP.Builder.fromXml("

" + "" + "words" + @@ -248,7 +248,7 @@ public void testXmlEmptyChildrenDeserialization() { final SsmlP elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlP.Builder.fromXml("

" + "" + "" + @@ -260,4 +260,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlPhonemeTest.java b/src/test/java/com/twilio/twiml/voice/SsmlPhonemeTest.java index b8771ca205..f4d2fd42d8 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlPhonemeTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlPhonemeTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlPhoneme} @@ -18,7 +18,7 @@ public class SsmlPhonemeTest { public void testElementWithParams() { SsmlPhoneme elem = new SsmlPhoneme.Builder("words").alphabet(SsmlPhoneme.Alphabet.IPA).ph("ph").build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -29,9 +29,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final SsmlPhoneme elem = new SsmlPhoneme.Builder("words").alphabet(SsmlPhoneme.Alphabet.IPA).ph("ph").build(); - Assert.assertEquals( + assertEquals( SsmlPhoneme.Builder.fromXml("words").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlProsodyTest.java b/src/test/java/com/twilio/twiml/voice/SsmlProsodyTest.java index 5898887c76..5fc32adae7 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlProsodyTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlProsodyTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlProsody} @@ -19,7 +19,7 @@ public class SsmlProsodyTest { public void testEmptyElement() { SsmlProsody elem = new SsmlProsody.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlProsody elem = new SsmlProsody.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cprosody%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cprosody%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlProsody elem = new SsmlProsody.Builder("words").volume("volume").rate("rate").pitch("pitch").build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlProsody elem = new SsmlProsody.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -84,7 +84,7 @@ public void testElementWithChildren() { SsmlProsody elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -110,7 +110,7 @@ public void testElementWithTextNode() { SsmlProsody elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -130,7 +130,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -150,7 +150,7 @@ public void testElementWithGenericNode() { SsmlProsody.Builder builder = new SsmlProsody.Builder(); SsmlProsody elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -169,7 +169,7 @@ public void testElementWithGenericNodeAttributes() { SsmlProsody.Builder builder = new SsmlProsody.Builder(); SsmlProsody elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -184,7 +184,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final SsmlProsody elem = new SsmlProsody.Builder("words").volume("volume").rate("rate").pitch("pitch").build(); - Assert.assertEquals( + assertEquals( SsmlProsody.Builder.fromXml("words").build().toXml(), elem.toXml() ); @@ -219,7 +219,7 @@ public void testXmlChildrenDeserialization() { final SsmlProsody elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlProsody.Builder.fromXml("" + "" + "words" + @@ -256,7 +256,7 @@ public void testXmlEmptyChildrenDeserialization() { final SsmlProsody elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlProsody.Builder.fromXml("" + "" + "" + @@ -269,4 +269,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlSTest.java b/src/test/java/com/twilio/twiml/voice/SsmlSTest.java index dabe1b6b27..82732f3095 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlSTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlSTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlS} @@ -19,7 +19,7 @@ public class SsmlSTest { public void testEmptyElement() { SsmlS elem = new SsmlS.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlS elem = new SsmlS.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cs%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cs%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlS elem = new SsmlS.Builder("words").build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlS elem = new SsmlS.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -80,7 +80,7 @@ public void testElementWithChildren() { SsmlS elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -104,7 +104,7 @@ public void testElementWithTextNode() { SsmlS elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -124,7 +124,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -144,7 +144,7 @@ public void testElementWithGenericNode() { SsmlS.Builder builder = new SsmlS.Builder(); SsmlS elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -163,7 +163,7 @@ public void testElementWithGenericNodeAttributes() { SsmlS.Builder builder = new SsmlS.Builder(); SsmlS elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -178,7 +178,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final SsmlS elem = new SsmlS.Builder("words").build(); - Assert.assertEquals( + assertEquals( SsmlS.Builder.fromXml("words").build().toXml(), elem.toXml() ); @@ -209,7 +209,7 @@ public void testXmlChildrenDeserialization() { final SsmlS elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlS.Builder.fromXml("" + "" + "words" + @@ -240,7 +240,7 @@ public void testXmlEmptyChildrenDeserialization() { final SsmlS elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlS.Builder.fromXml("" + "" + "" + @@ -251,4 +251,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlSayAsTest.java b/src/test/java/com/twilio/twiml/voice/SsmlSayAsTest.java index f0722b52c9..539aa362d1 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlSayAsTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlSayAsTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlSayAs} @@ -21,7 +21,7 @@ public void testElementWithParams() { .format(SsmlSayAs.Format.MDY) .build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -35,9 +35,9 @@ public void testXmlAttributesDeserialization() { .format(SsmlSayAs.Format.MDY) .build(); - Assert.assertEquals( + assertEquals( SsmlSayAs.Builder.fromXml("words").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlSubTest.java b/src/test/java/com/twilio/twiml/voice/SsmlSubTest.java index 638948b6ec..827ac7a76d 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlSubTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlSubTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlSub} @@ -18,7 +18,7 @@ public class SsmlSubTest { public void testElementWithParams() { SsmlSub elem = new SsmlSub.Builder("words").alias("alias").build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -29,9 +29,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final SsmlSub elem = new SsmlSub.Builder("words").alias("alias").build(); - Assert.assertEquals( + assertEquals( SsmlSub.Builder.fromXml("words").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/SsmlWTest.java b/src/test/java/com/twilio/twiml/voice/SsmlWTest.java index e28b491ce0..e07a339944 100644 --- a/src/test/java/com/twilio/twiml/voice/SsmlWTest.java +++ b/src/test/java/com/twilio/twiml/voice/SsmlWTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link SsmlW} @@ -19,7 +19,7 @@ public class SsmlWTest { public void testEmptyElement() { SsmlW elem = new SsmlW.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { SsmlW elem = new SsmlW.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cw%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3Cw%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { SsmlW elem = new SsmlW.Builder("words").role("role").build(); - Assert.assertEquals( + assertEquals( "" + "words", elem.toXml() @@ -48,7 +48,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { SsmlW elem = new SsmlW.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -76,7 +76,7 @@ public void testElementWithChildren() { SsmlW elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -98,7 +98,7 @@ public void testElementWithTextNode() { SsmlW elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -118,7 +118,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -138,7 +138,7 @@ public void testElementWithGenericNode() { SsmlW.Builder builder = new SsmlW.Builder(); SsmlW elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -157,7 +157,7 @@ public void testElementWithGenericNodeAttributes() { SsmlW.Builder builder = new SsmlW.Builder(); SsmlW elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -172,7 +172,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final SsmlW elem = new SsmlW.Builder("words").role("role").build(); - Assert.assertEquals( + assertEquals( SsmlW.Builder.fromXml("words").build().toXml(), elem.toXml() ); @@ -199,7 +199,7 @@ public void testXmlChildrenDeserialization() { final SsmlW elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlW.Builder.fromXml("" + "" + "words" + @@ -224,7 +224,7 @@ public void testXmlEmptyChildrenDeserialization() { final SsmlW elem = builder.build(); - Assert.assertEquals( + assertEquals( SsmlW.Builder.fromXml("" + "" + "" + @@ -233,4 +233,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/StartTest.java b/src/test/java/com/twilio/twiml/voice/StartTest.java index b68166359f..1850ab95d8 100644 --- a/src/test/java/com/twilio/twiml/voice/StartTest.java +++ b/src/test/java/com/twilio/twiml/voice/StartTest.java @@ -9,8 +9,8 @@ import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URI; @@ -22,7 +22,7 @@ public class StartTest { public void testEmptyElement() { Start elem = new Start.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -33,14 +33,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Start elem = new Start.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CStart%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CStart%2F%3E", elem.toUrl()); } @Test public void testElementWithParams() { Start elem = new Start.Builder().action(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -51,7 +51,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Start elem = new Start.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -98,7 +98,7 @@ public void testElementWithChildren() { Start elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -117,7 +117,7 @@ public void testElementWithTextNode() { Start elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -137,7 +137,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -157,7 +157,7 @@ public void testElementWithGenericNode() { Start.Builder builder = new Start.Builder(); Start elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -176,7 +176,7 @@ public void testElementWithGenericNodeAttributes() { Start.Builder builder = new Start.Builder(); Start elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -191,7 +191,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Start elem = new Start.Builder().action(URI.create("https://example.com")).method(HttpMethod.GET).build(); - Assert.assertEquals( + assertEquals( Start.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -237,7 +237,7 @@ public void testXmlChildrenDeserialization() { final Start elem = builder.build(); - Assert.assertEquals( + assertEquals( Start.Builder.fromXml("" + "" + "" + @@ -259,7 +259,7 @@ public void testXmlEmptyChildrenDeserialization() { final Start elem = builder.build(); - Assert.assertEquals( + assertEquals( Start.Builder.fromXml("" + "" + "" + @@ -268,4 +268,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/StopTest.java b/src/test/java/com/twilio/twiml/voice/StopTest.java index cc1f06f1ad..b983584ab3 100644 --- a/src/test/java/com/twilio/twiml/voice/StopTest.java +++ b/src/test/java/com/twilio/twiml/voice/StopTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Stop} @@ -19,7 +19,7 @@ public class StopTest { public void testEmptyElement() { Stop elem = new Stop.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,14 +30,14 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Stop elem = new Stop.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CStop%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CStop%2F%3E", elem.toUrl()); } @Test public void testElementWithExtraAttributes() { Stop elem = new Stop.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -84,7 +84,7 @@ public void testElementWithChildren() { Stop elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -103,7 +103,7 @@ public void testElementWithTextNode() { Stop elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -123,7 +123,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -143,7 +143,7 @@ public void testElementWithGenericNode() { Stop.Builder builder = new Stop.Builder(); Stop elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -162,7 +162,7 @@ public void testElementWithGenericNodeAttributes() { Stop.Builder builder = new Stop.Builder(); Stop elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -177,7 +177,7 @@ public void testElementWithGenericNodeAttributes() { public void testXmlAttributesDeserialization() { final Stop elem = new Stop.Builder().build(); - Assert.assertEquals( + assertEquals( Stop.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -223,7 +223,7 @@ public void testXmlChildrenDeserialization() { final Stop elem = builder.build(); - Assert.assertEquals( + assertEquals( Stop.Builder.fromXml("" + "" + "" + @@ -245,7 +245,7 @@ public void testXmlEmptyChildrenDeserialization() { final Stop elem = builder.build(); - Assert.assertEquals( + assertEquals( Stop.Builder.fromXml("" + "" + "" + @@ -254,4 +254,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/StreamTest.java b/src/test/java/com/twilio/twiml/voice/StreamTest.java index 7a25c2c36c..d4b18c23b1 100644 --- a/src/test/java/com/twilio/twiml/voice/StreamTest.java +++ b/src/test/java/com/twilio/twiml/voice/StreamTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Stream} @@ -19,7 +19,7 @@ public class StreamTest { public void testEmptyElement() { Stream elem = new Stream.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,7 +30,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Stream elem = new Stream.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CStream%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CStream%2F%3E", elem.toUrl()); } @Test @@ -44,7 +44,7 @@ public void testElementWithParams() { .statusCallbackMethod(Stream.StatusCallbackMethod.GET) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -55,7 +55,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Stream elem = new Stream.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -70,7 +70,7 @@ public void testElementWithChildren() { Stream elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -87,7 +87,7 @@ public void testElementWithTextNode() { Stream elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -107,7 +107,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -127,7 +127,7 @@ public void testElementWithGenericNode() { Stream.Builder builder = new Stream.Builder(); Stream elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -146,7 +146,7 @@ public void testElementWithGenericNodeAttributes() { Stream.Builder builder = new Stream.Builder(); Stream elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -168,7 +168,7 @@ public void testXmlAttributesDeserialization() { .statusCallbackMethod(Stream.StatusCallbackMethod.GET) .build(); - Assert.assertEquals( + assertEquals( Stream.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -182,7 +182,7 @@ public void testXmlChildrenDeserialization() { final Stream elem = builder.build(); - Assert.assertEquals( + assertEquals( Stream.Builder.fromXml("" + "" + "").build().toXml(), @@ -198,11 +198,11 @@ public void testXmlEmptyChildrenDeserialization() { final Stream elem = builder.build(); - Assert.assertEquals( + assertEquals( Stream.Builder.fromXml("" + "" + "").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/TaskTest.java b/src/test/java/com/twilio/twiml/voice/TaskTest.java index c2e2476b9f..bc2649a474 100644 --- a/src/test/java/com/twilio/twiml/voice/TaskTest.java +++ b/src/test/java/com/twilio/twiml/voice/TaskTest.java @@ -7,8 +7,8 @@ package com.twilio.twiml.voice; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Task} @@ -18,7 +18,7 @@ public class TaskTest { public void testElementWithParams() { Task elem = new Task.Builder("body").priority(1).timeout(1).build(); - Assert.assertEquals( + assertEquals( "" + "body", elem.toXml() @@ -29,9 +29,9 @@ public void testElementWithParams() { public void testXmlAttributesDeserialization() { final Task elem = new Task.Builder("body").priority(1).timeout(1).build(); - Assert.assertEquals( + assertEquals( Task.Builder.fromXml("body").build().toXml(), elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/TranscriptionTest.java b/src/test/java/com/twilio/twiml/voice/TranscriptionTest.java index 33230fe1f5..b9f5475683 100644 --- a/src/test/java/com/twilio/twiml/voice/TranscriptionTest.java +++ b/src/test/java/com/twilio/twiml/voice/TranscriptionTest.java @@ -8,8 +8,8 @@ package com.twilio.twiml.voice; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link Transcription} @@ -19,7 +19,7 @@ public class TranscriptionTest { public void testEmptyElement() { Transcription elem = new Transcription.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -30,7 +30,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { Transcription elem = new Transcription.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CTranscription%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CTranscription%2F%3E", elem.toUrl()); } @Test @@ -52,7 +52,7 @@ public void testElementWithParams() { .intelligenceService("intelligence_service") .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -63,7 +63,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { Transcription elem = new Transcription.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -80,7 +80,7 @@ public void testElementWithChildren() { Transcription elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -98,7 +98,7 @@ public void testElementWithTextNode() { Transcription elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -118,7 +118,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -138,7 +138,7 @@ public void testElementWithGenericNode() { Transcription.Builder builder = new Transcription.Builder(); Transcription elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -157,7 +157,7 @@ public void testElementWithGenericNodeAttributes() { Transcription.Builder builder = new Transcription.Builder(); Transcription elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -187,7 +187,7 @@ public void testXmlAttributesDeserialization() { .intelligenceService("intelligence_service") .build(); - Assert.assertEquals( + assertEquals( Transcription.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -203,7 +203,7 @@ public void testXmlChildrenDeserialization() { final Transcription elem = builder.build(); - Assert.assertEquals( + assertEquals( Transcription.Builder.fromXml("" + "" + "" + @@ -222,7 +222,7 @@ public void testXmlEmptyChildrenDeserialization() { final Transcription elem = builder.build(); - Assert.assertEquals( + assertEquals( Transcription.Builder.fromXml("" + "" + "" + @@ -230,4 +230,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/twiml/voice/VirtualAgentTest.java b/src/test/java/com/twilio/twiml/voice/VirtualAgentTest.java index 8c1ab6a417..4b514d240e 100644 --- a/src/test/java/com/twilio/twiml/voice/VirtualAgentTest.java +++ b/src/test/java/com/twilio/twiml/voice/VirtualAgentTest.java @@ -9,8 +9,8 @@ import com.twilio.http.HttpMethod; import com.twilio.twiml.GenericNode; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link VirtualAgent} @@ -20,7 +20,7 @@ public class VirtualAgentTest { public void testEmptyElement() { VirtualAgent elem = new VirtualAgent.Builder().build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -31,7 +31,7 @@ public void testEmptyElement() { public void testEmptyElementUrl() { VirtualAgent elem = new VirtualAgent.Builder().build(); - Assert.assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CVirtualAgent%2F%3E", elem.toUrl()); + assertEquals("%3C%3Fxml+version%3D%221.0%22+encoding%3D%22UTF-8%22%3F%3E%3CVirtualAgent%2F%3E", elem.toUrl()); } @Test @@ -44,7 +44,7 @@ public void testElementWithParams() { .statusCallbackMethod(HttpMethod.GET) .build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -55,7 +55,7 @@ public void testElementWithParams() { public void testElementWithExtraAttributes() { VirtualAgent elem = new VirtualAgent.Builder().option("foo", "bar").option("a", "b").build(); - Assert.assertEquals( + assertEquals( "" + "", elem.toXml() @@ -72,7 +72,7 @@ public void testElementWithChildren() { VirtualAgent elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -90,7 +90,7 @@ public void testElementWithTextNode() { VirtualAgent elem = builder.build(); - Assert.assertEquals( + assertEquals( "" + "" + "Hey no tags!" + @@ -110,7 +110,7 @@ public void testMixedContent() { builder.addChild(child.build()); builder.addText("after"); - Assert.assertEquals( + assertEquals( "" + "" + "before" + @@ -130,7 +130,7 @@ public void testElementWithGenericNode() { VirtualAgent.Builder builder = new VirtualAgent.Builder(); VirtualAgent elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -149,7 +149,7 @@ public void testElementWithGenericNodeAttributes() { VirtualAgent.Builder builder = new VirtualAgent.Builder(); VirtualAgent elem = builder.addChild(node).build(); - Assert.assertEquals( + assertEquals( "" + "" + "" + @@ -170,7 +170,7 @@ public void testXmlAttributesDeserialization() { .statusCallbackMethod(HttpMethod.GET) .build(); - Assert.assertEquals( + assertEquals( VirtualAgent.Builder.fromXml("").build().toXml(), elem.toXml() ); @@ -186,7 +186,7 @@ public void testXmlChildrenDeserialization() { final VirtualAgent elem = builder.build(); - Assert.assertEquals( + assertEquals( VirtualAgent.Builder.fromXml("" + "" + "" + @@ -205,7 +205,7 @@ public void testXmlEmptyChildrenDeserialization() { final VirtualAgent elem = builder.build(); - Assert.assertEquals( + assertEquals( VirtualAgent.Builder.fromXml("" + "" + "" + @@ -213,4 +213,4 @@ public void testXmlEmptyChildrenDeserialization() { elem.toXml() ); } -} \ No newline at end of file +} diff --git a/src/test/java/com/twilio/type/ClientTest.java b/src/test/java/com/twilio/type/ClientTest.java index af9debb613..ae1ccad160 100644 --- a/src/test/java/com/twilio/type/ClientTest.java +++ b/src/test/java/com/twilio/type/ClientTest.java @@ -1,15 +1,16 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; public class ClientTest { @Test public void testGetEndpoint() { - Assert.assertEquals("client:me", new Client("me").getEndpoint()); - Assert.assertEquals("client:YOU", new Client("YOU").getEndpoint()); - Assert.assertEquals("CLIENT:HIM", new Client("CLIENT:HIM").getEndpoint()); - Assert.assertEquals("cLiEnT:her", new Client("cLiEnT:her").getEndpoint()); + assertEquals("client:me", new Client("me").getEndpoint()); + assertEquals("client:YOU", new Client("YOU").getEndpoint()); + assertEquals("CLIENT:HIM", new Client("CLIENT:HIM").getEndpoint()); + assertEquals("cLiEnT:her", new Client("cLiEnT:her").getEndpoint()); } } diff --git a/src/test/java/com/twilio/type/FeedbackIssueTest.java b/src/test/java/com/twilio/type/FeedbackIssueTest.java index fbcb9385a2..ea4c1d0251 100644 --- a/src/test/java/com/twilio/type/FeedbackIssueTest.java +++ b/src/test/java/com/twilio/type/FeedbackIssueTest.java @@ -1,7 +1,7 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -19,9 +19,9 @@ public void testFromJson() throws IOException { "}"; FeedbackIssue issue = fromJson(json, FeedbackIssue.class); - Assert.assertEquals(5, issue.getCount()); - Assert.assertEquals("issue", issue.getDescription()); - Assert.assertEquals("99.9", issue.getPercentageOfTotalCalls()); + assertEquals(5, issue.getCount()); + assertEquals("issue", issue.getDescription()); + assertEquals("99.9", issue.getPercentageOfTotalCalls()); } } diff --git a/src/test/java/com/twilio/type/IceServerTest.java b/src/test/java/com/twilio/type/IceServerTest.java index a2b5fbd74f..986012758e 100644 --- a/src/test/java/com/twilio/type/IceServerTest.java +++ b/src/test/java/com/twilio/type/IceServerTest.java @@ -1,9 +1,9 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; +import org.junit.jupiter.api.Test; /** * Test class for {@link IceServer}. @@ -20,10 +20,10 @@ public void testFromJson() throws IOException { "}"; IceServer is = fromJson(json, IceServer.class); - Assert.assertEquals("https://www.twilio.ca", is.getUrl()); - Assert.assertEquals("https://www.twilio.ca", is.getUrls()); - Assert.assertEquals(is.getUrls(), is.getUrl()); - Assert.assertEquals("apn", is.getCredential()); - Assert.assertEquals("twilio", is.getUsername()); + assertEquals("https://www.twilio.ca", is.getUrl()); + assertEquals("https://www.twilio.ca", is.getUrls()); + assertEquals(is.getUrls(), is.getUrl()); + assertEquals("apn", is.getCredential()); + assertEquals("twilio", is.getUsername()); } } diff --git a/src/test/java/com/twilio/type/InboundCallPriceTest.java b/src/test/java/com/twilio/type/InboundCallPriceTest.java index f7da7e56d2..9a9ad5dcf8 100644 --- a/src/test/java/com/twilio/type/InboundCallPriceTest.java +++ b/src/test/java/com/twilio/type/InboundCallPriceTest.java @@ -1,9 +1,9 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; +import org.junit.jupiter.api.Test; /** * Test class for {@link InboundCallPrice}. @@ -19,9 +19,9 @@ public void testFromJson() throws IOException { "}"; InboundCallPrice icp = fromJson(json, InboundCallPrice.class); - Assert.assertEquals(1.00, icp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, icp.getCurrentPrice(), 0.00); - Assert.assertEquals(InboundCallPrice.Type.MOBILE, icp.getType()); + assertEquals(1.00, icp.getBasePrice(), 0.00); + assertEquals(2.00, icp.getCurrentPrice(), 0.00); + assertEquals(InboundCallPrice.Type.MOBILE, icp.getType()); } @Test @@ -33,9 +33,9 @@ public void testFromJsonTollFree() throws IOException { "}"; InboundCallPrice icp = fromJson(json, InboundCallPrice.class); - Assert.assertEquals(1.00, icp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, icp.getCurrentPrice(), 0.00); - Assert.assertEquals(InboundCallPrice.Type.TOLLFREE, icp.getType()); + assertEquals(1.00, icp.getBasePrice(), 0.00); + assertEquals(2.00, icp.getCurrentPrice(), 0.00); + assertEquals(InboundCallPrice.Type.TOLLFREE, icp.getType()); } @Test @@ -48,8 +48,8 @@ public void testFromJsonExtraField() throws IOException { "}"; InboundCallPrice icp = fromJson(json, InboundCallPrice.class); - Assert.assertEquals(1.00, icp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, icp.getCurrentPrice(), 0.00); - Assert.assertEquals(InboundCallPrice.Type.TOLLFREE, icp.getType()); + assertEquals(1.00, icp.getBasePrice(), 0.00); + assertEquals(2.00, icp.getCurrentPrice(), 0.00); + assertEquals(InboundCallPrice.Type.TOLLFREE, icp.getType()); } } diff --git a/src/test/java/com/twilio/type/InboundSmsPriceTest.java b/src/test/java/com/twilio/type/InboundSmsPriceTest.java index 1a46b9ff5f..a239ee5da1 100644 --- a/src/test/java/com/twilio/type/InboundSmsPriceTest.java +++ b/src/test/java/com/twilio/type/InboundSmsPriceTest.java @@ -1,9 +1,10 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.IOException; +import org.junit.jupiter.api.Test; /** * Test class for {@link InboundSmsPrice}. @@ -19,9 +20,9 @@ public void testFromJson() throws IOException { "}"; InboundSmsPrice icp = fromJson(json, InboundSmsPrice.class); - Assert.assertEquals(1.00, icp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, icp.getCurrentPrice(), 0.00); - Assert.assertEquals(InboundSmsPrice.Type.MOBILE, icp.getType()); + assertEquals(1.00, icp.getBasePrice(), 0.00); + assertEquals(2.00, icp.getCurrentPrice(), 0.00); + assertEquals(InboundSmsPrice.Type.MOBILE, icp.getType()); } @Test @@ -33,8 +34,8 @@ public void testFromJsonTollFree() throws IOException { "}"; InboundSmsPrice icp = fromJson(json, InboundSmsPrice.class); - Assert.assertEquals(1.00, icp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, icp.getCurrentPrice(), 0.00); - Assert.assertEquals(InboundSmsPrice.Type.TOLLFREE, icp.getType()); + assertEquals(1.00, icp.getBasePrice(), 0.00); + assertEquals(2.00, icp.getCurrentPrice(), 0.00); + assertEquals(InboundSmsPrice.Type.TOLLFREE, icp.getType()); } } diff --git a/src/test/java/com/twilio/type/OutboundCallPriceTest.java b/src/test/java/com/twilio/type/OutboundCallPriceTest.java index d157544c38..eb93690130 100644 --- a/src/test/java/com/twilio/type/OutboundCallPriceTest.java +++ b/src/test/java/com/twilio/type/OutboundCallPriceTest.java @@ -1,9 +1,8 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; - import java.io.IOException; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for {@link OutboundCallPrice}. @@ -18,7 +17,7 @@ public void testFromJson() throws IOException { "}"; OutboundCallPrice ocp = fromJson(json, OutboundCallPrice.class); - Assert.assertEquals(1.00, ocp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, ocp.getCurrentPrice(), 0.00); + assertEquals(1.00, ocp.getBasePrice(), 0.00); + assertEquals(2.00, ocp.getCurrentPrice(), 0.00); } } diff --git a/src/test/java/com/twilio/type/OutboundPrefixPriceTest.java b/src/test/java/com/twilio/type/OutboundPrefixPriceTest.java index 84cceb7c13..4aa53805e3 100644 --- a/src/test/java/com/twilio/type/OutboundPrefixPriceTest.java +++ b/src/test/java/com/twilio/type/OutboundPrefixPriceTest.java @@ -1,7 +1,7 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.Arrays; @@ -24,9 +24,9 @@ public void testFromJson() throws IOException { "}"; OutboundPrefixPrice opp = fromJson(json, OutboundPrefixPrice.class); - Assert.assertEquals(Arrays.asList("abc", "xyz"), opp.getPrefixes()); - Assert.assertEquals("name", opp.getFriendlyName()); - Assert.assertEquals(1.00, opp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, opp.getCurrentPrice(), 0.00); + assertEquals(Arrays.asList("abc", "xyz"), opp.getPrefixes()); + assertEquals("name", opp.getFriendlyName()); + assertEquals(1.00, opp.getBasePrice(), 0.00); + assertEquals(2.00, opp.getCurrentPrice(), 0.00); } } diff --git a/src/test/java/com/twilio/type/OutboundSmsPriceTest.java b/src/test/java/com/twilio/type/OutboundSmsPriceTest.java index f207df094d..9204657b31 100644 --- a/src/test/java/com/twilio/type/OutboundSmsPriceTest.java +++ b/src/test/java/com/twilio/type/OutboundSmsPriceTest.java @@ -1,7 +1,7 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.Collections; @@ -25,10 +25,10 @@ public void testFromJson() throws IOException { "}"; OutboundSmsPrice osp = fromJson(json, OutboundSmsPrice.class); - Assert.assertEquals("mcc", osp.getMcc()); - Assert.assertEquals("mnc", osp.getMnc()); - Assert.assertEquals("att", osp.getCarrier()); - Assert.assertEquals(Collections.singletonList( + assertEquals("mcc", osp.getMcc()); + assertEquals("mnc", osp.getMnc()); + assertEquals("att", osp.getCarrier()); + assertEquals(Collections.singletonList( new InboundSmsPrice(1.00, 2.00, InboundSmsPrice.Type.LOCAL) ), osp.getPrices()); } diff --git a/src/test/java/com/twilio/type/PhoneNumberCapabilitiesTest.java b/src/test/java/com/twilio/type/PhoneNumberCapabilitiesTest.java index 73d0c39eeb..72101afd88 100644 --- a/src/test/java/com/twilio/type/PhoneNumberCapabilitiesTest.java +++ b/src/test/java/com/twilio/type/PhoneNumberCapabilitiesTest.java @@ -1,7 +1,9 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -19,9 +21,9 @@ public void testFromJson() throws IOException { "}"; PhoneNumberCapabilities pnc = fromJson(json, PhoneNumberCapabilities.class); - Assert.assertTrue(pnc.getMms()); - Assert.assertTrue(pnc.getVoice()); - Assert.assertFalse(pnc.getSms()); + assertTrue(pnc.getMms()); + assertTrue(pnc.getVoice()); + assertFalse(pnc.getSms()); } @Test @@ -34,8 +36,8 @@ public void testFromJsonExtraField() throws IOException { "}"; PhoneNumberCapabilities pnc = fromJson(json, PhoneNumberCapabilities.class); - Assert.assertTrue(pnc.getMms()); - Assert.assertTrue(pnc.getVoice()); - Assert.assertFalse(pnc.getSms()); + assertTrue(pnc.getMms()); + assertTrue(pnc.getVoice()); + assertFalse(pnc.getSms()); } } diff --git a/src/test/java/com/twilio/type/PhoneNumberPriceTest.java b/src/test/java/com/twilio/type/PhoneNumberPriceTest.java index 189ef1d746..89f83a2bd7 100644 --- a/src/test/java/com/twilio/type/PhoneNumberPriceTest.java +++ b/src/test/java/com/twilio/type/PhoneNumberPriceTest.java @@ -1,7 +1,7 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -19,9 +19,9 @@ public void testFromJson() throws IOException { "}"; PhoneNumberPrice pnp = fromJson(json, PhoneNumberPrice.class); - Assert.assertEquals(1.00, pnp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, pnp.getCurrentPrice(), 0.00); - Assert.assertEquals(PhoneNumberPrice.Type.MOBILE, pnp.getType()); + assertEquals(1.00, pnp.getBasePrice(), 0.00); + assertEquals(2.00, pnp.getCurrentPrice(), 0.00); + assertEquals(PhoneNumberPrice.Type.MOBILE, pnp.getType()); } @Test @@ -33,9 +33,9 @@ public void testFromJsonTollFreeType() throws IOException { "}"; PhoneNumberPrice pnp = fromJson(json, PhoneNumberPrice.class); - Assert.assertEquals(1.00, pnp.getBasePrice(), 0.00); - Assert.assertEquals(2.00, pnp.getCurrentPrice(), 0.00); - Assert.assertEquals(PhoneNumberPrice.Type.TOLLFREE, pnp.getType()); + assertEquals(1.00, pnp.getBasePrice(), 0.00); + assertEquals(2.00, pnp.getCurrentPrice(), 0.00); + assertEquals(PhoneNumberPrice.Type.TOLLFREE, pnp.getType()); } } diff --git a/src/test/java/com/twilio/type/RecordingRuleTest.java b/src/test/java/com/twilio/type/RecordingRuleTest.java index 51865aa6ef..f82669c273 100644 --- a/src/test/java/com/twilio/type/RecordingRuleTest.java +++ b/src/test/java/com/twilio/type/RecordingRuleTest.java @@ -1,12 +1,14 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.Arrays; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class RecordingRuleTest extends TypeTest { @Test @@ -37,10 +39,10 @@ public void testAllExclusive() throws IOException { "}"; RecordingRule r = fromJson(json, RecordingRule.class); - Assert.assertEquals(RecordingRule.Type.INCLUDE, r.getType()); - Assert.assertEquals(true, r.getAll()); + assertEquals(RecordingRule.Type.INCLUDE, r.getType()); + assertEquals(true, r.getAll()); - Assert.assertTrue(convertsToAndFromJson(r, RecordingRule.class)); + assertTrue(convertsToAndFromJson(r, RecordingRule.class)); } @Test @@ -53,12 +55,12 @@ public void testFilters() throws IOException { "}"; RecordingRule r = fromJson(json, RecordingRule.class); - Assert.assertEquals(RecordingRule.Type.EXCLUDE, r.getType()); - Assert.assertEquals(RecordingRule.Kind.VIDEO, r.getKind()); - Assert.assertEquals("alice", r.getPublisher()); - Assert.assertNull(r.getAll()); + assertEquals(RecordingRule.Type.EXCLUDE, r.getType()); + assertEquals(RecordingRule.Kind.VIDEO, r.getKind()); + assertEquals("alice", r.getPublisher()); + assertNull(r.getAll()); - Assert.assertTrue(convertsToAndFromJson(r, RecordingRule.class)); + assertTrue(convertsToAndFromJson(r, RecordingRule.class)); } @Test @@ -77,6 +79,6 @@ public void testUpdate() throws IOException { allAudio, presenterVideo )); - Assert.assertTrue(convertsToAndFromJson(update, RecordingRulesUpdate.class)); + assertTrue(convertsToAndFromJson(update, RecordingRulesUpdate.class)); } } diff --git a/src/test/java/com/twilio/type/SubscribeRuleTest.java b/src/test/java/com/twilio/type/SubscribeRuleTest.java index 253fefa536..f42054fd85 100644 --- a/src/test/java/com/twilio/type/SubscribeRuleTest.java +++ b/src/test/java/com/twilio/type/SubscribeRuleTest.java @@ -1,12 +1,16 @@ package com.twilio.type; -import org.junit.Assert; -import org.junit.Test; + + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Arrays; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; public class SubscribeRuleTest extends TypeTest { @Test @@ -37,10 +41,10 @@ public void testAllExclusive() throws IOException { "}"; SubscribeRule r = fromJson(json, SubscribeRule.class); - Assert.assertEquals(SubscribeRule.Type.INCLUDE, r.getType()); - Assert.assertEquals(true, r.getAll()); + assertEquals(SubscribeRule.Type.INCLUDE, r.getType()); + assertEquals(true, r.getAll()); - Assert.assertTrue(convertsToAndFromJson(r, SubscribeRule.class)); + assertTrue(convertsToAndFromJson(r, SubscribeRule.class)); } @Test @@ -54,13 +58,13 @@ public void testFilters() throws IOException { "}"; SubscribeRule r = fromJson(json, SubscribeRule.class); - Assert.assertEquals(SubscribeRule.Type.EXCLUDE, r.getType()); - Assert.assertEquals(SubscribeRule.Kind.VIDEO, r.getKind()); - Assert.assertEquals("alice", r.getPublisher()); - Assert.assertEquals(SubscribeRule.Priority.STANDARD, r.getPriority()); - Assert.assertNull(r.getAll()); + assertEquals(SubscribeRule.Type.EXCLUDE, r.getType()); + assertEquals(SubscribeRule.Kind.VIDEO, r.getKind()); + assertEquals("alice", r.getPublisher()); + assertEquals(SubscribeRule.Priority.STANDARD, r.getPriority()); + assertNull(r.getAll()); - Assert.assertTrue(convertsToAndFromJson(r, SubscribeRule.class)); + assertTrue(convertsToAndFromJson(r, SubscribeRule.class)); } @Test @@ -79,6 +83,6 @@ public void testUpdate() throws IOException { allAudio, presenterVideo )); - Assert.assertTrue(convertsToAndFromJson(update, SubscribeRulesUpdate.class)); + assertTrue(convertsToAndFromJson(update, SubscribeRulesUpdate.class)); } } From 31196854a4e1f4ef8579438543d55c577a3354ec Mon Sep 17 00:00:00 2001 From: manisha1997 Date: Wed, 14 May 2025 00:02:30 +0530 Subject: [PATCH 2/6] chore: Update to junit5 and doc upgrades --- pom.xml | 4 ++-- .../twilio/exception/ApiExceptionTest.java | 19 ++++++++++--------- .../jwt/validation/ValidationTokenTest.java | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index d2799bf58d..3d94359b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -266,7 +266,7 @@ org.junit.jupiter junit-jupiter-engine - 5.12.0 + 5.9.1 test @@ -278,7 +278,7 @@ org.mockito mockito-junit-jupiter - 2.17.0 + 4.11.0 test diff --git a/src/test/java/com/twilio/exception/ApiExceptionTest.java b/src/test/java/com/twilio/exception/ApiExceptionTest.java index 165e85be3c..b9733aea91 100644 --- a/src/test/java/com/twilio/exception/ApiExceptionTest.java +++ b/src/test/java/com/twilio/exception/ApiExceptionTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; @SuppressWarnings("ThrowableInstanceNeverThrown") @@ -29,18 +30,18 @@ public void singleArgConstructorShouldPreserveMessage() { @Test public void twoArgConstructorShouldPreserveMessageAndCause() { ApiException error = new ApiException(anyMessage, anyCause); - assertEquals("Message", anyMessage, error.getMessage()); - assertSame("Cause", anyCause, error.getCause()); + assertEquals(anyMessage, error.getMessage()); + assertSame(anyCause, error.getCause()); } @Test public void fullConstructorShouldPreserveAllValues() { ApiException error = new ApiException(anyMessage, anyErrorCode, anyMoreInfo, anyHttpStatus, anyCause); - assertEquals("Message", anyMessage, error.getMessage()); - assertSame("Cause", anyCause, error.getCause()); + assertEquals(anyMessage, error.getMessage()); + assertSame(anyCause, error.getCause()); assertEquals("More info", anyMoreInfo, error.getMoreInfo()); - assertEquals("Error code", anyErrorCode, error.getCode().intValue()); - assertEquals("Status code", anyHttpStatus, error.getStatusCode().intValue()); + assertEquals(anyErrorCode, error.getCode().intValue()); + assertEquals(anyHttpStatus, error.getStatusCode().intValue()); } @Test @@ -62,19 +63,19 @@ public void restConstructorShouldPreserveValues() { assertEquals(400, (int) error.getStatusCode()); assertEquals("https://www.twilio.com/docs/errors/20001", error.getMoreInfo()); assertEquals("Bad request", error.getMessage()); - assertEquals("details", Collections.singletonMap("foo", "bar"), error.getDetails()); + assertEquals(Collections.singletonMap("foo", "bar"), error.getDetails()); } @Test public void getCodeShouldNotThrowExceptionWhenCodeIsNull() { ApiException error = new ApiException(anyMessage); - assertEquals(null, error.getCode()); + assertNull(error.getCode()); } @Test public void getStatusCodeShouldNotThrowExceptionWhenCodeIsNull() { ApiException error = new ApiException(anyMessage); - assertEquals(null, error.getStatusCode()); + assertNull(error.getStatusCode()); } } diff --git a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java index bf6e62ce57..b5a442b8f4 100644 --- a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java +++ b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java @@ -29,10 +29,10 @@ import java.util.concurrent.Future; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.jupiter.api.AssertionsKt.assertNotNull; import static org.mockito.Mockito.when; import static io.jsonwebtoken.SignatureAlgorithm.PS256; From 78de5821eb4540a887a74f2166ed112d359433d6 Mon Sep 17 00:00:00 2001 From: manisha1997 Date: Wed, 14 May 2025 00:15:25 +0530 Subject: [PATCH 3/6] chore: Update to junit5 and doc upgrades --- src/test/java/com/twilio/TwilioTest.java | 15 ++++-------- .../twilio/exception/ApiExceptionTest.java | 2 +- .../twilio/http/NetworkHttpClientTest.java | 24 +++++++++---------- .../java/com/twilio/http/RequestTest.java | 1 - 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/test/java/com/twilio/TwilioTest.java b/src/test/java/com/twilio/TwilioTest.java index d6f17c1ea5..0ace47dfd0 100644 --- a/src/test/java/com/twilio/TwilioTest.java +++ b/src/test/java/com/twilio/TwilioTest.java @@ -58,24 +58,17 @@ public void testGetExecutorService() { @Test public void testGetRestClientNullAccountSid() { - Twilio.setRestClient(null); - Twilio.setUsername(null); - Twilio.setPassword(null); - - assertThrows(AuthenticationException.class, () -> Twilio.getRestClient()); - fail("AuthenticationException was expected"); + assertThrows(AuthenticationException.class, Twilio::getRestClient); } @Test public void testSetAccountSidNull() { - Twilio.setUsername(null); - fail("AuthenticationException was expected"); + assertThrows(AuthenticationException.class, () -> Twilio.setUsername(null)); } @Test - public void testSetAuthTokenNull() { - Twilio.setPassword(null); - fail("AuthenticationException was expected"); + public void testSetPasswordNull() { + assertThrows(AuthenticationException.class, () -> Twilio.setPassword(null)); } @Test diff --git a/src/test/java/com/twilio/exception/ApiExceptionTest.java b/src/test/java/com/twilio/exception/ApiExceptionTest.java index b9733aea91..96b4a33845 100644 --- a/src/test/java/com/twilio/exception/ApiExceptionTest.java +++ b/src/test/java/com/twilio/exception/ApiExceptionTest.java @@ -39,7 +39,7 @@ public void fullConstructorShouldPreserveAllValues() { ApiException error = new ApiException(anyMessage, anyErrorCode, anyMoreInfo, anyHttpStatus, anyCause); assertEquals(anyMessage, error.getMessage()); assertSame(anyCause, error.getCause()); - assertEquals("More info", anyMoreInfo, error.getMoreInfo()); + assertEquals(anyMoreInfo, error.getMoreInfo()); assertEquals(anyErrorCode, error.getCode().intValue()); assertEquals(anyHttpStatus, error.getStatusCode().intValue()); } diff --git a/src/test/java/com/twilio/http/NetworkHttpClientTest.java b/src/test/java/com/twilio/http/NetworkHttpClientTest.java index 06dadf3b17..90d318aad6 100644 --- a/src/test/java/com/twilio/http/NetworkHttpClientTest.java +++ b/src/test/java/com/twilio/http/NetworkHttpClientTest.java @@ -87,8 +87,8 @@ public void testGet() throws IOException { Response resp = client.makeRequest(mockRequest); - assertEquals(resp.getStatusCode(), 200); - assertEquals(resp.getContent(), "frobozz"); + assertEquals(200, resp.getStatusCode()); + assertEquals("frobozz", resp.getContent()); } @Test @@ -111,8 +111,8 @@ public void testPost() throws IOException { Response resp = client.makeRequest(mockRequest); - assertEquals(resp.getStatusCode(), 201); - assertEquals(resp.getContent(), "frobozz"); + assertEquals(201, resp.getStatusCode()); + assertEquals("frobozz", resp.getContent()); } @Test @@ -123,8 +123,8 @@ public void testJsonPost() throws IOException { when(mockRequest.getBody()).thenReturn(body); Response resp = client.makeRequest(mockRequest); - assertEquals(resp.getStatusCode(), 201); - assertEquals(resp.getContent(), "frobozz"); + assertEquals(201, resp.getStatusCode()); + assertEquals("frobozz", resp.getContent()); } @Test @@ -162,8 +162,8 @@ public void testDelete() throws IOException { Response resp = client.makeRequest(mockRequest); - assertEquals(resp.getStatusCode(), 204); - assertEquals(resp.getContent(), ""); + assertEquals(204, resp.getStatusCode()); + assertEquals("", resp.getContent()); } @Test @@ -172,8 +172,8 @@ public void testAuthedGet() throws IOException { Response resp = client.makeRequest(mockRequest); - assertEquals(resp.getStatusCode(), 200); - assertEquals(resp.getContent(), "frobozz"); + assertEquals(200, resp.getStatusCode()); + assertEquals("frobozz", resp.getContent()); } @Test @@ -182,7 +182,7 @@ public void testErrorResponse() throws IOException { Response resp = client.makeRequest(mockRequest); - assertEquals(resp.getStatusCode(), 404); - assertEquals(resp.getContent(), "womp"); + assertEquals(404, resp.getStatusCode()); + assertEquals("womp", resp.getContent()); } } diff --git a/src/test/java/com/twilio/http/RequestTest.java b/src/test/java/com/twilio/http/RequestTest.java index 361f1df83d..4af38bed7e 100644 --- a/src/test/java/com/twilio/http/RequestTest.java +++ b/src/test/java/com/twilio/http/RequestTest.java @@ -45,7 +45,6 @@ public void testConstructURL() throws MalformedURLException { public void testConstructURLURISyntaxException() { Request request = new Request(HttpMethod.DELETE, "http://{"); assertThrows(ApiException.class, () -> request.constructURL()); - fail("ApiException was expected"); } @Test From 4991db1996b1d2bcfd58749e340bbcac463d26e4 Mon Sep 17 00:00:00 2001 From: manisha1997 Date: Wed, 14 May 2025 00:44:42 +0530 Subject: [PATCH 4/6] chore: Update to junit5 and doc upgrades --- .../com/twilio/http/NetworkHttpClientTest.java | 3 +-- .../com/twilio/twiml/voice/AssistantTest.java | 16 +++++----------- .../twiml/voice/ConversationRelayTest.java | 17 +++++------------ 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/test/java/com/twilio/http/NetworkHttpClientTest.java b/src/test/java/com/twilio/http/NetworkHttpClientTest.java index 90d318aad6..ea0a254512 100644 --- a/src/test/java/com/twilio/http/NetworkHttpClientTest.java +++ b/src/test/java/com/twilio/http/NetworkHttpClientTest.java @@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; public class NetworkHttpClientTest { @@ -101,7 +101,6 @@ public void testMakeRequestIOException() throws IOException { when(mockRequest.getAuthString()).thenReturn("foo:bar"); when(mockClient.execute(any())).thenThrow(new ApiConnectionException("foo")); client = new NetworkHttpClient(mockBuilder); - client.makeRequest(mockRequest); assertThrows(ApiConnectionException.class, () -> client.makeRequest(mockRequest)); } diff --git a/src/test/java/com/twilio/twiml/voice/AssistantTest.java b/src/test/java/com/twilio/twiml/voice/AssistantTest.java index 90f56bc3ff..a04f8dbebc 100644 --- a/src/test/java/com/twilio/twiml/voice/AssistantTest.java +++ b/src/test/java/com/twilio/twiml/voice/AssistantTest.java @@ -198,20 +198,14 @@ public void testXmlAttributesDeserialization() { .dtmfDetection(true) .welcomeGreeting("welcome_greeting") .partialPrompts(true) - .welcomeGreetingInterruptible("welcome_greeting_interruptible") - .interruptible("interruptible") - .preemptible(true) - .hints("hints") - .intelligenceService("intelligence_service") - .reportInputDuringAgentSpeech(true) - .elevenlabsTextNormalization("elevenlabs_text_normalization") - .interruptSensitivity("interrupt_sensitivity") - .debug("debug") + .welcomeGreetingInterruptible("true") + .interruptible("true") + .debug("true") .build(); assertEquals( - Assistant.Builder.fromXml("").build().toXml(), - elem.toXml() + elem.toXml(), + Assistant.Builder.fromXml("").build().toXml() ); } diff --git a/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java b/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java index af35f7d1bd..01c1b06c82 100644 --- a/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java +++ b/src/test/java/com/twilio/twiml/voice/ConversationRelayTest.java @@ -196,21 +196,14 @@ public void testXmlAttributesDeserialization() { .dtmfDetection(true) .welcomeGreeting("welcome_greeting") .partialPrompts(true) - .welcomeGreetingInterruptible("welcome_greeting_interruptible") - .interruptible("interruptible") - .preemptible(true) - .hints("hints") - .intelligenceService("intelligence_service") - .reportInputDuringAgentSpeech(true) - .elevenlabsTextNormalization("elevenlabs_text_normalization") - .interruptSensitivity("interrupt_sensitivity") - .debug("debug") + .welcomeGreetingInterruptible("true") + .interruptible("true") + .debug("true") .build(); assertEquals( - ConversationRelay.Builder.fromXml("").build().toXml(), - - elem.toXml() + elem.toXml(), + ConversationRelay.Builder.fromXml("").build().toXml() ); } From 36dcc5ecff2ed1fc375eefcca83f7bfa81e22319 Mon Sep 17 00:00:00 2001 From: manisha1997 Date: Wed, 14 May 2025 00:44:54 +0530 Subject: [PATCH 5/6] chore: Update to junit5 and doc upgrades --- .../jwt/validation/ValidationTokenTest.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java index b5a442b8f4..0329ff2d80 100644 --- a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java +++ b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java @@ -131,18 +131,15 @@ public void testTokenValidAlgorithms() throws IOException { public void testTokenInvalidAlgorithms() throws IOException { List validAlgorithms = Arrays.asList(SignatureAlgorithm.HS256, SignatureAlgorithm.ES256, RS384, RS512, PS384, PS512); for (SignatureAlgorithm alg : validAlgorithms) { - Jwt jwt = new ValidationToken.Builder(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey) - .algorithm(alg) - .method("GET") - .uri("/Messages") - .queryString("PageSize=5&Limit=10") - .headers(headers) - .signedHeaders(SIGNED_HEADERS) - .requestBody("foobar") - .build(); - - - assertThrows(IllegalArgumentException.class, () -> getClaimFromJwtToken(jwt)); + assertThrows(IllegalArgumentException.class,() -> new ValidationToken.Builder(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey) + .algorithm(alg) + .method("GET") + .uri("/Messages") + .queryString("PageSize=5&Limit=10") + .headers(headers) + .signedHeaders(SIGNED_HEADERS) + .requestBody("foobar") + .build()); } } From 1f306513d29718cec4763cea79e140ec2228f011 Mon Sep 17 00:00:00 2001 From: Manisha Singh Date: Wed, 14 May 2025 11:18:33 +0530 Subject: [PATCH 6/6] chore: fix typo --- examples/BearerTokenAuthentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/BearerTokenAuthentication.md b/examples/BearerTokenAuthentication.md index f14840a315..302bae6e34 100644 --- a/examples/BearerTokenAuthentication.md +++ b/examples/BearerTokenAuthentication.md @@ -3,7 +3,7 @@ public static void main { private static final String GRANT_TYPE = "grant_type_to_be_used"; - private static final String CLIENT_SID = + private static final String CLIENT_ID = "client_id_of_the_organization"; private static final String CLIENT_SECRET = "client_secret_of_organization"; private static final String ORGANISATION_ID = "id_of_the_organization";