Skip to content

Update Database for Catalyst #3512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2019
Merged

Update Database for Catalyst #3512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Example/Database/Tests/Unit/FLevelDBStorageEngineTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,9 @@ - (void)testExtremeDoublesAsServerCache {
return;
}
#endif
#if TARGET_OS_MACCATALYST
return;
#endif

FLevelDBStorageEngine *engine = [self cleanStorageEngine];
[engine updateServerCache:NODE((@{@"works" : @"value", @"fails" : @(2.225073858507201e-308)}))
Expand Down Expand Up @@ -529,7 +532,12 @@ - (void)testIntegersAreReturnedsAsIntegers {
XCTAssertEqual(CFNumberGetType((CFNumberRef)actualInt), kCFNumberSInt64Type);
XCTAssertEqualObjects([actualLong stringValue], [longValue stringValue]);
XCTAssertEqual(CFNumberGetType((CFNumberRef)actualLong), kCFNumberSInt64Type);
#if TARGET_OS_MACCATALYST
// Catalyst uses int128_t but CFNumber still calls it 64 bits
XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberSInt64Type);
#else
XCTAssertEqual(CFNumberGetType((CFNumberRef)actualDouble), kCFNumberFloat64Type);
#endif
}

// TODO[offline]: Somehow test estimated server size?
Expand Down
6 changes: 3 additions & 3 deletions Firebase/Database/third_party/SocketRocket/FSRWebSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#import "FSRWebSocket.h"

#if TARGET_OS_IOS || TARGET_OS_TV
#if __has_include(<unicode/utf8.h>)
#define HAS_ICU
#endif

Expand All @@ -28,9 +28,9 @@
#import <unicode/utf8.h>
#endif

#if TARGET_OS_IOS || TARGET_OS_TV
#if __has_include(<Endian.h>)
#import <Endian.h>
#elif TARGET_OS_OSX
#else
#import <CoreServices/CoreServices.h>
#endif

Expand Down