From b9836afb499ac8984c4e2ca207d2164813c584e4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 20 Oct 2014 18:38:51 +0400 Subject: [PATCH] Reorder imports in test generator To make IDEA's Optimize Imports action a no-op on most of the generated tests --- .../jet/generators/tests/generator/TestGenerator.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java index 940ef8748f3..ea36529fdbb 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java @@ -80,14 +80,11 @@ public class TestGenerator { p.println("package ", suiteClassPackage, ";"); p.println(); p.println("import com.intellij.testFramework.TestDataPath;"); - p.println("import junit.framework.Test;"); - p.println("import junit.framework.TestSuite;"); - p.println("import org.junit.runner.RunWith;"); + p.println("import ", RUNNER.getCanonicalName(), ";"); p.println("import org.jetbrains.jet.JetTestUtils;"); p.println("import org.jetbrains.jet.test.InnerTestClasses;"); p.println("import org.jetbrains.jet.test.TestMetadata;"); - p.println("import ", RUNNER.getCanonicalName(), ";"); - + p.println("import org.junit.runner.RunWith;"); p.println(); p.println("import java.io.File;"); p.println("import java.util.regex.Pattern;"); @@ -151,7 +148,7 @@ public class TestGenerator { generateMetadata(p, testClassModel); generateTestDataPath(p, testClassModel); generateInnerClassesAnnotation(p, testClassModel); - p.println("@RunWith(", RUNNER.getName(), ".class)"); + p.println("@RunWith(", RUNNER.getSimpleName(), ".class)"); p.println("public " + staticModifier + "class ", testClassModel.getName(), " extends ", baseTestClassName, " {"); p.pushIndent();