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

Make a parameterized test

Browse Source
This commit is contained in:
Nikolay Krasko
2011-12-19 21:20:49 +04:00
parent bf751bfa98
commit 23f4f80a52
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/quickfix/JetPsiCheckerMultifileTest.java
+41 -6
View File
@@ -14,20 +14,21 @@ import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.Pair;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.util.ui.UIUtil;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.*;
/**
* @author Nikolay Krasko
*/
public abstract class JetPsiCheckerMultifileTest extends DaemonAnalyzerTestCase {
public class JetPsiCheckerMultifileTest extends DaemonAnalyzerTestCase {
public final static String MAIN_SUBSTRING = ".Main";
public final static String DATA_SUBSTRING = ".Data";
@@ -42,7 +43,7 @@ public abstract class JetPsiCheckerMultifileTest extends DaemonAnalyzerTestCase
setName("testRun");
}
protected boolean shouldBeAvailableAfterExecution() {
protected static boolean shouldBeAvailableAfterExecution() {
return false;
}
@@ -188,4 +189,38 @@ public abstract class JetPsiCheckerMultifileTest extends DaemonAnalyzerTestCase
public static boolean isMainFile(String fileName) {
return fileName.contains(MAIN_SUBSTRING);
}
public static Test suite() {
TestSuite suite = new TestSuite();
FilenameFilter multifileFileNameFilter = new FilenameFilter() {
@Override
public boolean accept(File file, String s) {
return s.startsWith("before") && JetPsiCheckerMultifileTest.isMainFile(s);
}
};
JetTestCaseBuilder.NamedTestFactory multiFileNamedTestFactory = new JetTestCaseBuilder.NamedTestFactory() {
@NotNull
@Override
public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) {
return new JetPsiCheckerMultifileTest(dataPath, name);
}
};
File dir = new File(getTestDataPathBase());
List<String> subDirs = Arrays.asList(dir.list());
Collections.sort(subDirs);
for (String subDirName : subDirs) {
final TestSuite multiFileTestSuite = JetTestCaseBuilder.suiteForDirectory(getTestDataPathBase(), subDirName, true, multifileFileNameFilter, multiFileNamedTestFactory);
if (multiFileTestSuite.countTestCases() != 0) {
suite.addTest(multiFileTestSuite);
}
}
return suite;
}
public static String getTestDataPathBase() {
return JetTestCaseBuilder.getHomeDirectory() + "/idea/testData/quickfix/";
}
}
idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java
-28
View File
@@ -39,12 +39,6 @@ public class JetQuickFixTest extends LightQuickFixTestCase {
}
};
}
public static class JetPsiCheckerMultifileTestImpl extends JetPsiCheckerMultifileTest {
public JetPsiCheckerMultifileTestImpl(String dataPath, String name) {
super(dataPath, name);
}
}
public static Test suite() {
//setFilter(); //to launch only part of tests
@@ -57,13 +51,6 @@ public class JetQuickFixTest extends LightQuickFixTestCase {
}
};
FilenameFilter multifileFileNameFilter = new FilenameFilter() {
@Override
public boolean accept(File file, String s) {
return s.startsWith("before") && JetPsiCheckerMultifileTest.isMainFile(s);
}
};
JetTestCaseBuilder.NamedTestFactory singleFileNamedTestFactory = new JetTestCaseBuilder.NamedTestFactory() {
@NotNull
@Override
@@ -72,29 +59,14 @@ public class JetQuickFixTest extends LightQuickFixTestCase {
}
};
JetTestCaseBuilder.NamedTestFactory multiFileNamedTestFactory = new JetTestCaseBuilder.NamedTestFactory() {
@NotNull
@Override
public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) {
return new JetPsiCheckerMultifileTestImpl(dataPath, name);
}
};
File dir = new File(getTestDataPathBase());
List<String> subDirs = Arrays.asList(quickFixTestsFilter != null ? dir.list(quickFixTestsFilter) : dir.list());
Collections.sort(subDirs);
for (String subDirName : subDirs) {
final TestSuite singleFileTestSuite = JetTestCaseBuilder.suiteForDirectory(getTestDataPathBase(), subDirName, true, singleFileNameFilter, singleFileNamedTestFactory);
if (singleFileTestSuite.countTestCases() != 0) {
suite.addTest(singleFileTestSuite);
}
final TestSuite multiFileTestSuite = JetTestCaseBuilder.suiteForDirectory(getTestDataPathBase(), subDirName, true, multifileFileNameFilter, multiFileNamedTestFactory);
if (multiFileTestSuite.countTestCases() != 0) {
suite.addTest(multiFileTestSuite);
}
}
return suite;
}