From 90d255e7da2f913082c8090e003e497ed89b9abc Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 7 Feb 2013 23:19:36 +0400
Subject: [PATCH] Simplify tests on not-null assertions

No need to call blackBoxFile() on a useless test data file. Also creating
environment logic is simplified
---
 .../notNullAssertions/doGenerateAssertions.kt |  4 ----
 .../doNotGenerateAssertions.kt                |  4 ----
 .../GenerateNotNullAssertionsTest.java        | 19 ++++++++-----------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 compiler/testData/codegen/notNullAssertions/doGenerateAssertions.kt
 delete mode 100644 compiler/testData/codegen/notNullAssertions/doNotGenerateAssertions.kt

diff --git a/compiler/testData/codegen/notNullAssertions/doGenerateAssertions.kt b/compiler/testData/codegen/notNullAssertions/doGenerateAssertions.kt
deleted file mode 100644
index d00d6be30e7..00000000000
--- a/compiler/testData/codegen/notNullAssertions/doGenerateAssertions.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun box(): String {
-    checkAssertions(true)
-    return "OK"
-}
diff --git a/compiler/testData/codegen/notNullAssertions/doNotGenerateAssertions.kt b/compiler/testData/codegen/notNullAssertions/doNotGenerateAssertions.kt
deleted file mode 100644
index 078f4285452..00000000000
--- a/compiler/testData/codegen/notNullAssertions/doNotGenerateAssertions.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun box(): String {
-    checkAssertions(false)
-    return "OK"
-}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
index b45492e6947..e79a39d775a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import java.io.File;
 
 import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava;
-import static org.jetbrains.jet.codegen.CodegenTestUtil.generateFiles;
 
 public class GenerateNotNullAssertionsTest extends CodegenTestCase {
     @Override
@@ -55,20 +54,21 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
         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");
 
         setUpEnvironment(generateAssertions, false, javaClassesTempDirectory);
 
-        blackBoxMultiFile("notNullAssertions/AssertionChecker.kt", ktFile);
+        loadFile("notNullAssertions/AssertionChecker.kt");
+        generateFunction("checkAssertions").invoke(null, generateAssertions);
     }
 
     public void testGenerateAssertions() throws Exception {
-        doTestGenerateAssertions(true, "notNullAssertions/doGenerateAssertions.kt");
+        doTestGenerateAssertions(true);
     }
 
     public void testDoNotGenerateAssertions() throws Exception {
-        doTestGenerateAssertions(false, "notNullAssertions/doNotGenerateAssertions.kt");
+        doTestGenerateAssertions(false);
     }
 
     public void testNoAssertionsForKotlinFromSource() throws Exception {
@@ -80,16 +80,13 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
     }
 
     public void testNoAssertionsForKotlinFromBinary() throws Exception {
-        CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(
-                ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK);
-        JetCoreEnvironment tmpEnvironment = new JetCoreEnvironment(getTestRootDisposable(), configuration);
-        ClassFileFactory factory = generateFiles(tmpEnvironment,
-                CodegenTestFiles.create(tmpEnvironment.getProject(), new String[] {"notNullAssertions/noAssertionsForKotlin.kt"}));
+        setUpEnvironment(true, false);
+        loadFile("notNullAssertions/noAssertionsForKotlin.kt");
+        ClassFileFactory factory = generateClassesInFile();
         File compiledDirectory = new File(FileUtil.getTempDirectory(), "kotlin-classes");
         CompileEnvironmentUtil.writeToOutputDirectory(factory, compiledDirectory);
 
         setUpEnvironment(true, false, compiledDirectory);
-
         loadFile("notNullAssertions/noAssertionsForKotlinMain.kt");
 
         assertNoIntrinsicsMethodIsCalled(PackageClassUtils.getPackageClassName(FqName.ROOT));