Skip to content

Commit 33430ae

Browse files
committed
Ensure integration tests reset to the J2EE perspective.
1 parent 3a06474 commit 33430ae

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

  • plugins/com.google.cloud.tools.eclipse.integration.appengine/src/com/google/cloud/tools/eclipse/integration/appengine

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
2626
import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
2727
import org.junit.After;
28+
import org.junit.Before;
2829
import org.junit.BeforeClass;
2930

3031
/**
@@ -36,7 +37,7 @@ public class BaseProjectTest {
3637
protected IProject project;
3738

3839
@BeforeClass
39-
public static void setUp() throws Exception {
40+
public static void setUpWorkbench() throws Exception {
4041
// verify we can find the Google Cloud SDK
4142
new CloudSdk.Builder().build().validateCloudSdk();
4243

@@ -46,9 +47,13 @@ public static void setUp() throws Exception {
4647
} catch (WidgetNotFoundException ex) {
4748
// may receive WNFE: "There is no active view"
4849
}
50+
}
4951

52+
@Before
53+
public void setUp() {
5054
// switch to J2EE to avoid new-project switch-perspective prompts
5155
bot.perspectiveById("org.eclipse.jst.j2ee.J2EEPerspective").activate();
56+
5257
}
5358

5459
@After

0 commit comments

Comments
 (0)