azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract classPathInTheSameClassLoader into a separate test

Browse Source 
- class loader is now always created as if classPathInTheSameClassLoader
  = false, which was the case of every codegen test except kt2781, which
  is extracted into a separate file
- testNoClassObjectForJavaClass() is moved from StdlibTest since it has
  a custom createClassLoader() which doesn't work well in a java-interop
  case
- get rid of generateClassesInFileGetState
- several similar methods are inlined
This commit is contained in:
Alexander Udalov
2013-01-25 04:00:42 +04:00
committed by Alexander Udalov
parent 639aa9e218
commit 63aacc416f
8 changed files with 89 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
+5 -5
View File
@@ -33,13 +33,13 @@ public class EnumGenTest extends CodegenTestCase {
public void testSuperclassIsEnum() throws NoSuchFieldException, IllegalAccessException {
loadFile("enum/simple.kt");
Class season = loadClass("Season", generateClassesInFile());
Class season = generateClass("Season");
assertEquals("java.lang.Enum", season.getSuperclass().getName());
}
public void testEnumClassModifiers() throws NoSuchFieldException, IllegalAccessException {
loadFile("enum/simple.kt");
Class season = loadClass("Season", generateClassesInFile());
Class season = generateClass("Season");
int modifiers = season.getModifiers();
assertTrue((modifiers & 0x4000) != 0); // ACC_ENUM
assertTrue((modifiers & Modifier.FINAL) != 0);
@@ -47,7 +47,7 @@ public class EnumGenTest extends CodegenTestCase {
public void testEnumFieldModifiers() throws NoSuchFieldException, IllegalAccessException {
loadFile("enum/simple.kt");
Class season = loadClass("Season", generateClassesInFile());
Class season = generateClass("Season");
Field summer = season.getField("SUMMER");
int modifiers = summer.getModifiers();
assertTrue((modifiers & 0x4000) != 0); // ACC_ENUM
@@ -120,7 +120,7 @@ public class EnumGenTest extends CodegenTestCase {
public void testNoClassForSimpleEnum()
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
loadFile("enum/name.kt");
Class cls = loadClass("State", generateClassesInFile());
Class cls = generateClass("State");
Field field = cls.getField("O");
assertEquals("State", field.get(null).getClass().getName());
}
@@ -128,7 +128,7 @@ public class EnumGenTest extends CodegenTestCase {
public void testYesClassForComplexEnum()
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
loadFile("enum/abstractmethod.kt");
Class cls = loadClass("IssueState", generateClassesInFile());
Class cls = generateClass("IssueState");
Field field = cls.getField("DEFAULT");
assertEquals("IssueState", field.get(null).getClass().getName());
field = cls.getField("FIXED");