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

[K/N] Mute test parts that cause KT-53317

Browse Source
This commit is contained in:
Sergey Bogolepov
2022-07-25 13:54:38 +03:00
committed by Space
parent 7d6e133c0d
commit 89d3b9819b
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/tests/objcexport/expectedLazy.h
+4 -4
View File
@@ -1249,7 +1249,7 @@ __attribute__((swift_name("MySwiftArray")))
__attribute__((swift_name("ObjCNameI1"))) __attribute__((swift_name("ObjCNameI1")))
@protocol KtObjCNameI1 @protocol KtObjCNameI1
@required @required
- (int32_t)someOtherFunctionReceiver:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(receiver:otherParam:)"))); - (int32_t)someOtherFunction:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(_:otherParam:)")));
@property (readonly) int32_t someOtherValue __attribute__((swift_name("someOtherValue"))); @property (readonly) int32_t someOtherValue __attribute__((swift_name("someOtherValue")));
@end @end
@@ -1258,7 +1258,7 @@ __attribute__((swift_name("SwiftNameC2")))
@interface KtObjCNameC2 : KtBase <KtObjCNameI1> @interface KtObjCNameC2 : KtBase <KtObjCNameI1>
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)someOtherFunctionReceiver:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(receiver:otherParam:)"))); - (int32_t)someOtherFunction:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(_:otherParam:)")));
@property int32_t someOtherValue __attribute__((swift_name("someOtherValue"))); @property int32_t someOtherValue __attribute__((swift_name("someOtherValue")));
@end @end
@@ -1298,7 +1298,7 @@ __attribute__((swift_name("ObjCNameC4")))
@interface KtObjCNameC4 : KtBase @interface KtObjCNameC4 : KtBase
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)fooObjCReceiver:(int32_t)receiver objCParam:(int32_t)param __attribute__((swift_name("foo(objCReceiver:objCParam:)"))); - (int32_t)foo:(int32_t)receiver objCParam:(int32_t)param __attribute__((swift_name("foo(_:objCParam:)")));
@end @end
__attribute__((objc_subclassing_restricted)) __attribute__((objc_subclassing_restricted))
@@ -1335,7 +1335,7 @@ __attribute__((swift_name("ObjCNameSwiftEnum.Companion")))
__attribute__((objc_subclassing_restricted)) __attribute__((objc_subclassing_restricted))
__attribute__((swift_name("ObjCNameBKt"))) __attribute__((swift_name("ObjCNameBKt")))
@interface KtObjCNameBKt : KtBase @interface KtObjCNameBKt : KtBase
+ (int32_t)getSomeValueOf:(id<KtObjCNameI1>)receiver __attribute__((swift_name("getSomeValue(of:)"))); + (int32_t)getSomeValue:(id<KtObjCNameI1>)receiver __attribute__((swift_name("getSomeValue(_:)")));
@end @end
__attribute__((swift_name("OverrideKotlinMethods2"))) __attribute__((swift_name("OverrideKotlinMethods2")))
kotlin-native/backend.native/tests/objcexport/expectedLazyLegacySuspendUnit.h
+4 -4
View File
@@ -1184,7 +1184,7 @@ __attribute__((swift_name("MySwiftArray")))
__attribute__((swift_name("ObjCNameI1"))) __attribute__((swift_name("ObjCNameI1")))
@protocol KtObjCNameI1 @protocol KtObjCNameI1
@required @required
- (int32_t)someOtherFunctionReceiver:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(receiver:otherParam:)"))); - (int32_t)someOtherFunction:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(_:otherParam:)")));
@property (readonly) int32_t someOtherValue __attribute__((swift_name("someOtherValue"))); @property (readonly) int32_t someOtherValue __attribute__((swift_name("someOtherValue")));
@end @end
@@ -1193,7 +1193,7 @@ __attribute__((swift_name("SwiftNameC2")))
@interface KtObjCNameC2 : KtBase <KtObjCNameI1> @interface KtObjCNameC2 : KtBase <KtObjCNameI1>
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)someOtherFunctionReceiver:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(receiver:otherParam:)"))); - (int32_t)someOtherFunction:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(_:otherParam:)")));
@property int32_t someOtherValue __attribute__((swift_name("someOtherValue"))); @property int32_t someOtherValue __attribute__((swift_name("someOtherValue")));
@end @end
@@ -1233,7 +1233,7 @@ __attribute__((swift_name("ObjCNameC4")))
@interface KtObjCNameC4 : KtBase @interface KtObjCNameC4 : KtBase
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)fooObjCReceiver:(int32_t)receiver objCParam:(int32_t)param __attribute__((swift_name("foo(objCReceiver:objCParam:)"))); - (int32_t)foo:(int32_t)receiver objCParam:(int32_t)param __attribute__((swift_name("foo(_:objCParam:)")));
@end @end
__attribute__((objc_subclassing_restricted)) __attribute__((objc_subclassing_restricted))
@@ -1270,7 +1270,7 @@ __attribute__((swift_name("ObjCNameSwiftEnum.Companion")))
__attribute__((objc_subclassing_restricted)) __attribute__((objc_subclassing_restricted))
__attribute__((swift_name("ObjCNameBKt"))) __attribute__((swift_name("ObjCNameBKt")))
@interface KtObjCNameBKt : KtBase @interface KtObjCNameBKt : KtBase
+ (int32_t)getSomeValueOf:(id<KtObjCNameI1>)receiver __attribute__((swift_name("getSomeValue(of:)"))); + (int32_t)getSomeValue:(id<KtObjCNameI1>)receiver __attribute__((swift_name("getSomeValue(_:)")));
@end @end
__attribute__((swift_name("OverrideKotlinMethods2"))) __attribute__((swift_name("OverrideKotlinMethods2")))
kotlin-native/backend.native/tests/objcexport/expectedLazyNoGenerics.h
+4 -4
View File
@@ -1184,7 +1184,7 @@ __attribute__((swift_name("MySwiftArray")))
__attribute__((swift_name("ObjCNameI1"))) __attribute__((swift_name("ObjCNameI1")))
@protocol KtObjCNameI1 @protocol KtObjCNameI1
@required @required
- (int32_t)someOtherFunctionReceiver:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(receiver:otherParam:)"))); - (int32_t)someOtherFunction:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(_:otherParam:)")));
@property (readonly) int32_t someOtherValue __attribute__((swift_name("someOtherValue"))); @property (readonly) int32_t someOtherValue __attribute__((swift_name("someOtherValue")));
@end @end
@@ -1193,7 +1193,7 @@ __attribute__((swift_name("SwiftNameC2")))
@interface KtObjCNameC2 : KtBase <KtObjCNameI1> @interface KtObjCNameC2 : KtBase <KtObjCNameI1>
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)someOtherFunctionReceiver:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(receiver:otherParam:)"))); - (int32_t)someOtherFunction:(int32_t)receiver otherParam:(int32_t)param __attribute__((swift_name("someOtherFunction(_:otherParam:)")));
@property int32_t someOtherValue __attribute__((swift_name("someOtherValue"))); @property int32_t someOtherValue __attribute__((swift_name("someOtherValue")));
@end @end
@@ -1233,7 +1233,7 @@ __attribute__((swift_name("ObjCNameC4")))
@interface KtObjCNameC4 : KtBase @interface KtObjCNameC4 : KtBase
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer)); - (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead"))); + (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)fooObjCReceiver:(int32_t)receiver objCParam:(int32_t)param __attribute__((swift_name("foo(objCReceiver:objCParam:)"))); - (int32_t)foo:(int32_t)receiver objCParam:(int32_t)param __attribute__((swift_name("foo(_:objCParam:)")));
@end @end
__attribute__((objc_subclassing_restricted)) __attribute__((objc_subclassing_restricted))
@@ -1270,7 +1270,7 @@ __attribute__((swift_name("ObjCNameSwiftEnum.Companion")))
__attribute__((objc_subclassing_restricted)) __attribute__((objc_subclassing_restricted))
__attribute__((swift_name("ObjCNameBKt"))) __attribute__((swift_name("ObjCNameBKt")))
@interface KtObjCNameBKt : KtBase @interface KtObjCNameBKt : KtBase
+ (int32_t)getSomeValueOf:(id<KtObjCNameI1>)receiver __attribute__((swift_name("getSomeValue(of:)"))); + (int32_t)getSomeValue:(id<KtObjCNameI1>)receiver __attribute__((swift_name("getSomeValue(_:)")));
@end @end
__attribute__((swift_name("OverrideKotlinMethods2"))) __attribute__((swift_name("OverrideKotlinMethods2")))
kotlin-native/backend.native/tests/objcexport/objCName.swift
+3 -3
View File
@@ -17,7 +17,7 @@ private func testObjCNameParameterNames() throws {
private func testObjCNameReceiverName() throws { private func testObjCNameReceiverName() throws {
let object = SwiftNameC2() let object = SwiftNameC2()
try assertEquals(actual: ObjCNameBKt.getSomeValue(of: object), expected: 0) try assertEquals(actual: ObjCNameBKt.getSomeValue(object), expected: 0)
} }
private func testObjCNameMySwiftArray() throws { private func testObjCNameMySwiftArray() throws {
@@ -31,8 +31,8 @@ private func testObjCNameOverrides() throws {
try assertEquals(actual: object.someOtherValue, expected: 0) try assertEquals(actual: object.someOtherValue, expected: 0)
object.someOtherValue = 1 object.someOtherValue = 1
try assertEquals(actual: object.someOtherValue, expected: 1) try assertEquals(actual: object.someOtherValue, expected: 1)
try assertEquals(actual: object.someOtherFunction(receiver: 2, otherParam: 4), expected: 8) try assertEquals(actual: object.someOtherFunction(2, otherParam: 4), expected: 8)
try assertEquals(actual: ObjCNameC4().foo(objCReceiver: 3, objCParam: 5), expected: 15) try assertEquals(actual: ObjCNameC4().foo(3, objCParam: 5), expected: 15)
} }
private func testObjCNameNestedClass() throws { private func testObjCNameNestedClass() throws {
kotlin-native/backend.native/tests/objcexport/objCNameB.kt
+6 -3
View File
@@ -29,10 +29,12 @@ interface ObjCNameI1 {
@ObjCName("someOtherValue") @ObjCName("someOtherValue")
val someValue: Int val someValue: Int
@ObjCName("someOtherFunction") @ObjCName("someOtherFunction")
fun @receiver:ObjCName("receiver") Int.someFunction(@ObjCName("otherParam") param: Int): Int // KT-53317
fun /* @receiver:ObjCName("receiver") */ Int.someFunction(@ObjCName("otherParam") param: Int): Int
} }
fun @receiver:ObjCName("of") ObjCNameI1.getSomeValue(): Int = someValue // KT-53317
fun /* @receiver:ObjCName("of") */ ObjCNameI1.getSomeValue(): Int = someValue
@ObjCName(swiftName = "SwiftNameC2") @ObjCName(swiftName = "SwiftNameC2")
class ObjCNameC2: ObjCNameI1 { class ObjCNameC2: ObjCNameI1 {
@@ -59,7 +61,8 @@ class ObjCNameC3 {
} }
private interface ObjCNameI2 { private interface ObjCNameI2 {
fun @receiver:ObjCName("objCReceiver") Int.foo(@ObjCName("objCParam") param: Int): Int // KT-53317
fun /* @receiver:ObjCName("objCReceiver") */ Int.foo(@ObjCName("objCParam") param: Int): Int
} }
class ObjCNameC4: ObjCNameI2 { class ObjCNameC4: ObjCNameI2 {