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

Simplify tests on not-null assertions

Browse Source 
No need to call blackBoxFile() on a useless test data file. Also creating
environment logic is simplified
This commit is contained in:
Alexander Udalov
2013-02-07 23:19:36 +04:00
committed by Alexander Udalov
parent 30203383a4
commit 90d255e7da
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/notNullAssertions/doGenerateAssertions.kt
-4
View File
@@ -1,4 +0,0 @@
fun box(): String {
checkAssertions(true)
return "OK"
}
compiler/testData/codegen/notNullAssertions/doNotGenerateAssertions.kt
-4
View File
@@ -1,4 +0,0 @@
fun box(): String {
checkAssertions(false)
return "OK"
}
compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
+8 -11
View File
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import java.io.File; import java.io.File;
import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava; import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava;
import static org.jetbrains.jet.codegen.CodegenTestUtil.generateFiles;
public class GenerateNotNullAssertionsTest extends CodegenTestCase { public class GenerateNotNullAssertionsTest extends CodegenTestCase {
@Override @Override
@@ -55,20 +54,21 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
myEnvironment = new JetCoreEnvironment(getTestRootDisposable(), configuration); myEnvironment = new JetCoreEnvironment(getTestRootDisposable(), configuration);
} }
private void doTestGenerateAssertions(boolean generateAssertions, String ktFile) throws Exception { private void doTestGenerateAssertions(boolean generateAssertions) throws Exception {
File javaClassesTempDirectory = compileJava("notNullAssertions/A.java"); File javaClassesTempDirectory = compileJava("notNullAssertions/A.java");
setUpEnvironment(generateAssertions, false, javaClassesTempDirectory); setUpEnvironment(generateAssertions, false, javaClassesTempDirectory);
blackBoxMultiFile("notNullAssertions/AssertionChecker.kt", ktFile); loadFile("notNullAssertions/AssertionChecker.kt");
generateFunction("checkAssertions").invoke(null, generateAssertions);
} }
public void testGenerateAssertions() throws Exception { public void testGenerateAssertions() throws Exception {
doTestGenerateAssertions(true, "notNullAssertions/doGenerateAssertions.kt"); doTestGenerateAssertions(true);
} }
public void testDoNotGenerateAssertions() throws Exception { public void testDoNotGenerateAssertions() throws Exception {
doTestGenerateAssertions(false, "notNullAssertions/doNotGenerateAssertions.kt"); doTestGenerateAssertions(false);
} }
public void testNoAssertionsForKotlinFromSource() throws Exception { public void testNoAssertionsForKotlinFromSource() throws Exception {
@@ -80,16 +80,13 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
} }
public void testNoAssertionsForKotlinFromBinary() throws Exception { public void testNoAssertionsForKotlinFromBinary() throws Exception {
CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( setUpEnvironment(true, false);
ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); loadFile("notNullAssertions/noAssertionsForKotlin.kt");
JetCoreEnvironment tmpEnvironment = new JetCoreEnvironment(getTestRootDisposable(), configuration); ClassFileFactory factory = generateClassesInFile();
ClassFileFactory factory = generateFiles(tmpEnvironment,
CodegenTestFiles.create(tmpEnvironment.getProject(), new String[] {"notNullAssertions/noAssertionsForKotlin.kt"}));
File compiledDirectory = new File(FileUtil.getTempDirectory(), "kotlin-classes"); File compiledDirectory = new File(FileUtil.getTempDirectory(), "kotlin-classes");
CompileEnvironmentUtil.writeToOutputDirectory(factory, compiledDirectory); CompileEnvironmentUtil.writeToOutputDirectory(factory, compiledDirectory);
setUpEnvironment(true, false, compiledDirectory); setUpEnvironment(true, false, compiledDirectory);
loadFile("notNullAssertions/noAssertionsForKotlinMain.kt"); loadFile("notNullAssertions/noAssertionsForKotlinMain.kt");
assertNoIntrinsicsMethodIsCalled(PackageClassUtils.getPackageClassName(FqName.ROOT)); assertNoIntrinsicsMethodIsCalled(PackageClassUtils.getPackageClassName(FqName.ROOT));