Use java17 instead of java8 apps in tests.

PiperOrigin-RevId: 920201149
Change-Id: If799fb759266a92944ad12b4e2b2a617913e5ce1

Author: ludoch

api_dev/src/test/java/com/google/appengine/tools/development/BackendServersTest.java

@@ -25,39 +25,38 @@
 /** Test @code {@link BackendServersBase} */
 public class BackendServersTest extends TestCase {
 
-  public void testServerInstanceEntryHashCode() throws Exception{
+  public void testServerInstanceEntryHashCode() throws Exception {
     ServerInstanceEntry server1 = new ServerInstanceEntry("server1", 17);
     ServerInstanceEntry server1copy = new ServerInstanceEntry("server1", 17);
     ServerInstanceEntry server2 = new ServerInstanceEntry("server2", 17);
-    
+
     assertThat(server1.hashCode()).isNotEqualTo(server2.hashCode());
-    assertEquals(server1.hashCode(), server1copy.hashCode());    
+    assertEquals(server1.hashCode(), server1copy.hashCode());
   }
-  
-  public void testServerInstanceEntryEquals() throws Exception{
+
+  public void testServerInstanceEntryEquals() throws Exception {
     ServerInstanceEntry server1 = new ServerInstanceEntry("server1", 17);
     ServerInstanceEntry server1copy = new ServerInstanceEntry("server1", 17);
     ServerInstanceEntry server2 = new ServerInstanceEntry("server2", 17);
     ServerInstanceEntry server3 = new ServerInstanceEntry(null, 17);
     ServerInstanceEntry server3copy = new ServerInstanceEntry(null, 17);
-    
+
     assertEquals(server1, server1copy);
     assertFalse(server1.equals(server2));
     assertFalse(server2.equals(server3));
     assertEquals(server3, server3copy);
   }
-  
-  
-  public void testServerInstanceIsHashSetCompatible() throws Exception{
+
+  public void testServerInstanceIsHashSetCompatible() throws Exception {
     ServerInstanceEntry server1 = new ServerInstanceEntry("server1", 17);
-    ServerInstanceEntry server1copy = new ServerInstanceEntry("server1", 17);    
+    ServerInstanceEntry server1copy = new ServerInstanceEntry("server1", 17);
     ServerInstanceEntry server2 = new ServerInstanceEntry("server2", 17);
     ServerInstanceEntry server3 = new ServerInstanceEntry("server1", 18);
-    
+
     HashSet<ServerInstanceEntry> set = new HashSet<ServerInstanceEntry>();
     set.add(server1);
     assertThat(set).contains(server1copy);
     assertFalse(set.contains(server2));
     assertFalse(set.contains(server3));
-    }
+  }
 }

applications/proberapp/src/main/webapp/WEB-INF/appengine-web.xml

@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-    <runtime>java8</runtime>
+    <runtime>java17</runtime>
     <app-engine-apis>true</app-engine-apis>
     <threadsafe>true</threadsafe>
     <system-properties>

e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java

@@ -63,7 +63,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -478,39 +477,6 @@ public void testSaneStagingDefaults() throws Exception {
     assertFileContains(appYaml, "application: 'sampleapp'");
   }
 
-  @Test
-  public void testStagingForGcloudWithFilesAndConfigErasure() throws Exception {
-    Application testApp = Application.readApplication(TEST_FILES, null, null, null);
-    testApp.setDetailsWriter(
-        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
-
-    testApp.validateForStaging();
-
-    ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
-    opts.setStagingOptions(StagingOptions.builder().setSplitJarFiles(Optional.of(true)).build());
-
-    File stagingDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
-    testStagedFiles(testApp);
-    // user staging copies yaml files from appengine-generated into the root
-    File copiedAppYaml = new File(stagingDir, "app.yaml");
-    File originalAppYaml = new File(stagingDir, "WEB-INF/appengine-generated/app.yaml");
-    assertThat(copiedAppYaml.canRead()).isTrue();
-
-    // the copied app.yaml is the original with a precautionary new line and an
-    // extra 'skip_files' line.
-    List<String> expectedCopiedAppYaml = Files.readLines(originalAppYaml, UTF_8);
-    expectedCopiedAppYaml.add("");
-    expectedCopiedAppYaml.add("skip_files: app.yaml");
-    assertThat(Files.readLines(copiedAppYaml, UTF_8)).isEqualTo(expectedCopiedAppYaml);
-
-    String yamlString = Files.asCharSource(copiedAppYaml, UTF_8).read();
-    assertThat(yamlString.startsWith("application:")).isFalse();
-    assertThat(yamlString).doesNotContain("\napplication:");
-    assertThat(yamlString.startsWith("version:")).isFalse();
-    assertThat(yamlString).doesNotContain("\nversion:");
-    assertFileContains(copiedAppYaml, "\nskip_files: app.yaml");
-  }
-
   private static void testStagedFiles(Application testApp) throws Exception {
     File stage = testApp.getStagingDir();
     File html = new File(stage, "__static__/random.html");
@@ -521,8 +487,8 @@ private static void testStagedFiles(Application testApp) throws Exception {
     assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
     File jspJar = new File(stage, "WEB-INF/lib/_ah_compiled_jsps-0000.jar");
     assertThat(jspJar.exists()).isTrue();
-    // Test that the classes in the generated jar are for Java8.
-    assertThat(getJavaJarVersion(jspJar)).isEqualTo(8);
+    // Test that the classes in the generated jar are for Java17.
+    assertThat(getJavaJarVersion(jspJar)).isEqualTo(17);
     checkIfEntryIsInJarFile(jspJar, "org/apache/jsp/nested/testing_jsp.class");
     assertThat(new File(stage, "nested/dukebanner.html").canRead()).isTrue();
     assertThat(new File(stage, "WEB-INF/lib").isDirectory()).isTrue();
@@ -627,7 +593,7 @@ private static void doTestAppEngineApiJarIncluded(File tmpDir, String testName,
   }
 
   @Test
-  public void testStagingJava8() throws Exception {
+  public void testStagingJava17Simple() throws Exception {
     Application testApp = Application.readApplication(TEST_FILES);
     testApp.setDetailsWriter(
         new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8))));
@@ -642,7 +608,8 @@ public void testStagingJava8() throws Exception {
     assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
     assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
     assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
-    assertFileContains(new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: java8\n");
+    assertFileContains(
+        new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: java17\n");
   }
 
   @Test
@@ -693,17 +660,18 @@ public void testJspCompilerJava8() throws Exception {
   }
 
   @Test
-  public void testStagingJava8RuntimeJava8JarFile() throws Exception {
+  public void testStagingJava17RuntimeJava17JarFile() throws Exception {
     Application testApp = Application.readApplication(JAVA8_JAR_TEST_FILES);
     ApplicationProcessingOptions opts = new ApplicationProcessingOptions();
     opts.setAllowAnyRuntime(true);
-    opts.setRuntime("java8");
+    opts.setRuntime("java17");
     File stage = testApp.createStagingDirectory(opts);
     assertThat(new File(stage, "WEB-INF").isDirectory()).isTrue();
     assertThat(new File(stage, "WEB-INF/web.xml").canRead()).isTrue();
     assertThat(new File(stage, "WEB-INF/appengine-web.xml").canRead()).isTrue();
     assertThat(new File(stage, "WEB-INF/appengine-generated/app.yaml").canRead()).isTrue();
-    assertFileContains(new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: java8\n");
+    assertFileContains(
+        new File(stage, "WEB-INF/appengine-generated/app.yaml"), "runtime: java17\n");
   }
 
   @Test
@@ -1709,7 +1677,7 @@ public void testMimetypes() throws Exception {
   }
 
   @Test
-  public void testJava8NoWebXmlNoApiJar() throws Exception {
+  public void testJava17NoWebXmlNoApiJar() throws Exception {
 
     Path temp = CopyDirVisitor.createTempDirectoryFrom(Paths.get(JAVA8_NO_WEBXML));
     Application testApp = Application.readApplication(temp.toFile().getAbsolutePath());
@@ -1722,7 +1690,7 @@ public void testJava8NoWebXmlNoApiJar() throws Exception {
     File stageDir = testApp.createStagingDirectory(opts, temporaryFolder.newFolder());
 
     File appYaml = new File(stageDir, "WEB-INF/appengine-generated/app.yaml");
-    assertFileContains(appYaml, "runtime: java8");
+    assertFileContains(appYaml, "runtime: java17");
   }
 
   /** returns the Java version of the first class in the jar, or -1 if error. */

e2etests/testlocalapps/badcron/src/main/webapp/WEB-INF/appengine-web.xml

@@ -17,7 +17,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>sampleapp</application>
   <version>1</version>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 
   <!-- files in the war which are servable as statics: none -->
   <static-files/>

e2etests/testlocalapps/bundle_standard/src/main/webapp/WEB-INF/appengine-web.xml

@@ -19,5 +19,5 @@
   <version>1</version>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 </appengine-web-app>

e2etests/testlocalapps/bundle_standard_with_container_initializer/src/main/webapp/WEB-INF/appengine-web.xml

@@ -19,5 +19,5 @@
   <version>1</version>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 </appengine-web-app>

e2etests/testlocalapps/bundle_standard_with_no_jsp/src/main/webapp/WEB-INF/appengine-web.xml

@@ -19,5 +19,5 @@
   <version>1</version>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 </appengine-web-app>

e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/src/main/webapp/WEB-INF/appengine-web.xml

@@ -19,5 +19,5 @@
   <version>1</version>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 </appengine-web-app>

e2etests/testlocalapps/cron-bad-job-age-limit/src/main/webapp/WEB-INF/appengine-web.xml

@@ -18,7 +18,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>sampleapp</application>
   <version>1</version>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 
   <!-- files in the war which are servable as statics: none -->
   <static-files/>

e2etests/testlocalapps/cron-good-retry-parameters/src/main/webapp/WEB-INF/appengine-web.xml

@@ -18,7 +18,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>sampleapp</application>
   <version>1</version>
-  <runtime>java8</runtime>
+  <runtime>java17</runtime>
 
   <!-- files in the war which are servable as statics: none -->
   <static-files/>