revert change to JavaRuntimeViaHttpBase and use full path in ServletC…

…ontextListenerTest Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
GoogleCloudPlatform · May 14, 2024 · 650c92a · 650c92a
1 parent 8ae03b2
commit 650c92a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/JavaRuntimeViaHttpBase.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/JavaRuntimeViaHttpBase.java
@@ -404,7 +404,12 @@ void awaitOutputLineMatching(String pattern, long timeoutSeconds) throws Interru
   static void copyAppToDir(String appName, Path dir) throws IOException {
     Class<?> myClass = JavaRuntimeViaHttpBase.class;
     ClassLoader myClassLoader = myClass.getClassLoader();
-    String appPrefix = Reflection.getPackageName(myClass).replace('.', '/') + "/" + appName + "/";
+    String appPrefix;
+    if (appName.contains("/")) {
+      appPrefix = appName + "/";
+    } else {
+      appPrefix = Reflection.getPackageName(myClass).replace('.', '/') + "/" + appName + "/";
+    }
     String appEngineWebXmlResource = appPrefix + "WEB-INF/appengine-web.xml";
     URL appEngineWebXmlUrl = myClassLoader.getResource(appEngineWebXmlResource);
     assertWithMessage("Resource %s not found", appEngineWebXmlResource)

diff --git a/...e/test/src/test/java/com/google/apphosting/runtime/jetty9/ServletContextListenerTest.java b/...e/test/src/test/java/com/google/apphosting/runtime/jetty9/ServletContextListenerTest.java
@@ -92,7 +92,7 @@ private RuntimeContext<?> runtimeContext() throws Exception {
 
   @Before
   public void before() throws Exception {
-    String app = "servletcontextlistenerapp/" + environment;
+    String app = "com/google/apphosting/runtime/jetty9/servletcontextlistenerapp/" + environment;
     copyAppToDir(app, temp.getRoot().toPath());
     httpClient.start();
     runtime = runtimeContext();