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

Fix warnings in JVM codegen tests

Browse Source 
Add generics where needed, add nullability annotations, etc.
Also delete some testcases from ArrayGenTest which will never be supported
This commit is contained in:
Alexander Udalov
2014-05-27 22:13:06 +04:00
parent beb7dc4524
commit 8a84d07645
15 changed files with 118 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
+12 -14
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.codegen;
import org.jetbrains.jet.ConfigurationKind;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -31,23 +30,23 @@ public class EnumGenTest extends CodegenTestCase {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
}
public void testSuperclassIsEnum() throws NoSuchFieldException, IllegalAccessException {
public void testSuperclassIsEnum() throws Exception {
loadFile("enum/simple.kt");
Class season = generateClass("Season");
Class<?> season = generateClass("Season");
assertEquals("java.lang.Enum", season.getSuperclass().getName());
}
public void testEnumClassModifiers() throws NoSuchFieldException, IllegalAccessException {
public void testEnumClassModifiers() throws Exception {
loadFile("enum/simple.kt");
Class season = generateClass("Season");
Class<?> season = generateClass("Season");
int modifiers = season.getModifiers();
assertTrue((modifiers & 0x4000) != 0); // ACC_ENUM
assertTrue((modifiers & Modifier.FINAL) != 0);
}
public void testEnumFieldModifiers() throws NoSuchFieldException, IllegalAccessException {
public void testEnumFieldModifiers() throws Exception {
loadFile("enum/simple.kt");
Class season = generateClass("Season");
Class<?> season = generateClass("Season");
Field summer = season.getField("SUMMER");
int modifiers = summer.getModifiers();
assertTrue((modifiers & 0x4000) != 0); // ACC_ENUM
@@ -58,25 +57,23 @@ public class EnumGenTest extends CodegenTestCase {
public void testEnumConstantConstructors() throws Exception {
loadText("enum class Color(val rgb: Int) { RED: Color(0xFF0000); GREEN: Color(0x00FF00); }");
Class colorClass = generateClass("Color");
Class<?> colorClass = generateClass("Color");
Field redField = colorClass.getField("RED");
Object redValue = redField.get(null);
Method rgbMethod = colorClass.getMethod("getRgb");
assertEquals(0xFF0000, rgbMethod.invoke(redValue));
}
public void testNoClassForSimpleEnum()
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
public void testNoClassForSimpleEnum() throws Exception {
loadFile("enum/name.kt");
Class cls = generateClass("State");
Class<?> cls = generateClass("State");
Field field = cls.getField("O");
assertEquals("State", field.get(null).getClass().getName());
}
public void testYesClassForComplexEnum()
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
public void testYesClassForComplexEnum() throws Exception {
loadFile("enum/abstractmethod.kt");
Class cls = generateClass("IssueState");
Class<?> cls = generateClass("IssueState");
Field field = cls.getField("DEFAULT");
assertEquals("IssueState", field.get(null).getClass().getName());
field = cls.getField("FIXED");
@@ -88,6 +85,7 @@ public class EnumGenTest extends CodegenTestCase {
fail();
}
catch (ClassNotFoundException e) {
// ok
}
}
}