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

Minor, update obsolete message in JetTestUtils

Browse Source
This commit is contained in:
Alexander Udalov
2014-08-25 19:11:53 +04:00
parent 8bdad92eff
commit e14ec050b4
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+3 -14
View File
@@ -95,6 +95,7 @@ import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class JetTestUtils { public class JetTestUtils {
public static final String TEST_GENERATOR_NAME = "org.jetbrains.jet.generators.tests.TestsPackage"; public static final String TEST_GENERATOR_NAME = "org.jetbrains.jet.generators.tests.TestsPackage";
public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)";
private static final Pattern KT_FILES = Pattern.compile(".*?.kt"); private static final Pattern KT_FILES = Pattern.compile(".*?.kt");
private static final List<File> filesToDelete = new ArrayList<File>(); private static final List<File> filesToDelete = new ArrayList<File>();
@@ -725,7 +726,7 @@ public class JetTestUtils {
if (path != null) { if (path != null) {
String relativePath = FileUtil.nameToCompare(path); String relativePath = FileUtil.nameToCompare(path);
if (!filePaths.contains(relativePath)) { if (!filePaths.contains(relativePath)) {
Assert.fail("Test data file missing from the generated test class: " + file + pleaseReRunGenerator()); Assert.fail("Test data file missing from the generated test class: " + file + "\n" + PLEASE_REGENERATE_TESTS);
} }
} }
} }
@@ -781,19 +782,7 @@ public class JetTestUtils {
return; return;
} }
} }
Assert.fail("Test data directory missing from the generated test class: " + testDataDir + pleaseReRunGenerator()); Assert.fail("Test data directory missing from the generated test class: " + testDataDir + "\n" + PLEASE_REGENERATE_TESTS);
}
private static String pleaseReRunGenerator() {
return "\nPlease re-run the generator: " + TEST_GENERATOR_NAME + getLocationFormattedForConsole();
}
private static String getLocationFormattedForConsole() {
return "(" + getSimpleName() + ".java:1)";
}
private static String getSimpleName() {
return TEST_GENERATOR_NAME.substring(TEST_GENERATOR_NAME.lastIndexOf(".") + 1);
} }
@NotNull @NotNull