CI fixes

firebase · Dec 11, 2024 · b74d065 · b74d065
1 parent 438e613
commit b74d065
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m
@@ -23,6 +23,8 @@
 
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
+@import FirebaseRemoteConfig;
+
 #define ONE_DAY_SECONDS 24 * 60 * 60
 
 static NSDate *FPRAppStartTime = nil;

diff --git a/FirebasePerformance/Tests/Unit/Configurations/FPRFakeRemoteConfig.h b/FirebasePerformance/Tests/Unit/Configurations/FPRFakeRemoteConfig.h
@@ -15,7 +15,8 @@
 #import <Foundation/Foundation.h>
 
 #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h"
-#import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
+
+@import FirebaseRemoteConfig;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m b/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m
@@ -65,7 +65,7 @@ - (void)testCacheResetAfterEverySuccessfulFetch {
                                 forKey:@"fpr_vc_session_sampling_rate"];
 
   // Trigger the RC config fetch
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   remoteConfig.lastFetchTime = nil;
   configFlags.appStartConfigFetchDelayInSeconds = 0.0;
   [configFlags update];
@@ -92,7 +92,7 @@ - (void)testCacheResetAfterEverySuccessfulFetch {
                                 forKey:@"fpr_vc_session_sampling_rate"];
 
   // Retrigger the RC config fetch
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   remoteConfig.lastFetchTime = nil;
   [configFlags update];
 
@@ -112,7 +112,7 @@ - (void)testConfigUpdate {
 
   FPRRemoteConfigFlags *configFlags =
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   configFlags.appStartConfigFetchDelayInSeconds = 0.0;
   [configFlags update];
   XCTAssertNotNil(configFlags.lastFetchedTime);
@@ -179,7 +179,7 @@ - (void)testConfigUpdateDoesNotHappenImmediately {
   FPRRemoteConfigFlags *configFlags =
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   configFlags.appStartConfigFetchDelayInSeconds = 0.0;
   [configFlags update];
   XCTAssertNotNil(configFlags.lastFetchedTime);
@@ -203,7 +203,7 @@ - (void)testConfigUpdateHappensIfInitialFetchHasNotHappened {
   FPRRemoteConfigFlags *configFlags =
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
 
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   configFlags.appStartConfigFetchDelayInSeconds = 0.0;
   [configFlags update];
   XCTAssertNotNil(configFlags.lastFetchedTime);
@@ -224,7 +224,7 @@ - (void)testConfigFetchHappensDoesNotHappenImmediately {
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
   // Setting the status to success. Calling update on the config flags should trigger updation of
   // fetch time. Fetch would trigger activation.
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   NSDate *lastActivatedTime = configFlags.lastFetchedTime;
   [configFlags update];
   XCTAssert([configFlags.lastFetchedTime timeIntervalSinceDate:lastActivatedTime] == 0);
@@ -240,7 +240,7 @@ - (void)testConfigFetchHappensAfterDelay {
       [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
   configFlags.appStartConfigFetchDelayInSeconds = 0.0;
 
-  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
+  remoteConfig.fetchStatus = FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData;
   XCTestExpectation *expectation =
       [self expectationWithDescription:@"Dummy expectation to wait for the fetch delay."];
   dispatch_after(

diff --git a/FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m b/FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m
@@ -32,7 +32,7 @@
 #import "FirebasePerformance/Tests/Unit/Configurations/FPRFakeRemoteConfig.h"
 #import "FirebasePerformance/Tests/Unit/FPRTestCase.h"
 
-#import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
+@import FirebaseRemoteConfig;
 
 #import <OCMock/OCMock.h>
 

diff --git a/FirebaseRemoteConfig/SwiftNew/RemoteConfigValue.swift b/FirebaseRemoteConfig/SwiftNew/RemoteConfigValue.swift
@@ -20,10 +20,10 @@ public class RemoteConfigValue: NSObject, NSCopying {
   /// Data backing the config value.
   @objc public let dataValue: Data
 
-  /// Identifies the source of the fetched value.
+  /// Identifies the source of the fetched value. Only for Firebase internal use.
   @objc public let source: RemoteConfigSource
 
-  /// Designated initializer
+  /// Designated initializer. Only for Firebase internal use.
   @objc public init(data: Data, source: RemoteConfigSource) {
     dataValue = data
     self.source = source

diff --git a/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/FirebaseRemoteConfigSwift_APIBuildTests.swift b/FirebaseRemoteConfig/Tests/Swift/SwiftAPI/FirebaseRemoteConfigSwift_APIBuildTests.swift
@@ -85,8 +85,8 @@ final class FirebaseRemoteConfig_APIBuildTests: XCTestCase {
     _ = FirebaseRemoteConfig.RemoteConfigUpdateError.messageInvalid
     _ = FirebaseRemoteConfig.RemoteConfigUpdateError.unavailable
 
-    // TODO(ncooke3): This should probably not be initializable.
-    let value = FirebaseRemoteConfig.RemoteConfigValue()
+    // This is only initializable for internal clients - fire-perf.
+    let value = FirebaseRemoteConfig.RemoteConfigValue(data: Data(), source: .default)
     let _: String? = value.stringValue
     // TODO(ncooke3): Returns an Objective-C reference type.
     let _: NSNumber = value.numberValue