test: Increase HttpConfig coverage

Vonage · Jun 20, 2024 · 0454945 · 0454945
1 parent 9a427b4
commit 0454945
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 11 deletions.
diff --git a/src/main/java/com/vonage/client/HttpConfig.java b/src/main/java/com/vonage/client/HttpConfig.java
@@ -79,18 +79,22 @@ public boolean isDefaultVideoBaseUri() {
         return DEFAULT_VIDEO_BASE_URI.equals(videoBaseUri);
     }
 
+    @Deprecated
     public String getVersionedApiBaseUri(String version) {
         return appendVersionToUri(apiBaseUri, version);
     }
 
+    @Deprecated
     public String getVersionedRestBaseUri(String version) {
         return appendVersionToUri(restBaseUri, version);
     }
 
+    @Deprecated
     public String getVersionedApiEuBaseUri(String version) {
         return appendVersionToUri(apiEuBaseUri, version);
     }
 
+    @Deprecated
     public String getVersionedVideoBaseUri(String version) {
         return appendVersionToUri(videoBaseUri, version);
     }

diff --git a/src/test/java/com/vonage/client/HttpConfigTest.java b/src/test/java/com/vonage/client/HttpConfigTest.java
@@ -23,12 +23,22 @@ public class HttpConfigTest {
     static final String
             EXPECTED_DEFAULT_API_BASE_URI = "https://api.nexmo.com",
             EXPECTED_DEFAULT_REST_BASE_URI = "https://rest.nexmo.com",
+            EXPECTED_DEFAULT_API_EU_BASE_URI = "https://api-eu.vonage.com",
+            EXPECTED_DEFAULT_VIDEO_BASE_URI = "https://video.api.vonage.com",
             EXAMPLE_BASE_URI = "https://example.com";
 
     static void assertDefaults(HttpConfig config) {
         assertEquals(60000, config.getTimeoutMillis());
+
+        assertTrue(config.isDefaultApiBaseUri());
+        assertTrue(config.isDefaultRestBaseUri());
+        assertTrue(config.isDefaultApiEuBaseUri());
+        assertTrue(config.isDefaultVideoBaseUri());
+
         assertEquals(EXPECTED_DEFAULT_API_BASE_URI, config.getApiBaseUri());
         assertEquals(EXPECTED_DEFAULT_REST_BASE_URI, config.getRestBaseUri());
+        assertEquals(EXPECTED_DEFAULT_API_EU_BASE_URI, config.getApiEuBaseUri());
+        assertEquals(EXPECTED_DEFAULT_VIDEO_BASE_URI, config.getVideoBaseUri());
     }
 
     @Test
@@ -42,6 +52,8 @@ public void testApiBaseUriOnly() {
 
         assertEquals(EXAMPLE_BASE_URI, config.getApiBaseUri());
         assertEquals(EXPECTED_DEFAULT_REST_BASE_URI, config.getRestBaseUri());
+        assertEquals(EXPECTED_DEFAULT_API_EU_BASE_URI, config.getApiEuBaseUri());
+        assertEquals(EXPECTED_DEFAULT_VIDEO_BASE_URI, config.getVideoBaseUri());
     }
 
     @Test
@@ -50,11 +62,33 @@ public void testApiRestUriOnly() {
 
         assertEquals(EXPECTED_DEFAULT_API_BASE_URI, config.getApiBaseUri());
         assertEquals(EXAMPLE_BASE_URI, config.getRestBaseUri());
+        assertEquals(EXPECTED_DEFAULT_API_EU_BASE_URI, config.getApiEuBaseUri());
+        assertEquals(EXPECTED_DEFAULT_VIDEO_BASE_URI, config.getVideoBaseUri());
+    }
+
+    @Test
+    public void testApiEuUriOnly() {
+        HttpConfig config = HttpConfig.builder().apiEuBaseUri(EXAMPLE_BASE_URI).build();
+
+        assertEquals(EXAMPLE_BASE_URI, config.getApiEuBaseUri());
+        assertEquals(EXPECTED_DEFAULT_API_BASE_URI, config.getApiBaseUri());
+        assertEquals(EXPECTED_DEFAULT_REST_BASE_URI, config.getRestBaseUri());
+        assertEquals(EXPECTED_DEFAULT_VIDEO_BASE_URI, config.getVideoBaseUri());
+    }
+
+    @Test
+    public void testVideoUriOnly() {
+        HttpConfig config = HttpConfig.builder().videoBaseUri(EXAMPLE_BASE_URI).build();
+
+        assertEquals(EXAMPLE_BASE_URI, config.getVideoBaseUri());
+        assertEquals(EXPECTED_DEFAULT_API_BASE_URI, config.getApiBaseUri());
+        assertEquals(EXPECTED_DEFAULT_REST_BASE_URI, config.getRestBaseUri());
+        assertEquals(EXPECTED_DEFAULT_API_EU_BASE_URI, config.getApiEuBaseUri());
     }
 
     @Test
     public void testAllBaseUri() {
-        HttpConfig config = HttpConfig.builder().baseUri(URI.create(EXAMPLE_BASE_URI)).build();
+        HttpConfig config = HttpConfig.builder().baseUri(URI.create(EXAMPLE_BASE_URI + '/')).build();
 
         assertEquals(EXAMPLE_BASE_URI, config.getApiBaseUri());
         assertEquals(EXAMPLE_BASE_URI, config.getRestBaseUri());

diff --git a/src/test/java/com/vonage/client/HttpWrapperTest.java b/src/test/java/com/vonage/client/HttpWrapperTest.java
@@ -20,11 +20,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 public class HttpWrapperTest {
-    private static final String
-            EXPECTED_DEFAULT_API_BASE_URI = "https://api.nexmo.com",
-            EXPECTED_DEFAULT_REST_BASE_URI = "https://rest.nexmo.com",
-            EXPECTED_DEFAULT_VIDEO_BASE_URI = "https://video.api.vonage.com";
-
     private HttpWrapper wrapper;
 
     @BeforeEach
@@ -37,6 +32,11 @@ public void basicTest() {
         assertNotNull(wrapper.getHttpClient());
     }
 
+    @Test
+    public void testGetApiKey() {
+        assertNull(wrapper.getApiKey());
+    }
+
     @Test
     public void testAuthMethodAccessors() {
         AuthCollection auths = new AuthCollection();
@@ -49,8 +49,5 @@ public void testDefaultConstructorSetsDefaultConfigValues() {
         HttpConfig config = wrapper.getHttpConfig();
         assertNotNull(config);
         HttpConfigTest.assertDefaults(config);
-        assertEquals(EXPECTED_DEFAULT_API_BASE_URI, config.getApiBaseUri());
-        assertEquals(EXPECTED_DEFAULT_REST_BASE_URI, config.getRestBaseUri());
-        assertEquals(EXPECTED_DEFAULT_VIDEO_BASE_URI, config.getVideoBaseUri());
     }
 }
diff --git a/src/test/java/com/vonage/client/conversations/ConversationsClientTest.java b/src/test/java/com/vonage/client/conversations/ConversationsClientTest.java
@@ -96,7 +96,7 @@ public class ConversationsClientTest extends AbstractClientTest<ConversationsCli
 			CHANNEL_TYPE_STR = "phone",
 			CHANNEL_TYPE_FROM_STR = "sms",
 			CHANNEL_TYPE_TO_STR = "mms",
-			ORDER_STR = SortOrder.fromString("desc").toString(),
+			ORDER_STR = "desc",
 			CUSTOM_EVENT_TYPE_STR = "custom",
 			KNOWN_EVENT_TYPE_STR = "audio:say:done",
 			CONVERSATION_TYPE = "quick_chat",

diff --git a/src/test/java/com/vonage/client/conversations/SortOrderTest.java b/src/test/java/com/vonage/client/conversations/SortOrderTest.java
@@ -1,2 +1,34 @@
-package com.vonage.client.conversations;public class SortOrderTest {
+/*
+ *   Copyright 2024 Vonage
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.vonage.client.conversations;
+
+import static com.vonage.client.common.SortOrder.*;
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class SortOrderTest {
+
+    @Test
+    public void testFromString() {
+        assertEquals(ASCENDING, fromString("ASC"));
+        assertEquals(ASCENDING, fromString("Ascending"));
+        assertEquals(DESCENDING, fromString("descending"));
+        assertEquals(DESCENDING, fromString("DESC"));
+        assertNull(fromString(""));
+        assertNull(fromString(null));
+        assertThrows(IllegalArgumentException.class, () -> fromString("Newest"));
+    }
 }