From ae100452bcb6f0dea308cb1d2565ce3a1cba8f71 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 14 Oct 2014 18:47:58 +0400 Subject: [PATCH] EA-61541 --- .../impl/src/com/intellij/execution/junit/JUnitUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java index d7c34ea475ba..055fcf2a3b21 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -273,8 +273,9 @@ public class JUnitUtil { return JavaPsiFacade.getInstance(project).findClass(qualifiedName, scope); } - public static PsiPackage getContainingPackage(final PsiClass psiClass) { - return JavaDirectoryService.getInstance().getPackage(psiClass.getContainingFile().getContainingDirectory()); + public static PsiPackage getContainingPackage(@NotNull PsiClass psiClass) { + PsiDirectory directory = psiClass.getContainingFile().getContainingDirectory(); + return directory == null ? null : JavaDirectoryService.getInstance().getPackage(directory); } public static PsiClass getTestClass(final PsiElement element) {