Ensure integration tests reset to the J2EE perspective.

Don't join on SLEEPING jobs

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.appengine.newproject.maven/src/com/google/cloud/tools/eclipse/appengine/newproject/maven/MavenArchetypeProjectWizard.java

@@ -27,6 +27,7 @@
 import com.google.cloud.tools.eclipse.ui.util.WorkbenchUtil;
 import com.google.cloud.tools.eclipse.usagetracker.AnalyticsEvents;
 import com.google.cloud.tools.eclipse.usagetracker.AnalyticsPingManager;
+import com.google.cloud.tools.eclipse.util.service.ServiceContextFactory;
 import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -48,8 +49,7 @@
  * <p>
  * Expected to be created via the {@link ServiceContextFactory}.
  */
-public class MavenArchetypeProjectWizard extends Wizard
-    implements INewWizard {
+public class MavenArchetypeProjectWizard extends Wizard implements INewWizard {
   private MavenAppEngineStandardWizardPage page;
   private MavenAppEngineStandardArchetypeWizardPage archetypePage;
   private File cloudSdkLocation;

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

@@ -26,6 +26,7 @@
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.BeforeClass;
 
 /**
@@ -37,7 +38,7 @@ public class BaseProjectTest {
   protected IProject project;
 
   @BeforeClass
-  public static void setUp() throws Exception {
+  public static void setUpWorkbench() throws Exception {
     // verify we can find the Google Cloud SDK
     new CloudSdk.Builder().build().validateCloudSdk();
 
@@ -47,9 +48,13 @@ public static void setUp() throws Exception {
     } catch (WidgetNotFoundException ex) {
       // may receive WNFE: "There is no active view"
     }
+  }
 
+  @Before
+  public void setUp() {
     // switch to J2EE to avoid new-project switch-perspective prompts
     bot.perspectiveById("org.eclipse.jst.j2ee.J2EEPerspective").activate();
+
   }
 
   @After

plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/project/ProjectUtils.java

@@ -190,7 +190,10 @@ public static void waitForProjects(Runnable delayTactic, IProject... projects) {
       do {
         delayTactic.run();
         for (Job job : jobs) {
-          job.join();
+          // Do not join SLEEPING jobs as they may not run for a long time
+          if (job.getState() == Job.RUNNING || job.getState() == Job.WAITING) {
+            job.join();
+          }
         }
         jobs.clear();