Regenerate tests with TargetBackend.ANY remove and using runTest with this

This commit is contained in:
Nikolay Krasko
2019-10-18 13:42:18 +03:00
parent 28abfe6dfa
commit 4ed64b0283
307 changed files with 8038 additions and 8341 deletions
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.cli;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
@@ -24,11 +23,11 @@ public class CliTestGenerated extends AbstractCliTest {
@RunWith(JUnit3RunnerWithInners.class)
public static class Jvm extends AbstractCliTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doJvmTest, TargetBackend.ANY, testDataFilePath);
KotlinTestUtils.runTest(this::doJvmTest, this, testDataFilePath);
}
public void testAllFilesPresentInJvm() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), TargetBackend.ANY, false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), false);
}
@TestMetadata("apiVersion.args")
@@ -722,11 +721,11 @@ public class CliTestGenerated extends AbstractCliTest {
@RunWith(JUnit3RunnerWithInners.class)
public static class Js extends AbstractCliTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doJsTest, TargetBackend.ANY, testDataFilePath);
KotlinTestUtils.runTest(this::doJsTest, this, testDataFilePath);
}
public void testAllFilesPresentInJs() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), TargetBackend.ANY, false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), false);
}
@TestMetadata("createMetadata.args")
@@ -900,11 +899,11 @@ public class CliTestGenerated extends AbstractCliTest {
@RunWith(JUnit3RunnerWithInners.class)
public static class Js_dce extends AbstractCliTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doJsDceTest, TargetBackend.ANY, testDataFilePath);
KotlinTestUtils.runTest(this::doJsDceTest, this, testDataFilePath);
}
public void testAllFilesPresentInJs_dce() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js-dce"), Pattern.compile("^(.+)\\.args$"), TargetBackend.ANY, false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js-dce"), Pattern.compile("^(.+)\\.args$"), false);
}
@TestMetadata("dceHelp.args")
@@ -973,11 +972,11 @@ public class CliTestGenerated extends AbstractCliTest {
@RunWith(JUnit3RunnerWithInners.class)
public static class Metadata extends AbstractCliTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doMetadataTest, TargetBackend.ANY, testDataFilePath);
KotlinTestUtils.runTest(this::doMetadataTest, this, testDataFilePath);
}
public void testAllFilesPresentInMetadata() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/metadata"), Pattern.compile("^(.+)\\.args$"), TargetBackend.ANY, false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/metadata"), Pattern.compile("^(.+)\\.args$"), false);
}
@TestMetadata("kotlinPackage.args")