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

Minor refactorings in legacy codegen tests

Browse Source 
Use loadFile() + getPrefix() instead of loadFile(String)
This commit is contained in:
Alexander Udalov
2016-02-23 17:56:28 +03:00
parent 5f7bc601a8
commit 1be6046fc2
9 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java
+24 -19
View File
@@ -42,9 +42,10 @@ import java.lang.reflect.InvocationTargetException;
import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava;
public class GenerateNotNullAssertionsTest extends CodegenTestCase {
@NotNull
@Override
protected void setUp() throws Exception {
super.setUp();
protected String getPrefix() {
return "notNullAssertions";
}
private void setUpEnvironment(boolean disableCallAssertions, boolean disableParamAssertions, File... extraClassPath) {
@@ -57,12 +58,16 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
}
private void loadSource(@NotNull String fileName) {
loadFileByFullPath(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + fileName);
}
private void doTestCallAssertions(boolean disableCallAssertions) throws Exception {
File javaClassesTempDirectory = compileJava("notNullAssertions/A.java");
File javaClassesTempDirectory = compileJava(getPrefix() + "/A.java");
setUpEnvironment(disableCallAssertions, true, javaClassesTempDirectory);
loadFile("notNullAssertions/AssertionChecker.kt");
loadSource("AssertionChecker.kt");
generateFunction("checkAssertions").invoke(null, !disableCallAssertions);
}
@@ -77,37 +82,37 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testNoAssertionsForKotlinFromSource() throws Exception {
setUpEnvironment(false, true);
loadFiles("notNullAssertions/noAssertionsForKotlin.kt", "notNullAssertions/noAssertionsForKotlinMain.kt");
loadFiles(getPrefix() + "/noAssertionsForKotlin.kt", getPrefix() + "/noAssertionsForKotlinMain.kt");
assertNoIntrinsicsMethodIsCalledInMyClasses(true);
}
public void testNoAssertionsForKotlinFromBinary() throws Exception {
setUpEnvironment(false, true);
loadFile("notNullAssertions/noAssertionsForKotlin.kt");
loadSource("noAssertionsForKotlin.kt");
OutputFileCollection outputFiles = generateClassesInFile();
File compiledDirectory = new File(FileUtil.getTempDirectory(), "kotlin-classes");
OutputUtilsKt.writeAllTo(outputFiles, compiledDirectory);
setUpEnvironment(false, true, compiledDirectory);
loadFile("notNullAssertions/noAssertionsForKotlinMain.kt");
loadSource("noAssertionsForKotlinMain.kt");
assertNoIntrinsicsMethodIsCalledInMyClasses(false);
}
public void testGenerateParamAssertions() throws Exception {
File javaClassesTempDirectory = compileJava("notNullAssertions/doGenerateParamAssertions.java");
File javaClassesTempDirectory = compileJava(getPrefix() + "/doGenerateParamAssertions.java");
setUpEnvironment(true, false, javaClassesTempDirectory);
loadFile("notNullAssertions/doGenerateParamAssertions.kt");
loadSource("doGenerateParamAssertions.kt");
generateFunction().invoke(null);
}
public void testDoNotGenerateParamAssertions() throws Exception {
setUpEnvironment(true, true);
loadFile("notNullAssertions/doNotGenerateParamAssertions.kt");
loadSource("doNotGenerateParamAssertions.kt");
assertNoIntrinsicsMethodIsCalled("A", true);
}
@@ -115,7 +120,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testNoParamAssertionForPrivateMethod() throws Exception {
setUpEnvironment(true, false);
loadFile("notNullAssertions/noAssertionForPrivateMethod.kt");
loadSource("noAssertionForPrivateMethod.kt");
assertNoIntrinsicsMethodIsCalled("A", true);
}
@@ -123,7 +128,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testArrayListGet() {
setUpEnvironment(false, false);
loadFile("notNullAssertions/arrayListGet.kt");
loadSource("arrayListGet.kt");
String text = generateToText();
assertTrue(text.contains("checkExpressionValueIsNotNull"));
@@ -131,10 +136,10 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
}
public void testJavaMultipleSubstitutions() {
File javaClassesTempDirectory = compileJava("notNullAssertions/javaMultipleSubstitutions.java");
File javaClassesTempDirectory = compileJava(getPrefix() + "/javaMultipleSubstitutions.java");
setUpEnvironment(false, false, javaClassesTempDirectory);
loadFile("notNullAssertions/javaMultipleSubstitutions.kt");
loadSource("javaMultipleSubstitutions.kt");
String text = generateToText();
assertEquals(3, StringUtil.getOccurrenceCount(text, "checkExpressionValueIsNotNull"));
@@ -144,7 +149,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testAssertionForNotNullTypeParam() {
setUpEnvironment(false, false);
loadFile("notNullAssertions/assertionForNotNullTypeParam.kt");
loadSource("assertionForNotNullTypeParam.kt");
assertTrue(generateToText().contains("checkParameterIsNotNull"));
}
@@ -152,7 +157,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testNoAssertionForNullableGenericMethod() {
setUpEnvironment(false, true);
loadFile("notNullAssertions/noAssertionForNullableGenericMethod.kt");
loadSource("noAssertionForNullableGenericMethod.kt");
assertNoIntrinsicsMethodIsCalledInMyClasses(true);
}
@@ -160,7 +165,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testNoAssertionForNullableCaptured() {
setUpEnvironment(false, true);
loadFile("notNullAssertions/noAssertionForNullableCaptured.kt");
loadSource("noAssertionForNullableCaptured.kt");
assertNoIntrinsicsMethodIsCalledInMyClasses(true);
}
@@ -168,7 +173,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testAssertionForNotNullCaptured() {
setUpEnvironment(false, true);
loadFile("notNullAssertions/assertionForNotNullCaptured.kt");
loadSource("assertionForNotNullCaptured.kt");
assertTrue(generateToText().contains("checkExpressionValueIsNotNull"));
}
@@ -176,7 +181,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
public void testNoAssertionForNullableGenericMethodCall() {
setUpEnvironment(false, true);
loadFile("notNullAssertions/noAssertionForNullableGenericMethodCall.kt");
loadSource("noAssertionForNullableGenericMethodCall.kt");
assertNoIntrinsicsMethodIsCalled("A", true);
}