Replace UITestCase with test rule in org.eclipse.ui.tests.navigator

Author: HeikoKlare

tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/GoBackForwardsTest.java

@@ -15,6 +15,7 @@
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.processEvents;
 import static org.eclipse.ui.tests.harness.util.UITestUtil.processEventsUntil;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -35,26 +36,22 @@
 import org.eclipse.ui.internal.NavigationHistoryAction;
 import org.eclipse.ui.intro.IIntroPart;
 import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.tests.harness.util.EditorTestHelper;
 import org.eclipse.ui.tests.harness.util.FileUtil;
-import org.eclipse.ui.tests.harness.util.UITestCase;
 import org.eclipse.ui.tests.harness.util.UITestUtil.Condition;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 import org.eclipse.ui.texteditor.TextSelectionNavigationLocation;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 /**
  * @since 3.3
  *
  */
-public class GoBackForwardsTest extends UITestCase {
-
-	private static final String TEST_NAME = "GoBackForwardsTest";
-
-	public GoBackForwardsTest() {
-		super(TEST_NAME);
-	}
+public class GoBackForwardsTest {
 
 	private static final String PROJECT_NAME = "GoBackForwardsTestProject";
 	private static final String FILE_NAME = "GoBackForwardsTestFile.java";
@@ -68,8 +65,11 @@ public GoBackForwardsTest() {
 	private IProject project;
 	private IFile file;
 
-	@Override
-	public void doSetUp() throws CoreException, IOException {
+	@Rule
+	public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
+
+	@Before
+	public void setUp() throws CoreException, IOException {
 		project = FileUtil.createProject(PROJECT_NAME);
 		file = FileUtil.createFile(FILE_NAME, project);
 		StringBuilder stringBuilder = new StringBuilder();