Skip to content

Commit 0ccb780

Browse files
committed
Add tests
1 parent e641ccb commit 0ccb780

File tree

4 files changed

+58
-1
lines changed

4 files changed

+58
-1
lines changed

maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public void handle(String target, Request req, HttpServletRequest request, HttpS
350350
}
351351
headers.put(name, buffer.toString());
352352
}
353-
logEntries.add(new LogEntry(req.getMethod(), req.getPathInfo(), Collections.unmodifiableMap(headers)));
353+
logEntries.add(new LogEntry(req.getMethod(), req.getOriginalURI(), Collections.unmodifiableMap(headers)));
354354
}
355355
}
356356

maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,27 @@ protected void testGet_ProxyAuthenticated() throws Exception {
465465
assertEquals(task.getDataString(), listener.getBaos().toString(StandardCharsets.UTF_8));
466466
}
467467

468+
@Test
469+
protected void testGet_ProxyAuthenticatedHttps() throws Exception {
470+
httpServer.addSslConnector();
471+
httpServer.setProxyAuthentication("testuser", "testpass");
472+
Authentication auth = new AuthenticationBuilder()
473+
.addUsername("testuser")
474+
.addPassword("testpass")
475+
.build();
476+
proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(), httpServer.getHttpsPort(), auth);
477+
newTransporter("http://bad.localhost:1/");
478+
RecordingTransportListener listener = new RecordingTransportListener();
479+
GetTask task = new GetTask(URI.create("repo/file.txt")).setListener(listener);
480+
transporter.get(task);
481+
assertEquals("test", task.getDataString());
482+
assertEquals(0L, listener.getDataOffset());
483+
assertEquals(4L, listener.getDataLength());
484+
assertEquals(1, listener.getStartedCount());
485+
assertTrue(listener.getProgressedCount() > 0, "Count: " + listener.getProgressedCount());
486+
assertEquals(task.getDataString(), listener.getBaos().toString(StandardCharsets.UTF_8));
487+
}
488+
468489
@Test
469490
protected void testGet_ProxyUnauthenticated() throws Exception {
470491
httpServer.setProxyAuthentication("testuser", "testpass");
@@ -1243,6 +1264,21 @@ protected void testProxyAuthScope_NotUsedForServer() throws Exception {
12431264
}
12441265
}
12451266

1267+
@Test
1268+
public void testProxyType() throws Exception {
1269+
httpServer.addSslConnector();
1270+
proxy = new Proxy(Proxy.TYPE_HTTPS, httpServer.getHost(), httpServer.getHttpsPort(), null);
1271+
newTransporter("http://bad.localhost:1/");
1272+
try {
1273+
transporter.get(new GetTask(URI.create("foo/file.txt")));
1274+
} catch (HttpTransporterException e) {
1275+
assertEquals(404, e.getStatusCode());
1276+
assertEquals(
1277+
"http://bad.localhost:1/foo/file.txt",
1278+
httpServer.getLogEntries().get(0).getPath());
1279+
}
1280+
}
1281+
12461282
@Test
12471283
protected void testAuthSchemeReuse() throws Exception {
12481284
httpServer.setAuthentication("testuser", "testpass");

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ protected void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfigured
8888
@Test
8989
protected void testRequestTimeout() throws Exception {}
9090

91+
// https://dev.to/kdrakon/httpclient-can-t-connect-to-a-tls-proxy-118a
92+
@Override
93+
@Disabled
94+
@Test
95+
protected void testGet_ProxyAuthenticatedHttps() {}
96+
97+
@Override
98+
@Disabled
99+
@Test
100+
public void testProxyType() {}
101+
91102
public JdkTransporterTest() {
92103
super(() -> new JdkTransporterFactory(standardChecksumExtractor(), new DefaultPathProcessor()));
93104
}

maven-resolver-transport-jetty/src/test/java/org/eclipse/aether/transport/jetty/JettyTransporterTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ protected void testRetryHandler_explicitCount_positive() {}
5858
@Test
5959
protected void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfiguredHeader() {}
6060

61+
@Override
62+
@Disabled
63+
@Test
64+
protected void testGet_ProxyAuthenticatedHttps() {}
65+
66+
@Override
67+
@Disabled
68+
@Test
69+
public void testProxyType() {}
70+
6171
public JettyTransporterTest() {
6272
super(() -> new JettyTransporterFactory(standardChecksumExtractor(), new TestPathProcessor()));
6373
}

0 commit comments

Comments
 (0)