commit | 41435564a99c604566f10591e675ce10072b8133 | [log] [tgz] |
---|---|---|
author | Malgorzata Janczarska <malgorzata.tomczyk@pl.ibm.com> | Thu Feb 28 16:21:56 2013 +0100 |
committer | Malgorzata Janczarska <malgorzata.tomczyk@pl.ibm.com> | Thu Feb 28 16:22:32 2013 +0100 |
tree | 49ab1d65a024ffe3b10803f8159a9d4c06438f87 | |
parent | 422a25a5f2b3c3c5189690e2318c8b12b239bc3d [diff] |
Bug 400540 - NPE in testOpenEditorOnRevision and other CVS tests
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 74bd0c5..959f386 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 @@ 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(); }