Merge pull request #76023 from benlangmuir/add-more-years-of-independence

[test] Move availability tests to later fake OS versions
This commit is contained in:
Ben Langmuir
2024-08-22 08:46:51 -07:00
committed by GitHub
53 changed files with 1145 additions and 1145 deletions

View File

@@ -125,32 +125,32 @@
// Convenience factory declaration followed by convenience init
+(instancetype)havingConvenienceFactoryAndLaterConvenienceInitWithFlim:(NSInteger)flim;
-(instancetype)initWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.52)));
-(instancetype)initWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=52)));
// Convenience init declaration followed by convenience factory
-(instancetype)initWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.52)));
-(instancetype)initWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=52)));
+(instancetype)havingConvenienceFactoryAndLaterConvenienceInitWithFlam:(NSInteger)flam;
@end
@interface NSHavingConvenienceFactoryAndEarlierConvenienceInit : NSObject
-(instancetype)init NS_DESIGNATED_INITIALIZER;
+(instancetype)havingConvenienceFactoryAndEarlierConvenienceInitWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.52)));
+(instancetype)havingConvenienceFactoryAndEarlierConvenienceInitWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=52)));
-(instancetype)initWithFlim:(NSInteger)flim;
-(instancetype)initWithFlam:(NSInteger)flam;
+(instancetype)havingConvenienceFactoryAndEarlierConvenienceInitWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.52)));
+(instancetype)havingConvenienceFactoryAndEarlierConvenienceInitWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=52)));
@end
@interface NSHavingConvenienceFactoryAndSameConvenienceInit : NSObject
-(instancetype)init NS_DESIGNATED_INITIALIZER;
// We distinguish between which of these the importer chose by the deprecation message.
+(instancetype)havingConvenienceFactoryAndSameConvenienceInitWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.8, deprecated=10.51, message="ConvenienceFactory")));
-(instancetype)initWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.8, deprecated=10.51, message="ConvenienceInit")));
+(instancetype)havingConvenienceFactoryAndSameConvenienceInitWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.8, deprecated=51, message="ConvenienceFactory")));
-(instancetype)initWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.8, deprecated=51, message="ConvenienceInit")));
-(instancetype)initWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.8, deprecated=10.51, message="ConvenienceInit")));
+(instancetype)havingConvenienceFactoryAndSameConvenienceInitWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.8, deprecated=10.51, message="ConvenienceFactory")));
-(instancetype)initWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.8, deprecated=51, message="ConvenienceInit")));
+(instancetype)havingConvenienceFactoryAndSameConvenienceInitWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.8, deprecated=51, message="ConvenienceFactory")));
+(instancetype)havingConvenienceFactoryAndSameConvenienceInitWithFlotsam:(NSInteger)flotsam __attribute__((deprecated("ConvenienceFactory")));
-(instancetype)initWithFlotsam:(NSInteger)flotsam __attribute__((deprecated("ConvenienceInit")));
@@ -162,9 +162,9 @@
@interface NSHavingConvenienceFactoryAndLaterDesignatedInit : NSObject
+(instancetype)havingConvenienceFactoryAndLaterDesignatedInitWithFlim:(NSInteger)flim;
-(instancetype)initWithFlim:(NSInteger)flim NS_DESIGNATED_INITIALIZER __attribute__((availability(macosx,introduced=10.52)));
-(instancetype)initWithFlim:(NSInteger)flim NS_DESIGNATED_INITIALIZER __attribute__((availability(macosx,introduced=52)));
-(instancetype)initWithFlam:(NSInteger)flam NS_DESIGNATED_INITIALIZER __attribute__((availability(macosx,introduced=10.52)));
-(instancetype)initWithFlam:(NSInteger)flam NS_DESIGNATED_INITIALIZER __attribute__((availability(macosx,introduced=52)));
+(instancetype)havingConvenienceFactoryAndLaterDesignatedInitWithFlam:(NSInteger)flam;
@end
@@ -172,9 +172,9 @@
-(instancetype)init NS_DESIGNATED_INITIALIZER;
+(NSHavingFactoryAndLaterConvenienceInit *)havingFactoryAndLaterConvenienceInitWithFlim:(NSInteger)flim;
-(instancetype)initWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=10.52)));
-(instancetype)initWithFlim:(NSInteger)flim __attribute__((availability(macosx,introduced=52)));
-(instancetype)initWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=10.52)));
-(instancetype)initWithFlam:(NSInteger)flam __attribute__((availability(macosx,introduced=52)));
+(NSHavingFactoryAndLaterConvenienceInit *)havingFactoryAndLaterConvenienceInitWithFlam:(NSInteger)flam;
@end

View File

@@ -32,23 +32,23 @@ extern NSUInteger SomeCrazyAppExtensionForbiddenAPI(void)
__attribute__((availability(ios_app_extension,unavailable,message="Not available in App Extensions")))
__attribute__((availability(xros_app_extension,unavailable,message="Not available in App Extensions")));
extern NSString *const globalStringAvailableOn10_51 __attribute__((availability(macosx,introduced=10.51)));
extern NSString *const globalStringAvailableOn10_52 __attribute__((availability(macosx,introduced=10.52)));
extern NSString *const globalStringAvailableOn51 __attribute__((availability(macosx,introduced=51)));
extern NSString *const globalStringAvailableOn52 __attribute__((availability(macosx,introduced=52)));
__attribute__((availability(macosx,introduced=10.51)))
@interface NSAvailableOn10_51 : NSObject
__attribute__((availability(macosx,introduced=51)))
@interface NSAvailableOn51 : NSObject
- (instancetype)init;
- (instancetype)initWithStringOn10_52:(NSString *)s __attribute__((availability(macosx,introduced=10.52)));
- (instancetype)initWithStringOn52:(NSString *)s __attribute__((availability(macosx,introduced=52)));
@property NSInteger propertyOn10_52 __attribute__((availability(macosx,introduced=10.52)));
@property NSInteger propertyOn52 __attribute__((availability(macosx,introduced=52)));
- (void)methodAvailableOn10_52 __attribute__((availability(macosx,introduced=10.52)));
- (void)methodAvailableOn52 __attribute__((availability(macosx,introduced=52)));
@end
extern NSAvailableOn10_51 *const globalClassInstanceAvailableOn10_51 __attribute__((availability(macosx,introduced=10.51)));
extern NSAvailableOn51 *const globalClassInstanceAvailableOn51 __attribute__((availability(macosx,introduced=51)));
__attribute__((availability(macosx,introduced=10.51)))
@protocol NSProtocolAvailableOn10_51
__attribute__((availability(macosx,introduced=51)))
@protocol NSProtocolAvailableOn51
@end
@@ -58,35 +58,35 @@ __attribute__((availability(macosx,introduced=10.9)))
@property NSInteger propertyOn10_9;
// Properties with unavailable accessors declared before property.
- (void)setPropertyOn10_51WithSetterOn10_52Before:(NSInteger)prop __attribute__((availability(macosx,introduced=10.52)));
@property NSInteger propertyOn10_51WithSetterOn10_52Before __attribute__((availability(macosx,introduced=10.51)));
- (void)setPropertyOn51WithSetterOn52Before:(NSInteger)prop __attribute__((availability(macosx,introduced=52)));
@property NSInteger propertyOn51WithSetterOn52Before __attribute__((availability(macosx,introduced=51)));
- (NSInteger)propertyOn10_51WithGetterOn10_52Before __attribute__((availability(macosx,introduced=10.52)));
@property NSInteger propertyOn10_51WithGetterOn10_52Before __attribute__((availability(macosx,introduced=10.51)));
- (NSInteger)propertyOn51WithGetterOn52Before __attribute__((availability(macosx,introduced=52)));
@property NSInteger propertyOn51WithGetterOn52Before __attribute__((availability(macosx,introduced=51)));
// Properties with unavailable accessors declared after property.
@property NSInteger propertyOn10_51WithSetterOn10_52After __attribute__((availability(macosx,introduced=10.51)));
- (void)setPropertyOn10_51WithSetterOn10_52After:(NSInteger)prop __attribute__((availability(macosx,introduced=10.52)));
@property NSInteger propertyOn51WithSetterOn52After __attribute__((availability(macosx,introduced=51)));
- (void)setPropertyOn51WithSetterOn52After:(NSInteger)prop __attribute__((availability(macosx,introduced=52)));
@property NSInteger propertyOn10_51WithGetterOn10_52After __attribute__((availability(macosx,introduced=10.51)));
- (NSInteger)propertyOn10_51WithGetterOn10_52After __attribute__((availability(macosx,introduced=10.52)));
@property NSInteger propertyOn51WithGetterOn52After __attribute__((availability(macosx,introduced=51)));
- (NSInteger)propertyOn51WithGetterOn52After __attribute__((availability(macosx,introduced=52)));
// Property with redeclared with a setter in a category
@property(readonly) NSInteger readOnlyRedeclaredWithSetterInCategory __attribute__((availability(macosx,introduced=10.51)));
@property(readonly) NSInteger readOnlyRedeclaredWithSetterInCategory __attribute__((availability(macosx,introduced=51)));
- (void)methodAvailableOn10_52 __attribute__((availability(macosx,introduced=10.52)));
- (void)methodAvailableOn52 __attribute__((availability(macosx,introduced=52)));
@end
@interface NSAvailableOn10_9 (NSWithPropertyReclarationInACategory)
@property(readwrite) NSInteger readOnlyRedeclaredWithSetterInCategory __attribute__((availability(macosx,introduced=10.51)));
- (void)setReadOnlyRedeclaredWithSetterInCategory:(NSInteger)prop __attribute__((availability(macosx,introduced=10.52)));
@property(readwrite) NSInteger readOnlyRedeclaredWithSetterInCategory __attribute__((availability(macosx,introduced=51)));
- (void)setReadOnlyRedeclaredWithSetterInCategory:(NSInteger)prop __attribute__((availability(macosx,introduced=52)));
@end
/// Aaa. NSAvailableOnOSX10_51AndIOS8_0. Bbb.
__attribute__((availability(macosx,introduced=10.51)))
/// Aaa. NSAvailableOnOSX51AndIOS8_0. Bbb.
__attribute__((availability(macosx,introduced=51)))
__attribute__((availability(ios,introduced=8.0)))
@interface NSAvailableOnOSX10_51AndIOS8_0 : NSObject
@interface NSAvailableOnOSX51AndIOS8_0 : NSObject
@end
@@ -559,7 +559,7 @@ typedef CF_OPTIONS(unsigned long, CFCalendarUnit) {
kCFCalendarUnitHour = (1UL << 5),
kCFCalendarUnitMinute = (1UL << 6),
kCFCalendarUnitSecond = (1UL << 7),
kCFCalendarUnitWeek /*CF_ENUM_DEPRECATED(10_4, 10_51, 2_0, 8_0)*/ = (1UL << 8),
kCFCalendarUnitWeek /*CF_ENUM_DEPRECATED(10_4, 51, 2_0, 8_0)*/ = (1UL << 8),
kCFCalendarUnitWeekday = (1UL << 9),
kCFCalendarUnitWeekdayOrdinal = (1UL << 10),
kCFCalendarUnitQuarter /*CF_ENUM_AVAILABLE(10_6, 4_0)*/ = (1UL << 11),
@@ -667,17 +667,17 @@ typedef NS_OPTIONS(NSUInteger, NSBitmapFormat) {
NSAlphaNonpremultipliedBitmapFormat = 1 << 1, // 0 means is premultiplied
NSFloatingPointSamplesBitmapFormat = 1 << 2, // 0 is integer
NS16BitLittleEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 8),
NS32BitLittleEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 9),
NS16BitBigEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 10),
NS32BitBigEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 11)
NS16BitLittleEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 8),
NS32BitLittleEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 9),
NS16BitBigEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 10),
NS32BitBigEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 11)
};
typedef NS_OPTIONS(NSUInteger, NSBitmapFormatReversed) {
NS16BitLittleEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 8),
NS32BitLittleEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 9),
NS16BitBigEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 10),
NS32BitBigEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 11),
NS16BitLittleEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 8),
NS32BitLittleEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 9),
NS16BitBigEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 10),
NS32BitBigEndianBitmapFormatR /*NS_ENUM_AVAILABLE_MAC(51)*/ = (1 << 11),
NSAlphaFirstBitmapFormatR = 1 << 0, // 0 means is alpha last (RGBA, CMYKA, etc.)
NSAlphaNonpremultipliedBitmapFormatR = 1 << 1, // 0 means is premultiplied
@@ -711,13 +711,13 @@ typedef NS_OPTIONS(NSUInteger, NSPotentiallyUnavailableOptions) {
NSPotentiallyUnavailableOptionsFirst = (1 << 0),
NSPotentiallyUnavailableOptionsSecond = (1 << 1),
NSPotentiallyUnavailableOptionsThird = (1 << 2),
} __attribute__((availability(macosx, introduced=10.51)));
} __attribute__((availability(macosx, introduced=51)));
/// Aaa. NSOptionsWithUnavailableElement. Bbb.
typedef NS_OPTIONS(NSUInteger, NSOptionsWithUnavailableElement) {
NSOptionsWithUnavailableElementFirst = (1 << 0),
NSOptionsWithUnavailableElementSecond = (1 << 1),
NSOptionsWithUnavailableElementThird __attribute__((availability(macosx, introduced=10.51))) = (1 << 2),
NSOptionsWithUnavailableElementThird __attribute__((availability(macosx, introduced=51))) = (1 << 2),
};
/// Aaa. NSUnavailableEnum. Bbb.
@@ -725,23 +725,23 @@ typedef NS_ENUM(NSUInteger, NSUnavailableEnum) {
NSUnavailableEnumFirst,
NSUnavailableEnumSecond,
NSUnavailableEnumThird,
} __attribute__((availability(macosx, introduced=10.51)));
} __attribute__((availability(macosx, introduced=51)));
/// Aaa. NSEnumWithUnavailableElement. Bbb.
typedef NS_ENUM(NSUInteger, NSEnumWithUnavailableElement) {
NSEnumWithUnavailableElementFirst,
NSEnumWithUnavailableElementSecond,
NSEnumWithUnavailableElementThird __attribute__((availability(macosx, introduced=10.51))),
NSEnumWithUnavailableElementThird __attribute__((availability(macosx, introduced=51))),
};
typedef NS_OPTIONS(NSUInteger, NSDeprecatedOptions) {
NSDeprecatedOptionsNone = 0,
NSDeprecatedOptionsFirst = (1 << 0)
} __attribute__((availability(macosx, introduced=10.51, deprecated=10.51, message="Use a different API")));
} __attribute__((availability(macosx, introduced=51, deprecated=51, message="Use a different API")));
typedef NS_ENUM(NSUInteger, NSDeprecatedEnum) {
NSDeprecatedEnumFirst
} __attribute__((availability(macosx, introduced=10.51, deprecated=10.51, message="Use a different API")));
} __attribute__((availability(macosx, introduced=51, deprecated=51, message="Use a different API")));
typedef NS_OPTIONS(NSUInteger, NSExplicitlyUnavailableOptions) {
NSExplicitlyUnavailableOptionsNone = 0,
@@ -759,7 +759,7 @@ typedef NS_OPTIONS(NSUInteger, NSExplicitlyUnavailableOnOSXOptions) {
@end
@interface NSClassWithDeprecatedOptionsInMethodSignature (ActuallyUseOptions)
- (void)someMethodWithDeprecatedOptions:(NSDeprecatedOptions)options __attribute__((availability(macosx, introduced=10.51, deprecated=10.51, message="Use a different API")));
- (void)someMethodWithDeprecatedOptions:(NSDeprecatedOptions)options __attribute__((availability(macosx, introduced=51, deprecated=51, message="Use a different API")));
@end
@interface NSClassWithExplicitlyUnavailableOptionsInMethodSignature : NSObject
@@ -773,7 +773,7 @@ typedef NS_OPTIONS(NSUInteger, NSExplicitlyUnavailableOnOSXOptions) {
@interface NSClassWithPotentiallyUnavailableOptionsInMethodSignature : NSObject
+ (NSClassWithPotentiallyUnavailableOptionsInMethodSignature *) sharedInstance;
- (void)someMethodWithPotentiallyUnavailableOptions:(NSPotentiallyUnavailableOptions)options __attribute__((availability(macosx, introduced=10.52)));
- (void)someMethodWithPotentiallyUnavailableOptions:(NSPotentiallyUnavailableOptions)options __attribute__((availability(macosx, introduced=52)));
@end
@protocol NSWobbling
@@ -931,14 +931,14 @@ typedef struct NonNilableReferences {
@end
@interface NSClassWithMethodFromNSProtocolWithOptionalRequirement
-(void)optionalRequirement __attribute__((availability(macosx, introduced=10.51)));
-(void)optionalRequirement __attribute__((availability(macosx, introduced=51)));
@end
__attribute__((availability(macosx, introduced = 10.51)))
__attribute__((availability(macosx, introduced = 51)))
@interface AnnotatedFrameworkClass : NSObject
@end
__attribute__((availability(macosx, introduced = 10.52)))
__attribute__((availability(macosx, introduced = 52)))
@interface AnnotatedLaterFrameworkClass : NSObject
@end
@@ -954,7 +954,7 @@ __attribute__((availability(macosx, introduced = 10.52)))
- (void)doSomethingWithClass:(AnnotatedFrameworkClass *_Nonnull)k
andLaterClass:(AnnotatedLaterFrameworkClass *_Nonnull)lk;
-(void)someMethodWithAvailability __attribute__((availability(macosx,introduced=10.53)));
-(void)someMethodWithAvailability __attribute__((availability(macosx,introduced=53)));
@property(nonnull) AnnotatedFrameworkClass *someProperty;
@@ -971,18 +971,18 @@ __attribute__((availability(macosx, introduced = 10.9)))
@end
/// Aaa. LaterFrameworkClassConformingToUnannotatedFrameworkProtocol. Bbb.
__attribute__((availability(macosx, introduced = 10.52)))
__attribute__((availability(macosx, introduced = 52)))
@interface LaterFrameworkClassConformingToUnannotatedFrameworkProtocol : NSObject<UnannotatedFrameworkProtocol>
@end
/// Aaa. LaterAnnotatedFrameworkProtocol. Bbb.
__attribute__((availability(macosx, introduced = 10.52)))
__attribute__((availability(macosx, introduced = 52)))
@protocol LaterAnnotatedFrameworkProtocol
- (AnnotatedFrameworkClass * _Nullable) returnSomething;
- (void)doSomethingWithClass:(AnnotatedFrameworkClass *_Nonnull)k
andLaterClass:(AnnotatedLaterFrameworkClass *_Nonnull)lk;
-(void)noUnavailableTypesInSignature;
-(void)someMethodWithAvailability __attribute__((availability(macosx,introduced=10.53)));
-(void)someMethodWithAvailability __attribute__((availability(macosx,introduced=53)));
@property(nonnull) AnnotatedFrameworkClass *someProperty;
@end