Updating /proxy behavior and tests for javadoc.jetty.org reality

Author: joakime

tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoBaseTests.java

@@ -172,11 +172,10 @@ public void testJavadocProxy() throws Exception
             assertTrue(run.awaitConsoleLogsFor("Started @", 10, TimeUnit.SECONDS));
 
             startHttpClient(true);
-            ContentResponse response = client.GET("http://localhost:" + httpPort + "/proxy/current/");
+            ContentResponse response = client.GET("http://localhost:" + httpPort + "/proxy/jetty-12/index.html");
             assertEquals(HttpStatus.OK_200, response.getStatus());
             String body = response.getContentAsString();
-            assertThat("Expecting APIdoc contents", body, containsString("All Classes"));
-            assertThat("Expecting APIdoc contents", body, containsString("<title>Overview (Jetty :: Project 9."));
+            assertThat("Expecting APIdoc contents", body, containsString("<title>Overview (Eclipse Jetty API Doc"));
         }
     }
 

tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml

@@ -8,19 +8,19 @@
     <servlet-class>org.eclipse.jetty.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://jetty.org/javadoc/jetty-9/index.html?overview-summary.html</param-value>
+      <param-value>https://javadoc.jetty.org/</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>
-      <param-value>eclipse.dev</param-value>
+      <param-value>javadoc.jetty.org</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
   </servlet>
 
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
-    <url-pattern>/current/*</url-pattern>
+    <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
 </web-app>

tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/ProxyWebAppTest.java

@@ -81,7 +81,7 @@ public void teardown()
     @Tag("external")
     public void testProxyRequest() throws InterruptedException, ExecutionException, TimeoutException
     {
-        ContentResponse response = client.newRequest(server.getURI().resolve("/proxy/current/"))
+        ContentResponse response = client.newRequest(server.getURI().resolve("/proxy/jetty-12/index.html"))
             .followRedirects(false)
             .send();
 
@@ -92,7 +92,6 @@ public void testProxyRequest() throws InterruptedException, ExecutionException,
         assertThat("response status", response.getStatus(), is(HttpStatus.OK_200));
         // Expecting a Javadoc / APIDoc response - look for something unique for APIdoc.
         String body = response.getContentAsString();
-        assertThat(body, containsString("All Classes"));
-        assertThat(body, containsString("<title>Overview (Jetty :: Project 9."));
+        assertThat(body, containsString("<title>Overview (Eclipse Jetty API Doc"));
     }
 }