Skip to content

[FEATURE] Improve test coverage for MLHttpClientFactory.java #3644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhrubo-os merged 5 commits into from
Mar 20, 2025
Merged

[FEATURE] Improve test coverage for MLHttpClientFactory.java #3644

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29444ee
[FEATURE] Improve test coverage for MLHttpClientFactory.java
akolarkunnu Mar 13, 2025
7d06ab8
[FEATURE] Improve test coverage for MLHttpClientFactory.java
akolarkunnu Mar 18, 2025
596787f
Merge branch 'opensearch-project:main' into MLHttpClientFactoryTests
akolarkunnu Mar 18, 2025
e24c407
Merge branch 'opensearch-project:main' into MLHttpClientFactoryTests
akolarkunnu Mar 19, 2025
8993efe
[FEATURE] Improve test coverage for MLHttpClientFactory.java
akolarkunnu Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 64 additions & 22 deletions ...lgorithms/src/test/java/org/opensearch/ml/engine/httpclient/MLHttpClientFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@

public class MLHttpClientFactoryTests {

private static final String TEST_HOST = "api.openai.com";
private static final String HTTP = "http";
private static final String HTTPS = "https";
private static final AtomicBoolean PRIVATE_IP_DISABLED = new AtomicBoolean(false);
private static final AtomicBoolean PRIVATE_IP_ENABLED = new AtomicBoolean(true);

@Rule
public ExpectedException expectedException = ExpectedException.none();

Expand All @@ -29,84 +35,120 @@ public void test_getSdkAsyncHttpClient_success() {

@Test
public void test_validateIp_validIp_noException() throws Exception {
AtomicBoolean privateIpEnabled = new AtomicBoolean(false);
MLHttpClientFactory.validate("http", "api.openai.com", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, TEST_HOST, 80, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTPS, TEST_HOST, 443, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTP, "127.0.0.1", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTPS, "127.0.0.1", 443, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "177.16.0.1", 80, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTP, "177.0.1.1", 80, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTP, "177.0.0.2", 80, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTP, "::ffff", 80, PRIVATE_IP_DISABLED);
}

@Test
public void test_validateIp_rarePrivateIp_throwException() throws Exception {
AtomicBoolean privateIpEnabled = new AtomicBoolean(false);
try {
MLHttpClientFactory.validate("http", "0254.020.00.01", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "0254.020.00.01", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate("http", "172.1048577", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "172.1048577", 80, PRIVATE_IP_DISABLED);
} catch (Exception e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate("http", "2886729729", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "2886729729", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate(HTTP, "192.11010049", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate(HTTP, "3232300545", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate("http", "192.11010049", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "0:0:0:0:0:ffff:127.0.0.1", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate("http", "3232300545", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "153.24.76.232", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate("http", "0:0:0:0:0:ffff:127.0.0.1", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "177.0.0.1", 80, PRIVATE_IP_DISABLED);
Comment thread
akolarkunnu marked this conversation as resolved.
} catch (IllegalArgumentException e) {
assertNotNull(e);
}

try {
MLHttpClientFactory.validate("http", "153.24.76.232", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "12.16.2.3", 80, PRIVATE_IP_DISABLED);
} catch (IllegalArgumentException e) {
assertNotNull(e);
}
}

@Test
public void test_validateIp_rarePrivateIp_NotThrowException() throws Exception {
AtomicBoolean privateIpEnabled = new AtomicBoolean(true);
MLHttpClientFactory.validate("http", "0254.020.00.01", 80, privateIpEnabled);
MLHttpClientFactory.validate("http", "172.1048577", 80, privateIpEnabled);
MLHttpClientFactory.validate("http", "2886729729", 80, privateIpEnabled);
MLHttpClientFactory.validate("http", "192.11010049", 80, privateIpEnabled);
MLHttpClientFactory.validate("http", "3232300545", 80, privateIpEnabled);
MLHttpClientFactory.validate("http", "0:0:0:0:0:ffff:127.0.0.1", 80, privateIpEnabled);
MLHttpClientFactory.validate("http", "153.24.76.232", 80, privateIpEnabled);
MLHttpClientFactory.validate(HTTP, "0254.020.00.01", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTPS, "0254.020.00.01", 443, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "172.1048577", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "2886729729", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "192.11010049", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "3232300545", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "0:0:0:0:0:ffff:127.0.0.1", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTPS, "0:0:0:0:0:ffff:127.0.0.1", 443, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "153.24.76.232", 80, PRIVATE_IP_ENABLED);
MLHttpClientFactory.validate(HTTP, "10.24.76.186", 80, PRIVATE_IP_ENABLED);
Comment thread
akolarkunnu marked this conversation as resolved.
MLHttpClientFactory.validate(HTTPS, "10.24.76.186", 443, PRIVATE_IP_ENABLED);
}

@Test
public void test_validateSchemaAndPort_success() throws Exception {
MLHttpClientFactory.validate("http", "api.openai.com", 80, new AtomicBoolean(false));
MLHttpClientFactory.validate(HTTP, TEST_HOST, 80, PRIVATE_IP_DISABLED);
}

@Test
public void test_validateSchemaAndPort_notAllowedSchema_throwException() throws Exception {
expectedException.expect(IllegalArgumentException.class);
MLHttpClientFactory.validate("ftp", "api.openai.com", 80, new AtomicBoolean(false));
MLHttpClientFactory.validate("ftp", TEST_HOST, 80, PRIVATE_IP_DISABLED);
}

@Test
public void test_validateSchemaAndPort_portNotInRange_throwException() throws Exception {
public void test_validateSchemaAndPort_portNotInRange1_throwException() throws Exception {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Port out of range: 65537");
MLHttpClientFactory.validate("https", "api.openai.com", 65537, new AtomicBoolean(false));
MLHttpClientFactory.validate(HTTPS, TEST_HOST, 65537, PRIVATE_IP_DISABLED);
}

@Test
public void test_validateSchemaAndPort_portNotInRange2_throwException() throws Exception {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Port out of range: -10");
MLHttpClientFactory.validate(HTTP, TEST_HOST, -10, PRIVATE_IP_DISABLED);
}

@Test
public void test_validatePort_boundaries_success() throws Exception {
MLHttpClientFactory.validate(HTTP, TEST_HOST, 65536, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTP, TEST_HOST, 0, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTP, TEST_HOST, -1, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(HTTPS, TEST_HOST, -1, PRIVATE_IP_DISABLED);
MLHttpClientFactory.validate(null, TEST_HOST, -1, PRIVATE_IP_DISABLED);
}

}
Loading