Ensure test projects have different names to avoid class; log if project deletion timesout

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.integration.appengine/src/com/google/cloud/tools/eclipse/integration/appengine/BaseProjectTest.java

@@ -68,6 +68,7 @@ public void tearDown() {
         SwtBotProjectActions.deleteProject(bot, project.getName());
       } catch (TimeoutException ex) {
         // If this fails it shouldn't fail the test, which has already run
+        new RuntimeException("tearDown() timed out", ex).printStackTrace();
       }
       project = null;
     }

plugins/com.google.cloud.tools.eclipse.integration.appengine/src/com/google/cloud/tools/eclipse/integration/appengine/NewMavenBasedAppEngineProjectWizardTest.java

@@ -65,7 +65,7 @@ public class NewMavenBasedAppEngineProjectWizardTest extends BaseProjectTest {
   public void testHelloWorld_java7() throws Exception {
     String[] projectFiles =
         {"src/main/webapp/WEB-INF/appengine-web.xml", "src/main/webapp/WEB-INF/web.xml", "pom.xml"};
-    createAndCheck("appWithPackageProject", null, "com.example.baz",
+    createAndCheck("appWithPackageProjectJava7", null, "com.example.baz",
         AppEngineRuntime.STANDARD_JAVA_7, projectFiles);
     assertEquals("1.7", getPomProperty(project, "maven.compiler.source"));
     assertEquals("1.7", getPomProperty(project, "maven.compiler.target"));
@@ -76,7 +76,7 @@ public void testHelloWorld_java8() throws Exception {
     Assume.assumeTrue("Requires a Java 8 JRE", JavaRuntimeUtils.hasJavaSE8());
     String[] projectFiles =
         {"src/main/webapp/WEB-INF/appengine-web.xml", "src/main/webapp/WEB-INF/web.xml", "pom.xml"};
-    createAndCheck("appWithPackageProject", null, "com.example.baz",
+    createAndCheck("appWithPackageProjectJava8", null, "com.example.baz",
         AppEngineRuntime.STANDARD_JAVA_8, projectFiles);
     assertEquals("1.8", getPomProperty(project, "maven.compiler.source"));
     assertEquals("1.8", getPomProperty(project, "maven.compiler.target"));
@@ -90,7 +90,7 @@ public void testHelloWorld_nonDefaultLocation() throws Exception {
 
     String[] projectFiles =
         {"src/main/webapp/WEB-INF/appengine-web.xml", "src/main/webapp/WEB-INF/web.xml", "pom.xml"};
-    createAndCheck("appWithPackageProjectInTemp", location.getAbsolutePath(), "com.example.foo",
+    createAndCheck("appWithPackageProjectJava7InTemp", location.getAbsolutePath(), "com.example.foo",
         AppEngineRuntime.STANDARD_JAVA_7, projectFiles);
   }