Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 6712639

Browse files
committed
fixed proxy related unit tests
1 parent db8e26c commit 6712639

File tree

1 file changed

+10
-68
lines changed

1 file changed

+10
-68
lines changed

src/test/java/io/jenkins/plugins/security/scan/global/UtilityTest.java

+10-68
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.jenkins.plugins.security.scan.global;
22

33
import static org.junit.jupiter.api.Assertions.*;
4+
import static org.mockito.Mockito.mock;
45
import static org.mockito.Mockito.when;
56

67
import hudson.EnvVars;
@@ -11,7 +12,10 @@
1112
import java.io.File;
1213
import java.io.IOException;
1314
import java.io.PrintStream;
14-
import java.net.*;
15+
import java.net.Authenticator;
16+
import java.net.MalformedURLException;
17+
import java.net.PasswordAuthentication;
18+
import java.net.URL;
1519
import java.util.Arrays;
1620
import java.util.HashMap;
1721
import java.util.Map;
@@ -21,16 +25,16 @@
2125

2226
public class UtilityTest {
2327
private FilePath workspace;
24-
private final TaskListener listenerMock = Mockito.mock(TaskListener.class);
25-
private final EnvVars envVarsMock = Mockito.mock(EnvVars.class);
28+
private final TaskListener listenerMock = mock(TaskListener.class);
29+
private final EnvVars envVarsMock = mock(EnvVars.class);
2630
private LoggerWrapper logger;
2731
private URL url;
2832

2933
@BeforeEach
3034
void setup() {
3135
workspace = new FilePath(new File(getHomeDirectory()));
3236
logger = new LoggerWrapper(listenerMock);
33-
when(listenerMock.getLogger()).thenReturn(Mockito.mock(PrintStream.class));
37+
when(listenerMock.getLogger()).thenReturn(mock(PrintStream.class));
3438

3539
try {
3640
url = new URL("https://fake-url.com");
@@ -90,67 +94,6 @@ public void isStringNullOrBlankTest() {
9094
assertFalse(Utility.isStringNullOrBlank(validString));
9195
}
9296

93-
@Test
94-
public void getHttpURLConnectionTest() {
95-
EnvVars envVars = new EnvVars();
96-
envVars.put("HTTP_PROXY", "http://fake-proxy.com:1010");
97-
98-
HttpURLConnection httpProxyConnection = Utility.getHttpURLConnection(url, envVars, logger);
99-
100-
assertNotNull(httpProxyConnection);
101-
assertEquals(url, httpProxyConnection.getURL());
102-
103-
envVars.put("NO_PROXY", "https://test-url.com, https://fake-url.com");
104-
105-
HttpURLConnection noProxyConnection = Utility.getHttpURLConnection(url, envVars, logger);
106-
107-
assertNotNull(noProxyConnection);
108-
assertEquals(url, noProxyConnection.getURL());
109-
}
110-
111-
@Test
112-
public void getProxyTest() throws IOException {
113-
EnvVars envVars = new EnvVars();
114-
115-
assertEquals(ApplicationConstants.NO_PROXY, Utility.getProxy(url, envVars, logger));
116-
117-
envVars.put("NO_PROXY", "https://test-url.com, https://fake-url.com");
118-
119-
assertEquals(ApplicationConstants.NO_PROXY, Utility.getProxy(url, envVars, logger));
120-
121-
envVars.put("HTTP_PROXY", "https://fake-proxy.com:1010");
122-
envVars.replace("NO_PROXY", "https://test-url.com");
123-
envVars.put("HTTPS_PROXY", "https://fake-proxy.com:1010");
124-
125-
assertEquals(envVars.get("HTTPS_PROXY"), Utility.getProxy(url, envVars, logger));
126-
127-
envVars.remove("HTTPS_PROXY");
128-
129-
assertEquals(envVars.get("HTTP_PROXY"), Utility.getProxy(url, envVars, logger));
130-
}
131-
132-
@Test
133-
public void getEnvOrSystemProxyDetailsTest() {
134-
EnvVars envVars = new EnvVars();
135-
136-
assertNull(Utility.getEnvOrSystemProxyDetails(ApplicationConstants.NO_PROXY, envVars));
137-
assertNull(Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTP_PROXY, envVars));
138-
assertNull(Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTPS_PROXY, envVars));
139-
140-
envVars.put("NO_PROXY", "https://test-url.com, https://fake-url.com");
141-
envVars.put("HTTP_PROXY", "https://fake-proxy.com:1010");
142-
envVars.put("HTTPS_PROXY", "https://fake-proxy.com:1010");
143-
144-
assertEquals(
145-
envVars.get("NO_PROXY"), Utility.getEnvOrSystemProxyDetails(ApplicationConstants.NO_PROXY, envVars));
146-
assertEquals(
147-
envVars.get("HTTP_PROXY"),
148-
Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTP_PROXY, envVars));
149-
assertEquals(
150-
envVars.get("HTTPS_PROXY"),
151-
Utility.getEnvOrSystemProxyDetails(ApplicationConstants.HTTPS_PROXY, envVars));
152-
}
153-
15497
@Test
15598
public void setDefaultProxyAuthenticatorTest() {
15699
Authenticator.setDefault(null);
@@ -160,8 +103,7 @@ public void setDefaultProxyAuthenticatorTest() {
160103
assertEquals("username", passwordAuth.getUserName());
161104
assertArrayEquals("password".toCharArray(), passwordAuth.getPassword());
162105

163-
Utility.setDefaultProxyAuthenticator(
164-
passwordAuth.getUserName().concat(":").concat(Arrays.toString(passwordAuth.getPassword())));
106+
Utility.setDefaultProxyAuthenticator(passwordAuth.getUserName(), Arrays.toString(passwordAuth.getPassword()));
165107
Authenticator authenticator = Authenticator.getDefault();
166108
assertNotNull(authenticator);
167109

@@ -172,7 +114,7 @@ public void setDefaultProxyAuthenticatorTest() {
172114
public void testSetDefaultProxyAuthenticatorWithInvalidUserInfo() {
173115
Authenticator.setDefault(null);
174116

175-
Utility.setDefaultProxyAuthenticator("invalidUserInfo");
117+
Utility.setDefaultProxyAuthenticator(null, null);
176118

177119
assertNull(Authenticator.getDefault());
178120
}

0 commit comments

Comments
 (0)