From 41435564a99c604566f10591e675ce10072b8133 Mon Sep 17 00:00:00 2001
From: Malgorzata Janczarska
Date: Thu, 28 Feb 2013 16:21:56 +0100
Subject: Bug 400540 - NPE in testOpenEditorOnRevision and other CVS tests

---
 .../src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/org.eclipse.team.tests.cvs.core')

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java
index 74bd0c518..959f386d4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java
@@ -269,13 +269,13 @@ public class CreatePatchTest extends EclipseTest {
 	private IWorkbenchPart getActivePart() {
 		IWorkbenchWindow window = PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow();
-		if (window == null) {
-			return null;
-		}
+		assertNotNull(window);
 		IWorkbenchPage page = window.getActivePage();
 		if (page == null) {
-			return null;
+			window.setActivePage(window.getPages()[0]);
+			page = window.getActivePage();
 		}
+		assertNotNull(page);
 		return page.getActivePart();
 	}
 
-- 
cgit v1.2.3