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

Matching test files by regex instead of extension.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-02-04 19:54:29 +04:00
parent 1f67492bf9
commit 3cf2289687
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+6 -6
View File
@@ -454,7 +454,7 @@ public class JetTestUtils {
@NotNull Class<?> testCaseClass, @NotNull Class<?> testCaseClass,
@NotNull String generatorClassFqName, @NotNull String generatorClassFqName,
@NotNull File testDataDir, @NotNull File testDataDir,
@NotNull String extension, @NotNull Pattern filenamePattern,
boolean recursive boolean recursive
) { ) {
TestMetadata testClassMetadata = testCaseClass.getAnnotation(TestMetadata.class); TestMetadata testClassMetadata = testCaseClass.getAnnotation(TestMetadata.class);
@@ -474,12 +474,12 @@ public class JetTestUtils {
if (files != null) { if (files != null) {
for (File file : files) { for (File file : files) {
if (file.isDirectory()) { if (file.isDirectory()) {
if (recursive && containsTestData(file, extension)) { if (recursive && containsTestData(file, filenamePattern)) {
assertTestClassPresentByMetadata(testCaseClass, generatorClassFqName, file); assertTestClassPresentByMetadata(testCaseClass, generatorClassFqName, file);
} }
} }
else { else {
if (file.getName().endsWith("." + extension)) { if (filenamePattern.matcher(file.getName()).matches()) {
String relativePath = FileUtil.getRelativePath(rootFile, file); String relativePath = FileUtil.getRelativePath(rootFile, file);
if (!filePaths.contains(relativePath)) { if (!filePaths.contains(relativePath)) {
Assert.fail("Test data file missing from the generated test class: " + Assert.fail("Test data file missing from the generated test class: " +
@@ -492,17 +492,17 @@ public class JetTestUtils {
} }
} }
private static boolean containsTestData(File dir, String extension) { private static boolean containsTestData(File dir, Pattern filenamePattern) {
File[] files = dir.listFiles(); File[] files = dir.listFiles();
assert files != null; assert files != null;
for (File file : files) { for (File file : files) {
if (file.isDirectory()) { if (file.isDirectory()) {
if (containsTestData(file, extension)) { if (containsTestData(file, filenamePattern)) {
return true; return true;
} }
} }
else { else {
if (FileUtil.getExtension(file.getName()).equals(extension)) { if (filenamePattern.matcher(file.getName()).matches()) {
return true; return true;
} }
} }
compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java
+10 -9
View File
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
public class SimpleTestClassModel implements TestClassModel { public class SimpleTestClassModel implements TestClassModel {
private static final Comparator<TestEntityModel> BY_NAME = new Comparator<TestEntityModel>() { private static final Comparator<TestEntityModel> BY_NAME = new Comparator<TestEntityModel>() {
@@ -37,17 +38,17 @@ public class SimpleTestClassModel implements TestClassModel {
}; };
private final File rootFile; private final File rootFile;
private final boolean recursive; private final boolean recursive;
private final String extension; private final Pattern filenamePattern;
private final String doTestMethodName; private final String doTestMethodName;
private final String testClassName; private final String testClassName;
private Collection<TestClassModel> innerTestClasses; private Collection<TestClassModel> innerTestClasses;
private Collection<TestMethodModel> testMethods; private Collection<TestMethodModel> testMethods;
public SimpleTestClassModel(@NotNull File rootFile, boolean recursive, @NotNull String extension, @NotNull String doTestMethodName) { public SimpleTestClassModel(@NotNull File rootFile, boolean recursive, @NotNull Pattern filenamePattern, @NotNull String doTestMethodName) {
this.rootFile = rootFile; this.rootFile = rootFile;
this.recursive = recursive; this.recursive = recursive;
this.extension = extension; this.filenamePattern = filenamePattern;
this.doTestMethodName = doTestMethodName; this.doTestMethodName = doTestMethodName;
this.testClassName = StringUtil.capitalize(TestGeneratorUtil.escapeForJavaIdentifier(rootFile.getName())); this.testClassName = StringUtil.capitalize(TestGeneratorUtil.escapeForJavaIdentifier(rootFile.getName()));
} }
@@ -64,7 +65,7 @@ public class SimpleTestClassModel implements TestClassModel {
if (files != null) { if (files != null) {
for (File file : files) { for (File file : files) {
if (file.isDirectory()) { if (file.isDirectory()) {
children.add(new SimpleTestClassModel(file, recursive, extension, doTestMethodName)); children.add(new SimpleTestClassModel(file, recursive, filenamePattern, doTestMethodName));
} }
} }
} }
@@ -79,7 +80,7 @@ public class SimpleTestClassModel implements TestClassModel {
public Collection<TestMethodModel> getTestMethods() { public Collection<TestMethodModel> getTestMethods() {
if (testMethods == null) { if (testMethods == null) {
if (!rootFile.isDirectory()) { if (!rootFile.isDirectory()) {
testMethods = Collections.<TestMethodModel>singletonList(new SimpleTestMethodModel(rootFile, rootFile, doTestMethodName)); testMethods = Collections.<TestMethodModel>singletonList(new SimpleTestMethodModel(rootFile, rootFile, doTestMethodName, filenamePattern));
} }
else { else {
List<TestMethodModel> result = Lists.newArrayList(); List<TestMethodModel> result = Lists.newArrayList();
@@ -89,8 +90,8 @@ public class SimpleTestClassModel implements TestClassModel {
File[] listFiles = rootFile.listFiles(); File[] listFiles = rootFile.listFiles();
if (listFiles != null) { if (listFiles != null) {
for (File file : listFiles) { for (File file : listFiles) {
if (!file.isDirectory() && file.getName().endsWith("." + extension)) { if (!file.isDirectory() && filenamePattern.matcher(file.getName()).matches()) {
result.add(new SimpleTestMethodModel(rootFile, file, doTestMethodName)); result.add(new SimpleTestMethodModel(rootFile, file, doTestMethodName, filenamePattern));
} }
} }
} }
@@ -127,8 +128,8 @@ public class SimpleTestClassModel implements TestClassModel {
@Override @Override
public void generateBody(@NotNull Printer p, @NotNull String generatorClassFqName) { public void generateBody(@NotNull Printer p, @NotNull String generatorClassFqName) {
String assertTestsPresentStr = String assertTestsPresentStr =
String.format("JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), \"%s\", new File(\"%s\"), \"%s\", %s);", String.format("JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), \"%s\", new File(\"%s\"), Pattern.compile(\"%s\"), %s);",
generatorClassFqName, JetTestUtils.getFilePath(rootFile), extension, recursive); generatorClassFqName, JetTestUtils.getFilePath(rootFile), StringUtil.escapeStringCharacters(filenamePattern.pattern()), recursive);
p.println(assertTestsPresentStr); p.println(assertTestsPresentStr);
} }
compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java
+4 -1
View File
@@ -23,16 +23,19 @@ import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.utils.Printer; import org.jetbrains.jet.utils.Printer;
import java.io.File; import java.io.File;
import java.util.regex.Pattern;
public class SimpleTestMethodModel implements TestMethodModel { public class SimpleTestMethodModel implements TestMethodModel {
private final File rootDir; private final File rootDir;
private final File file; private final File file;
private final String doTestMethodName; private final String doTestMethodName;
private final Pattern filenamePattern;
public SimpleTestMethodModel(File rootDir, File file, String doTestMethodName) { public SimpleTestMethodModel(File rootDir, File file, String doTestMethodName, Pattern filenamePattern) {
this.rootDir = rootDir; this.rootDir = rootDir;
this.file = file; this.file = file;
this.doTestMethodName = doTestMethodName; this.doTestMethodName = doTestMethodName;
this.filenamePattern = filenamePattern;
} }
@Override @Override
compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
+1
View File
@@ -72,6 +72,7 @@ public class TestGenerator {
p.println(); p.println();
p.println("import java.io.File;"); p.println("import java.io.File;");
p.println("import java.util.regex.Pattern;");
p.println("import org.jetbrains.jet.JetTestUtils;"); p.println("import org.jetbrains.jet.JetTestUtils;");
p.println("import org.jetbrains.jet.test.InnerTestClasses;"); p.println("import org.jetbrains.jet.test.InnerTestClasses;");
p.println("import org.jetbrains.jet.test.TestMetadata;"); p.println("import org.jetbrains.jet.test.TestMetadata;");
generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+2 -1
View File
@@ -39,6 +39,7 @@ import org.jetbrains.jet.test.generator.TestGenerator;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.regex.Pattern;
public class GenerateTests { public class GenerateTests {
private static void generateTest( private static void generateTest(
@@ -222,7 +223,7 @@ public class GenerateTests {
@NotNull String extension, @NotNull String extension,
@NotNull String doTestMethodName @NotNull String doTestMethodName
) { ) {
return new SimpleTestClassModel(new File(rootPath), recursive, extension, doTestMethodName); return new SimpleTestClassModel(new File(rootPath), recursive, Pattern.compile("^(.+)\\." + extension + "$"), doTestMethodName);
} }
private GenerateTests() { private GenerateTests() {