From 6a0e54896d8d32f7318d1f2e53e53e345aa48d7a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 11 Apr 2014 20:44:59 +0400 Subject: [PATCH] Extracted PackagePartClassUtils. Original commit: 381e8bb2055b3123faa10ad04b2d0c3148cddaba --- .../org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index ac2b7d2e6c5..e78331d65bf 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -22,7 +22,9 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.codegen.AsmUtil; import org.jetbrains.jet.codegen.PackageCodegen; +import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; @@ -368,7 +370,9 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return super.getPath().substring(1); } }; - return PackageCodegen.getPackagePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName(); + + FqName packagePartFqName = PackagePartClassUtils.getPackagePartFqName(new FqName(packageClassFqName), fakeVirtualFile); + return AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName); } private static enum Operation {