Got rid of "namespace" word in backend.

This commit is contained in:
Evgeny Gerashchenko
2014-01-10 00:38:19 +04:00
parent 1f74f02344
commit 4239f5bb18
23 changed files with 93 additions and 96 deletions
@@ -46,7 +46,7 @@ public class AnnotationGenTest extends CodegenTestCase {
}
private Class<?> getPackageSrcClass(@NotNull ClassLoader loader) throws ClassNotFoundException {
return loader.loadClass(NamespaceCodegen.getNamespacePartInternalName(myFiles.getPsiFile()));
return loader.loadClass(PackageCodegen.getPackagePartInternalName(myFiles.getPsiFile()));
}
public void testPropField() throws Exception {
@@ -167,14 +167,14 @@ public abstract class CodegenTestCase extends UsefulTestCase {
}
@NotNull
protected Class<?> generateNamespaceClass() {
protected Class<?> generatePackageClass() {
FqName packageFqName = JetPsiUtil.getFQName(myFiles.getPsiFile());
return generateClass(getPackageClassFqName(packageFqName).asString());
}
@NotNull
protected Class<?> generateNamespaceSrcClass() {
String name = NamespaceCodegen.getNamespacePartInternalName(myFiles.getPsiFile());
protected Class<?> generatePackagePartClass() {
String name = PackageCodegen.getPackagePartInternalName(myFiles.getPsiFile());
return generateClass(name);
}
@@ -263,7 +263,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
@NotNull
protected Method generateFunction() {
Class<?> aClass = generateNamespaceClass();
Class<?> aClass = generatePackageClass();
try {
return findTheOnlyMethod(aClass);
} catch (Error e) {
@@ -274,7 +274,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
@NotNull
protected Method generateFunction(@NotNull String name) {
Class<?> aClass = generateNamespaceClass();
Class<?> aClass = generatePackageClass();
Method method = findDeclaredMethodByName(aClass, name);
if (method == null) {
throw new IllegalArgumentException("Couldn't find method " + name + " in class " + aClass);
@@ -47,7 +47,7 @@ public class JUnitUsageGenTest extends CodegenTestCase {
public void testKt1592() throws Exception {
loadFile("junit/kt1592.kt");
Class<?> namespaceClass = generateNamespaceClass();
Class<?> namespaceClass = generatePackageClass();
Method method = namespaceClass.getMethod("foo", Method.class);
method.setAccessible(true);
Annotation annotation = method.getAnnotation(getCorrespondingAnnotationClass(Test.class));
@@ -159,7 +159,7 @@ public class PrimitiveTypesTest extends CodegenTestCase {
public void testCastOnStack() throws Exception {
loadText("fun foo(): Double = System.currentTimeMillis().toDouble()");
Class<?> mainClass = generateNamespaceSrcClass();
Class<?> mainClass = generatePackagePartClass();
Method main = mainClass.getDeclaredMethod("foo");
double currentTimeMillis = (double) System.currentTimeMillis();
double result = (Double) main.invoke(null);
@@ -76,7 +76,7 @@ public class PropertyGenTest extends CodegenTestCase {
public void testPrivatePropertyInNamespace() throws Exception {
loadText("private val x = 239");
Class nsClass = generateNamespaceSrcClass();
Class nsClass = generatePackagePartClass();
Field[] fields = nsClass.getDeclaredFields();
assertEquals(1, fields.length);
Field field = fields[0];