From 8ae6e98295bf0b59476ebec6b3d41067ed33babe Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Mon, 19 Feb 2024 10:27:38 +0200 Subject: [PATCH] [Native][Tests] Adapt CExport tests to generator changes --- ...portDynamicInterfaceNoneTestGenerated.java | 28 +++++++++---------- ...ExportDynamicInterfaceV1TestGenerated.java | 28 +++++++++---------- ...xportStaticInterfaceNoneTestGenerated.java | 28 +++++++++---------- ...CExportStaticInterfaceV1TestGenerated.java | 28 +++++++++---------- ...portDynamicInterfaceNoneTestGenerated.java | 28 +++++++++---------- ...ExportDynamicInterfaceV1TestGenerated.java | 28 +++++++++---------- ...xportStaticInterfaceNoneTestGenerated.java | 28 +++++++++---------- ...CExportStaticInterfaceV1TestGenerated.java | 28 +++++++++---------- 8 files changed, 112 insertions(+), 112 deletions(-) diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceNoneTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceNoneTestGenerated.java index 36eb1edccde..eb30df5cdbd 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceNoneTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceNoneTestGenerated.java @@ -23,20 +23,20 @@ import java.util.regex.Pattern; @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "DYNAMIC") @EnforcedProperty(property = ClassLevelProperty.C_INTERFACE_MODE, propertyValue = "NONE") public class CExportDynamicInterfaceNoneTestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceNone() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceNone() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("primitiveTypes") - public void testPrimitiveTypes() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); - } + @Test + @TestMetadata("primitiveTypes") + public void testPrimitiveTypes() { + runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceV1TestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceV1TestGenerated.java index 0248d05c7ae..e986bc2d413 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceV1TestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicInterfaceV1TestGenerated.java @@ -23,20 +23,20 @@ import java.util.regex.Pattern; @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "DYNAMIC") @EnforcedProperty(property = ClassLevelProperty.C_INTERFACE_MODE, propertyValue = "V1") public class CExportDynamicInterfaceV1TestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceV1() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceV1() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("kt36639") - public void testKt36639() { - runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); - } + @Test + @TestMetadata("kt36639") + public void testKt36639() { + runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() { - runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceNoneTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceNoneTestGenerated.java index 550668959a4..449e0bee29d 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceNoneTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceNoneTestGenerated.java @@ -23,20 +23,20 @@ import java.util.regex.Pattern; @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "STATIC") @EnforcedProperty(property = ClassLevelProperty.C_INTERFACE_MODE, propertyValue = "NONE") public class CExportStaticInterfaceNoneTestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceNone() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceNone() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("primitiveTypes") - public void testPrimitiveTypes() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); - } + @Test + @TestMetadata("primitiveTypes") + public void testPrimitiveTypes() { + runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceV1TestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceV1TestGenerated.java index b19604c5453..8c9435c5476 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceV1TestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticInterfaceV1TestGenerated.java @@ -23,20 +23,20 @@ import java.util.regex.Pattern; @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "STATIC") @EnforcedProperty(property = ClassLevelProperty.C_INTERFACE_MODE, propertyValue = "V1") public class CExportStaticInterfaceV1TestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceV1() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceV1() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("kt36639") - public void testKt36639() { - runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); - } + @Test + @TestMetadata("kt36639") + public void testKt36639() { + runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() { - runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceNoneTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceNoneTestGenerated.java index bc6aa3a1e46..ba313c23558 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceNoneTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceNoneTestGenerated.java @@ -27,20 +27,20 @@ import java.util.regex.Pattern; @Tag("frontend-fir") @FirPipeline() public class FirCExportDynamicInterfaceNoneTestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceNone() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceNone() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("primitiveTypes") - public void testPrimitiveTypes() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); - } + @Test + @TestMetadata("primitiveTypes") + public void testPrimitiveTypes() { + runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceV1TestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceV1TestGenerated.java index a0a06e681ce..1d0e3b3184c 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceV1TestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicInterfaceV1TestGenerated.java @@ -27,20 +27,20 @@ import java.util.regex.Pattern; @Tag("frontend-fir") @FirPipeline() public class FirCExportDynamicInterfaceV1TestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceV1() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceV1() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("kt36639") - public void testKt36639() { - runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); - } + @Test + @TestMetadata("kt36639") + public void testKt36639() { + runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() { - runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceNoneTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceNoneTestGenerated.java index 8936963dc50..142807bdfe1 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceNoneTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceNoneTestGenerated.java @@ -27,20 +27,20 @@ import java.util.regex.Pattern; @Tag("frontend-fir") @FirPipeline() public class FirCExportStaticInterfaceNoneTestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceNone() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceNone() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceNone"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("primitiveTypes") - public void testPrimitiveTypes() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); - } + @Test + @TestMetadata("primitiveTypes") + public void testPrimitiveTypes() { + runTest("native/native.tests/testData/CExport/InterfaceNone/primitiveTypes/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() throws Exception { - runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceNone/smoke0/"); + } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceV1TestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceV1TestGenerated.java index e272294b506..653881107b5 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceV1TestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticInterfaceV1TestGenerated.java @@ -27,20 +27,20 @@ import java.util.regex.Pattern; @Tag("frontend-fir") @FirPipeline() public class FirCExportStaticInterfaceV1TestGenerated extends AbstractNativeCExportTest { - @Test - public void testAllFilesPresentInInterfaceV1() { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); - } + @Test + public void testAllFilesPresentInInterfaceV1() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false); + } - @Test - @TestMetadata("kt36639") - public void testKt36639() { - runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); - } + @Test + @TestMetadata("kt36639") + public void testKt36639() { + runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/"); + } - @Test - @TestMetadata("smoke0") - public void testSmoke0() { - runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); - } + @Test + @TestMetadata("smoke0") + public void testSmoke0() { + runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/"); + } }