Remove orphaned Jetty 9 runtime directories and Maven properties.

PiperOrigin-RevId: 1000127832
Change-Id: I3ea998a2d7bd59f6ef864907d65a75572ae092d2

Author: ludoch

api_dev/src/test/java/com/google/appengine/api/blobstore/BlobInfoFactoryTest.java

@@ -22,11 +22,6 @@
 import com.google.appengine.api.blobstore.dev.BlobInfoStorage;
 import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.common.io.MoreFiles;
-import com.google.common.io.RecursiveDeleteOption;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Iterator;
 import org.junit.After;
@@ -59,15 +54,6 @@ public void tearDown() throws Exception {
     helper.tearDown();
     blobInfoFactory = null;
     blobInfoStorage = null;
-    // This is a hack for the Maven environment. Some tests fail because they find the
-    // blobstore or datastore files left behind by previous tests. Probably we need a cleaner
-    // solution, maybe integrated with LocalServiceTestHelper.tearDown().
-    Path appengineGenerated = Paths.get("WEB-INF", "appengine-generated");
-    try {
-      MoreFiles.deleteRecursively(appengineGenerated, RecursiveDeleteOption.ALLOW_INSECURE);
-    } catch (IOException e) {
-      // OK, there is no WEB-INF/appengine-generated.
-    }
   }
 
   @Test

api_dev/src/test/java/com/google/appengine/api/blobstore/dev/LocalBlobstoreServiceTest.java

@@ -34,16 +34,14 @@
 import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
 import com.google.apphosting.api.ApiProxy;
-import com.google.common.io.MoreFiles;
-import com.google.common.io.RecursiveDeleteOption;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Date;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -60,19 +58,25 @@ public static Object[] data() {
     return new Object[] {true, false};
   }
 
+  @Rule public final TemporaryFolder tempFolder = new TemporaryFolder();
+
+  private final boolean noStorage;
   private BlobstoreService blobstoreService;
   private BlobUploadSessionStorage blobUploadSessionStorage;
-  private final LocalServiceTestHelper helper;
+  private LocalServiceTestHelper helper;
 
   public LocalBlobstoreServiceTest(boolean noStorage) {
-    helper =
-        new LocalServiceTestHelper(
-            new LocalBlobstoreServiceTestConfig().setNoStorage(noStorage),
-            new LocalDatastoreServiceTestConfig());
+    this.noStorage = noStorage;
   }
 
   @Before
   public void setUp() throws Exception {
+    helper =
+        new LocalServiceTestHelper(
+            new LocalBlobstoreServiceTestConfig()
+                .setNoStorage(noStorage)
+                .setBackingStoreLocation(tempFolder.newFolder().getAbsolutePath()),
+            new LocalDatastoreServiceTestConfig());
     helper.setUp();
     blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
     blobUploadSessionStorage = new BlobUploadSessionStorage();
@@ -83,15 +87,6 @@ public void tearDown() throws Exception {
     helper.tearDown();
     blobstoreService = null;
     blobUploadSessionStorage = null;
-    // This is a hack for the Maven environment. Some tests fail because they find the
-    // blobstore or datastore files left behind by previous tests. Probably we need a cleaner
-    // solution, maybe integrated with LocalServiceTestHelper.tearDown().
-    Path appengineGenerated = Paths.get("WEB-INF", "appengine-generated");
-    try {
-      MoreFiles.deleteRecursively(appengineGenerated, RecursiveDeleteOption.ALLOW_INSECURE);
-    } catch (IOException e) {
-      // OK, there is no WEB-INF/appengine-generated.
-    }
   }
 
   public void doFetchDataTest(long startIndex, long endIndex, String expectedData)