Improve ObjCExport test code

This commit is contained in:
Svyatoslav Scherbina
2020-02-21 14:46:02 +03:00
committed by SvyatoslavScherbina
parent 827dc574fe
commit 061e017417
+56 -63
View File
@@ -316,12 +316,8 @@ class SwiftNotThrowingWithBridge : ThrowsWithBridge {
} }
} }
private func testThrowing(_ block: () throws -> Void) throws { private func testThrowing(file: String = #file, line: Int = #line, _ block: () throws -> Void) throws {
do { try assertFailsWithKotlin(MyException.self, file: file, line: line, block: block)
try block()
} catch let error as NSError {
try assertTrue(error.kotlinException is MyException)
}
} }
func testExceptions() throws { func testExceptions() throws {
@@ -1239,64 +1235,61 @@ func testGH3825() throws {
// -------- Execution of the test -------- // -------- Execution of the test --------
class ValuesTests : TestProvider { class ValuesTests : SimpleTestProvider {
var tests: [TestCase] = [] override init() {
super.init()
init() { test("TestValues", testVals)
providers.append(self) test("TestVars", testVars)
tests = [ test("TestDoubles", testDoubles)
TestCase(name: "TestValues", method: withAutorelease(testVals)), test("TestNumbers", testNumbers)
TestCase(name: "TestVars", method: withAutorelease(testVars)), test("TestLists", testLists)
TestCase(name: "TestDoubles", method: withAutorelease(testDoubles)), test("TestLazyValues", testLazyVal)
TestCase(name: "TestNumbers", method: withAutorelease(testNumbers)), test("TestDelegatedProperties", testDelegatedProp)
TestCase(name: "TestLists", method: withAutorelease(testLists)), test("TestGetterDelegate", testGetterDelegate)
TestCase(name: "TestLazyValues", method: withAutorelease(testLazyVal)), test("TestNulls", testNulls)
TestCase(name: "TestDelegatedProperties", method: withAutorelease(testDelegatedProp)), test("TestAnyVar", testAnyVar)
TestCase(name: "TestGetterDelegate", method: withAutorelease(testGetterDelegate)), test("TestFunctions", testFunctions)
TestCase(name: "TestNulls", method: withAutorelease(testNulls)), test("TestExceptions", testExceptions)
TestCase(name: "TestAnyVar", method: withAutorelease(testAnyVar)), test("TestFuncType", testFuncType)
TestCase(name: "TestFunctions", method: withAutorelease(testFunctions)), test("TestGenericsFoo", testGenericsFoo)
TestCase(name: "TestExceptions", method: withAutorelease(testExceptions)), test("TestVararg", testVararg)
TestCase(name: "TestFuncType", method: withAutorelease(testFuncType)), test("TestStringExtension", testStrExtFun)
TestCase(name: "TestGenericsFoo", method: withAutorelease(testGenericsFoo)), test("TestAnyToString", testAnyToString)
TestCase(name: "TestVararg", method: withAutorelease(testVararg)), test("TestAnyPrint", testAnyPrint)
TestCase(name: "TestStringExtension", method: withAutorelease(testStrExtFun)), test("TestCharExtensions", testCharExtensions)
TestCase(name: "TestAnyToString", method: withAutorelease(testAnyToString)), test("TestLambda", testLambda)
TestCase(name: "TestAnyPrint", method: withAutorelease(testAnyPrint)), test("TestInterfaceExtension", testInterfaceExtension)
TestCase(name: "TestCharExtensions", method: withAutorelease(testCharExtensions)), test("TestClassInstances", testClassInstances)
TestCase(name: "TestLambda", method: withAutorelease(testLambda)), test("TestEnum", testEnum)
TestCase(name: "TestInterfaceExtension", method: withAutorelease(testInterfaceExtension)), test("TestDataClass", testDataClass)
TestCase(name: "TestClassInstances", method: withAutorelease(testClassInstances)), test("TestCompanionObj", testCompanionObj)
TestCase(name: "TestEnum", method: withAutorelease(testEnum)), test("TestInlineClasses", testInlineClasses)
TestCase(name: "TestDataClass", method: withAutorelease(testDataClass)), test("TestShared", testShared)
TestCase(name: "TestCompanionObj", method: withAutorelease(testCompanionObj)), test("TestPureSwiftClasses", testPureSwiftClasses)
TestCase(name: "TestInlineClasses", method: withAutorelease(testInlineClasses)), test("TestNames", testNames)
TestCase(name: "TestShared", method: withAutorelease(testShared)), test("TestSwiftOverride", testSwiftOverride)
TestCase(name: "TestPureSwiftClasses", method: withAutorelease(testPureSwiftClasses)), test("TestKotlinOverride", testKotlinOverride)
TestCase(name: "TestNames", method: withAutorelease(testNames)), test("TestGH2945", testGH2945)
TestCase(name: "TestSwiftOverride", method: withAutorelease(testSwiftOverride)), test("TestGH2830", testGH2830)
TestCase(name: "TestKotlinOverride", method: withAutorelease(testKotlinOverride)), test("TestGH2959", testGH2959)
TestCase(name: "TestGH2945", method: withAutorelease(testGH2945)), test("TestKClass", testKClass)
TestCase(name: "TestGH2830", method: withAutorelease(testGH2830)), test("TestSR10177Workaround", testSR10177Workaround)
TestCase(name: "TestGH2959", method: withAutorelease(testGH2959)), test("TestClashes", testClashes)
TestCase(name: "TestKClass", method: withAutorelease(testKClass)), test("TestInvalidIdentifiers", testInvalidIdentifiers)
TestCase(name: "TestSR10177Workaround", method: withAutorelease(testSR10177Workaround)), test("TestDeprecation", testDeprecation)
TestCase(name: "TestClashes", method: withAutorelease(testClashes)), test("TestWeakRefs", testWeakRefs)
TestCase(name: "TestInvalidIdentifiers", method: withAutorelease(testInvalidIdentifiers)), test("TestSharedRefs", TestSharedRefs().test)
TestCase(name: "TestDeprecation", method: withAutorelease(testDeprecation)), test("TestClassTypeCheck", testClassTypeCheck)
TestCase(name: "TestWeakRefs", method: withAutorelease(testWeakRefs)), test("TestInterfaceTypeCheck", testInterfaceTypeCheck)
TestCase(name: "TestSharedRefs", method: withAutorelease(TestSharedRefs().test)), test("TestGH3503_1", testGH3503_1)
TestCase(name: "TestClassTypeCheck", method: withAutorelease(testClassTypeCheck)), test("TestGH3503_2", testGH3503_2)
TestCase(name: "TestInterfaceTypeCheck", method: withAutorelease(testInterfaceTypeCheck)), test("TestGH3503_3", testGH3503_3)
TestCase(name: "TestGH3503_1", method: withAutorelease(testGH3503_1)), test("TestGH3525", testGH3525)
TestCase(name: "TestGH3503_2", method: withAutorelease(testGH3503_2)), test("TestStringConversion", testStringConversion)
TestCase(name: "TestGH3503_3", method: withAutorelease(testGH3503_3)), test("TestGH3825", testGH3825)
TestCase(name: "TestGH3525", method: withAutorelease(testGH3525)),
TestCase(name: "TestStringConversion", method: withAutorelease(testStringConversion)),
TestCase(name: "TestGH3825", method: withAutorelease(testGH3825)),
// Stress test, must remain the last one: // Stress test, must remain the last one:
TestCase(name: "TestGH2931", method: withAutorelease(testGH2931)), test("TestGH2931", testGH2931)
]
} }
} }